December 2022 - Linux-kselftest-mirror

[PATCH] selftests/tpm2: Split async tests call to separate shell script runner

by Nícolas F. R. A. Prado

When the async test case was introduced, despite being a completely independent test case, the command to run it was added to the same shell script as the smoke test case. Since a shell script implicitly returns the error code from the last run command, this effectively caused the script to only return as error code the result from the async test case, hiding the smoke test result (which could then only be seen from the python unittest logs). Move the async test case call to its own shell script runner to avoid the aforementioned issue. This also makes the output clearer to read, since each kselftest KTAP result now matches with one python unittest report. While at it, also make it so the async test case is skipped if /dev/tpmrm0 doesn't exist, since commit 8335adb8f9d3 ("selftests: tpm: add async space test with noneexisting handle") added a test that relies on it. Signed-off-by: Nícolas F. R. A. Prado <nfraprado(a)collabora.com> --- tools/testing/selftests/tpm2/Makefile | 2 +- tools/testing/selftests/tpm2/test_async.sh | 10 ++++++++++ tools/testing/selftests/tpm2/test_smoke.sh | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100755 tools/testing/selftests/tpm2/test_async.sh diff --git a/tools/testing/selftests/tpm2/Makefile b/tools/testing/selftests/tpm2/Makefile index 1a5db1eb8ed5..a9bf9459fb25 100644 --- a/tools/testing/selftests/tpm2/Makefile +++ b/tools/testing/selftests/tpm2/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) include ../lib.mk -TEST_PROGS := test_smoke.sh test_space.sh +TEST_PROGS := test_smoke.sh test_space.sh test_async.sh TEST_PROGS_EXTENDED := tpm2.py tpm2_tests.py diff --git a/tools/testing/selftests/tpm2/test_async.sh b/tools/testing/selftests/tpm2/test_async.sh new file mode 100755 index 000000000000..43bf5bd772fd --- /dev/null +++ b/tools/testing/selftests/tpm2/test_async.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) + +# Kselftest framework requirement - SKIP code is 4. +ksft_skip=4 + +[ -e /dev/tpm0 ] || exit $ksft_skip +[ -e /dev/tpmrm0 ] || exit $ksft_skip + +python3 -m unittest -v tpm2_tests.AsyncTest diff --git a/tools/testing/selftests/tpm2/test_smoke.sh b/tools/testing/selftests/tpm2/test_smoke.sh index 3e5ff29ee1dd..58af963e5b55 100755 --- a/tools/testing/selftests/tpm2/test_smoke.sh +++ b/tools/testing/selftests/tpm2/test_smoke.sh @@ -7,4 +7,3 @@ ksft_skip=4 [ -e /dev/tpm0 ] || exit $ksft_skip python3 -m unittest -v tpm2_tests.SmokeTest -python3 -m unittest -v tpm2_tests.AsyncTest -- 2.38.1

2 years

3
2
0 0

fw_fallback.sh test failed in Debian 11

by Zhou, Jie2X

hi, fw_fallback.sh test failed. The error may caused by failed to write /sys/devices/virtual/misc/test_firmware/trigger_request. diff firmware/fw_fallback.sh_org firmware/fw_fallback.sh 165c164,165 < echo -n "nope-$NAME" >"$DIR"/trigger_request 2>/dev/null & --- > echo "echo -n \"nope-$NAME\" >\"$DIR\"/trigger_request &" > echo -n "nope-$NAME" >"$DIR"/trigger_request & # Test request_partial_firmware_into_buf() off=1 size=6 nofile: OK # Test request_partial_firmware_into_buf() off=2 size=10 nofile: OK # echo -n "nope-test-firmware.bin" >"/sys/devices/virtual/misc/test_firmware"/trigger_request & # ./fw_fallback.sh: line 165: echo: write error: No such file or directory # ./fw_fallback.sh: fallback mechanism immediately cancelled $ echo -n "nope-test-firmware.bin" >/sys/devices/virtual/misc/test_firmware/trigger_request -bash: echo: write error: No such file or directory test OS: Debian 11 test kernel: v6.1-rc6 test output: # ./fw_fallback.sh: fallback mechanism immediately cancelled # # The file never appeared: /sys/devices/virtual/misc/test_firmware/nope-test-firmware.bin/loading # # This might be a distribution udev rule setup by your distribution # to immediately cancel all fallback requests, this must be # removed before running these tests. To confirm look for # a firmware rule like /lib/udev/rules.d/50-firmware.rules # and see if you have something like this: # # SUBSYSTEM=="firmware", ACTION=="add", ATTR{loading}="-1" # # If you do remove this file or comment out this line before # proceeding with these tests. not ok 1 selftests: firmware: fw_run_tests.sh # exit=1 There is not /lib/udev/rules.d/50-firmware.rules in Debian 11. How can fw_run_tests.sh run successfully in Debian 11? best regards,

2 years

4
10
0 0

[PATCH v14 00/39] arm64/sme: Initial support for the Scalable Matrix Extension

by Mark Brown

This series provides initial support for the ARMv9 Scalable Matrix Extension (SME). SME takes the approach used for vectors in SVE and extends this to provide architectural support for matrix operations. A more detailed overview can be found in [1]. For the kernel SME can be thought of as a series of features which are intended to be used together by applications but operate mostly orthogonally: - The ZA matrix register. - Streaming mode, in which ZA can be accessed and a subset of SVE features are available. - A second vector length, used for streaming mode SVE and ZA and controlled using a similar interface to that for SVE. - TPIDR2, a new userspace controllable system register intended for use by the C library for storing context related to the ZA ABI. A substantial part of the series is dedicated to refactoring the existing SVE support so that we don't need to duplicate code for handling vector lengths and the SVE registers, this involves creating an array of vector types and making the users take the vector type as a parameter. I'm not 100% happy with this but wasn't able to come up with anything better, duplicating code definitely felt like a bad idea so this felt like the least bad thing. If this approach makes sense to people it might make sense to split this off into a separate series and/or merge it while the rest is pending review to try to make things a little more digestable, the series is very large so it'd probably make things easier to digest if some of the preparatory refactoring could be merged before the rest is ready. One feature of the architecture of particular note is that switching to and from streaming mode may change the size of and invalidate the contents of the SVE registers, and when in streaming mode the FFR is not accessible. This complicates aspects of the ABI like signal handling and ptrace. This initial implementation is mainly intended to get the ABI in place, there are several areas which will be worked on going forwards - some of these will be blockers, others could be handled in followup serieses: - SME is currently not supported for KVM guests, this will be done as a followup series. A host system can use SME and run KVM guests but SME is not available in the guests. - The KVM host support is done in a very simplistic way, were anyone to attempt to use it in production there would be performance impacts on hosts with SME support. As part of this we also add enumeration of fine grained traps. - There is not currently ptrace or signal support TPIDR2, this will be done as a followup series. - No support is currently provided for scheduler control of SME or SME applications, given the size of the SME register state the context switch overhead may be noticable so this may be needed especially for real time applications. Similar concerns already exist for larger SVE vector lengths but are amplified for SME, particularly as the vector length increases. - There has been no work on optimising the performance of anything the kernel does. It is not expected that any systems will be encountered that support SME but not SVE, SME is an ARMv9 feature and SVE is mandatory for ARMv9. The code attempts to handle any such systems that are encountered but this hasn't been tested extensively. v14: - Rebase onto v5.18-rc3. v13: - Preserve ZA in both parent and child on clone() and add a test case for this. - Fix EFI integration for FA64. - Minor tweaks to the ABI document following Catlain's review. - Add and make use of thread_get_cur_vl() helper. - Fix some issues with SVE/FPSIMD register type moves in streaming SVE ptrace. - Typo fixes. - Roll in separately posted series extending ptrace coverage in kselftest for better integrated testing of the series. v12: - Fix some typos in the ABI document. - Print a message when we skip a vector length in the signal tests. - Add note of earliest toolchain versions with SME to manual encodings for future reference now that's landed. - Drop reference to PCS in sme.rst, it's not referenced and one of the links was broken. - Encode smstop and smstart as sysregs in the kernel. - Don't redundantly flush the SVE register state when loading FPSIMD state with SME enabled for the task, the architecture will do this for us. - Introduce and use task_get_cur_vl() to get the vector length for the currently active SVE registers. - Fix support for !FA64 mode in signal and syscall tests. - Simplify instruction sequence for ssve_regs signal test. - Actually include the ZA signal test in the patch set. v11: - Rebase onto v5.17-rc3. - Provide a sme-inst.h to collect manual encodings in kselftest. v10: - Actually do the rebase of fixups from the previous version into relevant patches. v9: - Remove defensive programming around IS_ENABLED() and FGT in KVM code. - Fix naming of TPIDR2 FGT register bit. - Add patches making handling of floating point register bits more consistent (also sent as separate series). - Drop now unused enumeration of fine grained traps. v8: - Rebase onto v5.17-rc1. - Support interoperation with KVM, SME is disabled for KVM guests with minimal handling for cleaning up SME state when entering and leaving the guest. - Document and implement that signal handlers are invoked with ZA and streaming mode disabled. - Use the RDSVL instruction introduced in EAC2 of the architecture to obtain the streaming mode vector length during enumeration, ZA state loading/saving and in test programs. - Store a pointer to SVCR in fpsimd_last_state and use it in fpsimd_save() for interoperation with KVM. - Add a test case sme_trap_no_sm checking that we generate a SIGILL when using an instruction that requires streaming mode without enabling it. - Add basic ZA context form validation to testcases helper library. - Move signal tests over to validating streaming VL from ZA information. - Pulled in patch removing ARRAY_SIZE() so that kselftest builds cleanly and to avoid trivial conflicts. v7: - Rebase onto v5.16-rc3. - Reduce indentation when supporting custom triggers for signal tests as suggested by Catalin. - Change to specifying a width for all CPU features rather than adding single bit specific infrastructure. - Don't require zeroing of non-shared SVE state during syscalls. v6: - Rebase onto v5.16-rc1. - Return to disabling TIF_SVE on kernel entry even if we have SME state, this avoids the need for KVM to handle the case where TIF_SVE is set on guest entry. - Add syscall-abi.h to SME updates to syscall-abi, mistakenly omitted from commit. v5: - Rebase onto currently merged SVE and kselftest patches. - Add support for the FA64 option, introduced in the recently published EAC1 update to the specification. - Pull in test program for the syscall ABI previously sent separately with some revisions and add coverage for the SME ABI. - Fix checking for options with 1 bit fields in ID_AA64SMFR0_EL1. - Minor fixes and clarifications to the ABI documentation. v4: - Rebase onto merged patches. - Remove an uneeded NULL check in vec_proc_do_default_vl(). - Include patch to factor out utility routines in kselftests written in assembler. - Specify -ffreestanding when building TPIDR2 test. v3: - Skip FFR rather than predicate registers in sve_flush_live(). - Don't assume a bool is all zeros in sve_flush_live() as per AAPCS. - Don't redundantly specify a zero index when clearing FFR. v2: - Fix several issues with !SME and !SVE configurations. - Preserve TPIDR2 when creating a new thread/process unless CLONE_SETTLS is set. - Report traps due to using features in an invalid mode as SIGILL. - Spell out streaming mode behaviour in SVE ABI documentation more directly. - Document TPIDR2 in the ABI document. - Use SMSTART and SMSTOP rather than read/modify/write sequences. - Rework logic for exiting streaming mode on syscall. - Don't needlessly initialise SVCR on access trap. - Always restore SME VL for userspace if SME traps are disabled. - Only yield to encourage preemption every 128 iterations in za-test, otherwise do a getpid(), and validate SVCR after syscall. - Leave streaming mode disabled except when reading the vector length in za-test, and disable ZA after detecting a mismatch. - Add SME support to vlset. - Clarifications and typo fixes in comments. - Move sme_alloc() forward declaration back a patch. [1] https://community.arm.com/developer/ip-products/processors/b/processors-ip-… Mark Brown (39): kselftest/arm64: Fix comment for ptrace_sve_get_fpsimd_data() kselftest/arm64: Remove assumption that tasks start FPSIMD only kselftest/arm64: Validate setting via FPSIMD and read via SVE regsets arm64/sme: Provide ABI documentation for SME arm64/sme: System register and exception syndrome definitions arm64/sme: Manually encode SME instructions arm64/sme: Early CPU setup for SME arm64/sme: Basic enumeration support arm64/sme: Identify supported SME vector lengths at boot arm64/sme: Implement sysctl to set the default vector length arm64/sme: Implement vector length configuration prctl()s arm64/sme: Implement support for TPIDR2 arm64/sme: Implement SVCR context switching arm64/sme: Implement streaming SVE context switching arm64/sme: Implement ZA context switching arm64/sme: Implement traps and syscall handling for SME arm64/sme: Disable ZA and streaming mode when handling signals arm64/sme: Implement streaming SVE signal handling arm64/sme: Implement ZA signal handling arm64/sme: Implement ptrace support for streaming mode SVE registers arm64/sme: Add ptrace support for ZA arm64/sme: Disable streaming mode and ZA when flushing CPU state arm64/sme: Save and restore streaming mode over EFI runtime calls KVM: arm64: Hide SME system registers from guests KVM: arm64: Trap SME usage in guest KVM: arm64: Handle SME host state when running guests arm64/sme: Provide Kconfig for SME kselftest/arm64: Add manual encodings for SME instructions kselftest/arm64: sme: Add SME support to vlset kselftest/arm64: Add tests for TPIDR2 kselftest/arm64: Extend vector configuration API tests to cover SME kselftest/arm64: sme: Provide streaming mode SVE stress test kselftest/arm64: signal: Handle ZA signal context in core code kselftest/arm64: Add stress test for SME ZA context switching kselftest/arm64: signal: Add SME signal handling tests kselftest/arm64: Add streaming SVE to SVE ptrace tests kselftest/arm64: Add coverage for the ZA ptrace interface kselftest/arm64: Add SME support to syscall ABI test selftests/arm64: Add a testcase for handling of ZA on clone() Documentation/arm64/elf_hwcaps.rst | 33 + Documentation/arm64/index.rst | 1 + Documentation/arm64/sme.rst | 428 +++++++++++++ Documentation/arm64/sve.rst | 70 ++- arch/arm64/Kconfig | 11 + arch/arm64/include/asm/cpu.h | 4 + arch/arm64/include/asm/cpufeature.h | 24 + arch/arm64/include/asm/el2_setup.h | 64 +- arch/arm64/include/asm/esr.h | 13 +- arch/arm64/include/asm/exception.h | 1 + arch/arm64/include/asm/fpsimd.h | 123 +++- arch/arm64/include/asm/fpsimdmacros.h | 87 +++ arch/arm64/include/asm/hwcap.h | 8 + arch/arm64/include/asm/kvm_arm.h | 1 + arch/arm64/include/asm/kvm_host.h | 4 + arch/arm64/include/asm/processor.h | 26 +- arch/arm64/include/asm/sysreg.h | 67 ++ arch/arm64/include/asm/thread_info.h | 2 + arch/arm64/include/uapi/asm/hwcap.h | 8 + arch/arm64/include/uapi/asm/ptrace.h | 69 ++- arch/arm64/include/uapi/asm/sigcontext.h | 55 +- arch/arm64/kernel/cpufeature.c | 106 ++++ arch/arm64/kernel/cpuinfo.c | 13 + arch/arm64/kernel/entry-common.c | 11 + arch/arm64/kernel/entry-fpsimd.S | 36 ++ arch/arm64/kernel/fpsimd.c | 585 ++++++++++++++++-- arch/arm64/kernel/process.c | 44 +- arch/arm64/kernel/ptrace.c | 358 +++++++++-- arch/arm64/kernel/signal.c | 188 +++++- arch/arm64/kernel/syscall.c | 29 +- arch/arm64/kernel/traps.c | 1 + arch/arm64/kvm/fpsimd.c | 43 +- arch/arm64/kvm/hyp/nvhe/switch.c | 30 + arch/arm64/kvm/hyp/vhe/switch.c | 11 +- arch/arm64/kvm/sys_regs.c | 9 +- arch/arm64/tools/cpucaps | 2 + include/uapi/linux/elf.h | 2 + include/uapi/linux/prctl.h | 9 + kernel/sys.c | 12 + tools/testing/selftests/arm64/abi/.gitignore | 1 + tools/testing/selftests/arm64/abi/Makefile | 9 +- .../selftests/arm64/abi/syscall-abi-asm.S | 79 ++- .../testing/selftests/arm64/abi/syscall-abi.c | 204 +++++- .../testing/selftests/arm64/abi/syscall-abi.h | 15 + tools/testing/selftests/arm64/abi/tpidr2.c | 298 +++++++++ tools/testing/selftests/arm64/fp/.gitignore | 5 + tools/testing/selftests/arm64/fp/Makefile | 19 +- tools/testing/selftests/arm64/fp/rdvl-sme.c | 14 + tools/testing/selftests/arm64/fp/rdvl.S | 10 + tools/testing/selftests/arm64/fp/rdvl.h | 1 + tools/testing/selftests/arm64/fp/sme-inst.h | 51 ++ tools/testing/selftests/arm64/fp/ssve-stress | 59 ++ tools/testing/selftests/arm64/fp/sve-ptrace.c | 175 +++++- tools/testing/selftests/arm64/fp/sve-test.S | 20 + tools/testing/selftests/arm64/fp/vec-syscfg.c | 10 + tools/testing/selftests/arm64/fp/vlset.c | 10 +- .../testing/selftests/arm64/fp/za-fork-asm.S | 61 ++ tools/testing/selftests/arm64/fp/za-fork.c | 156 +++++ tools/testing/selftests/arm64/fp/za-ptrace.c | 356 +++++++++++ tools/testing/selftests/arm64/fp/za-stress | 59 ++ tools/testing/selftests/arm64/fp/za-test.S | 388 ++++++++++++ .../testing/selftests/arm64/signal/.gitignore | 3 + .../selftests/arm64/signal/test_signals.h | 4 + .../arm64/signal/test_signals_utils.c | 6 + .../testcases/fake_sigreturn_sme_change_vl.c | 92 +++ .../arm64/signal/testcases/sme_trap_no_sm.c | 38 ++ .../signal/testcases/sme_trap_non_streaming.c | 45 ++ .../arm64/signal/testcases/sme_trap_za.c | 36 ++ .../selftests/arm64/signal/testcases/sme_vl.c | 68 ++ .../arm64/signal/testcases/ssve_regs.c | 135 ++++ .../arm64/signal/testcases/testcases.c | 36 ++ .../arm64/signal/testcases/testcases.h | 3 +- .../arm64/signal/testcases/za_regs.c | 128 ++++ 73 files changed, 4991 insertions(+), 191 deletions(-) create mode 100644 Documentation/arm64/sme.rst create mode 100644 tools/testing/selftests/arm64/abi/syscall-abi.h create mode 100644 tools/testing/selftests/arm64/abi/tpidr2.c create mode 100644 tools/testing/selftests/arm64/fp/rdvl-sme.c create mode 100644 tools/testing/selftests/arm64/fp/sme-inst.h create mode 100644 tools/testing/selftests/arm64/fp/ssve-stress create mode 100644 tools/testing/selftests/arm64/fp/za-fork-asm.S create mode 100644 tools/testing/selftests/arm64/fp/za-fork.c create mode 100644 tools/testing/selftests/arm64/fp/za-ptrace.c create mode 100644 tools/testing/selftests/arm64/fp/za-stress create mode 100644 tools/testing/selftests/arm64/fp/za-test.S create mode 100644 tools/testing/selftests/arm64/signal/testcases/fake_sigreturn_sme_change_vl.c create mode 100644 tools/testing/selftests/arm64/signal/testcases/sme_trap_no_sm.c create mode 100644 tools/testing/selftests/arm64/signal/testcases/sme_trap_non_streaming.c create mode 100644 tools/testing/selftests/arm64/signal/testcases/sme_trap_za.c create mode 100644 tools/testing/selftests/arm64/signal/testcases/sme_vl.c create mode 100644 tools/testing/selftests/arm64/signal/testcases/ssve_regs.c create mode 100644 tools/testing/selftests/arm64/signal/testcases/za_regs.c base-commit: b2d229d4ddb17db541098b83524d901257e93845 -- 2.30.2

2 years

8
58
0 0

[PATCH 4/4] KVM: selftests: Allocate ucall pool from MEM_REGION_DATA

by Oliver Upton

MEM_REGION_TEST_DATA is meant to hold data explicitly used by a selftest, not implicit allocations due to the selftests infrastructure. Allocate the ucall pool from MEM_REGION_DATA much like the rest of the selftests library allocations. Fixes: 426729b2cf2e ("KVM: selftests: Add ucall pool based implementation") Signed-off-by: Oliver Upton <oliver.upton(a)linux.dev> --- tools/testing/selftests/kvm/lib/ucall_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/kvm/lib/ucall_common.c b/tools/testing/selftests/kvm/lib/ucall_common.c index 820ce6c82829..0cc0971ce60e 100644 --- a/tools/testing/selftests/kvm/lib/ucall_common.c +++ b/tools/testing/selftests/kvm/lib/ucall_common.c @@ -22,7 +22,7 @@ void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa) vm_vaddr_t vaddr; int i; - vaddr = vm_vaddr_alloc(vm, sizeof(*hdr), KVM_UTIL_MIN_VADDR); + vaddr = __vm_vaddr_alloc(vm, sizeof(*hdr), KVM_UTIL_MIN_VADDR, MEM_REGION_DATA); hdr = (struct ucall_header *)addr_gva2hva(vm, vaddr); memset(hdr, 0, sizeof(*hdr)); -- 2.39.0.rc0.267.gcb52ba06e7-goog

2 years

2
2
0 0

[PATCH 1/4] KVM: selftests: Fix build due to ucall_uninit() removal

by Oliver Upton

From: Mark Brown <broonie(a)kernel.org> Today's -next fails to build on arm64 due to: In file included from include/kvm_util.h:11, from aarch64/page_fault_test.c:15: include/ucall_common.h:36:47: note: expected ‘vm_paddr_t’ {aka ‘long unsigned int’} but argument is of type ‘void *’ 36 | void ucall_init(struct kvm_vm *vm, vm_paddr_t mmio_gpa); | ~~~~~~~~~~~^~~~~~~~ aarch64/page_fault_test.c:725:2: warning: implicit declaration of function ‘ucall_uninit’; did you mean ‘ucall_init’? [-Wimplicit-function-declaration] 725 | ucall_uninit(vm); | ^~~~~~~~~~~~ | ucall_init which is caused by commit interacting poorly with commit 28a65567acb5 ("KVM: selftests: Drop now-unnecessary ucall_uninit()") As is done for other ucall_uninit() users remove the call in the newly added page_fault_test.c. Fixes: 28a65567acb5 ("KVM: selftests: Drop now-unnecessary ucall_uninit()") Fixes: 35c581015712 ("KVM: selftests: aarch64: Add aarch64/page_fault_test") Signed-off-by: Mark Brown <broonie(a)kernel.org> Cc: Sean Christopherson <seanjc(a)google.com> Cc: Ricardo Koller <ricarkol(a)google.com> Cc: Marc Zyngier <maz(a)kernel.org> Signed-off-by: Oliver Upton <oliver.upton(a)linux.dev> --- tools/testing/selftests/kvm/aarch64/page_fault_test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/kvm/aarch64/page_fault_test.c b/tools/testing/selftests/kvm/aarch64/page_fault_test.c index 0cda70bef5d5..92d3a91153b6 100644 --- a/tools/testing/selftests/kvm/aarch64/page_fault_test.c +++ b/tools/testing/selftests/kvm/aarch64/page_fault_test.c @@ -722,7 +722,6 @@ static void run_test(enum vm_guest_mode mode, void *arg) vcpu_run_loop(vm, vcpu, test); - ucall_uninit(vm); kvm_vm_free(vm); free_uffd(test, pt_uffd, data_uffd); -- 2.39.0.rc0.267.gcb52ba06e7-goog

2 years

1
0
0 0

[PATCH] kunit: tool: make parser preserve whitespace when printing test log

by Daniel Latypov

Currently, kunit_parser.py is stripping all leading whitespace to make parsing easier. But this means we can't accurately show kernel output for failing tests or when the kernel crashes. Embarassingly, this affects even KUnit's own output, e.g. [13:40:46] Expected 2 + 1 == 2, but [13:40:46] 2 + 1 == 3 (0x3) [13:40:46] not ok 1 example_simple_test [13:40:46] [FAILED] example_simple_test After this change, here's what the output in context would look like [13:40:46] =================== example (4 subtests) =================== [13:40:46] # example_simple_test: initializing [13:40:46] # example_simple_test: EXPECTATION FAILED at lib/kunit/kunit-example-test.c:29 [13:40:46] Expected 2 + 1 == 2, but [13:40:46] 2 + 1 == 3 (0x3) [13:40:46] [FAILED] example_simple_test [13:40:46] [SKIPPED] example_skip_test [13:40:46] [SKIPPED] example_mark_skipped_test [13:40:46] [PASSED] example_all_expect_macros_test [13:40:46] # example: initializing suite [13:40:46] # example: pass:1 fail:1 skip:2 total:4 [13:40:46] # Totals: pass:1 fail:1 skip:2 total:4 [13:40:46] ===================== [FAILED] example ===================== This example shows one minor cosmetic defect this approach has. The test counts lines prevent us from dedenting the suite-level output. But at the same time, any form of non-KUnit output would do the same unless it happened to be indented as well. Signed-off-by: Daniel Latypov <dlatypov(a)google.com> --- tools/testing/kunit/kunit.py | 2 +- tools/testing/kunit/kunit_parser.py | 27 +++++++++++++------------- tools/testing/kunit/kunit_tool_test.py | 2 ++ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/tools/testing/kunit/kunit.py b/tools/testing/kunit/kunit.py index e7b6549712d6..43fbe96318fe 100755 --- a/tools/testing/kunit/kunit.py +++ b/tools/testing/kunit/kunit.py @@ -202,7 +202,7 @@ def parse_tests(request: KunitParseRequest, metadata: kunit_json.Metadata, input if request.raw_output == 'all': pass elif request.raw_output == 'kunit': - output = kunit_parser.extract_tap_lines(output, lstrip=False) + output = kunit_parser.extract_tap_lines(output) for line in output: print(line.rstrip()) parse_time = time.time() - parse_start diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py index 99b8f058db40..a225799f6b1b 100644 --- a/tools/testing/kunit/kunit_parser.py +++ b/tools/testing/kunit/kunit_parser.py @@ -13,6 +13,7 @@ from __future__ import annotations from dataclasses import dataclass import re import sys +import textwrap from enum import Enum, auto from typing import Iterable, Iterator, List, Optional, Tuple @@ -208,12 +209,12 @@ class LineStream: # Parsing helper methods: -KTAP_START = re.compile(r'KTAP version ([0-9]+)$') -TAP_START = re.compile(r'TAP version ([0-9]+)$') -KTAP_END = re.compile('(List of all partitions:|' +KTAP_START = re.compile(r'\s*KTAP version ([0-9]+)$') +TAP_START = re.compile(r'\s*TAP version ([0-9]+)$') +KTAP_END = re.compile(r'\s*(List of all partitions:|' 'Kernel panic - not syncing: VFS:|reboot: System halted)') -def extract_tap_lines(kernel_output: Iterable[str], lstrip=True) -> LineStream: +def extract_tap_lines(kernel_output: Iterable[str]) -> LineStream: """Extracts KTAP lines from the kernel output.""" def isolate_ktap_output(kernel_output: Iterable[str]) \ -> Iterator[Tuple[int, str]]: @@ -239,11 +240,8 @@ def extract_tap_lines(kernel_output: Iterable[str], lstrip=True) -> LineStream: # stop extracting KTAP lines break elif started: - # remove the prefix and optionally any leading - # whitespace. Our parsing logic relies on this. + # remove the prefix, if any. line = line[prefix_len:] - if lstrip: - line = line.lstrip() yield line_num, line return LineStream(lines=isolate_ktap_output(kernel_output)) @@ -298,7 +296,7 @@ def parse_ktap_header(lines: LineStream, test: Test) -> bool: lines.pop() return True -TEST_HEADER = re.compile(r'^# Subtest: (.*)$') +TEST_HEADER = re.compile(r'^\s*# Subtest: (.*)$') def parse_test_header(lines: LineStream, test: Test) -> bool: """ @@ -322,7 +320,7 @@ def parse_test_header(lines: LineStream, test: Test) -> bool: lines.pop() return True -TEST_PLAN = re.compile(r'1\.\.([0-9]+)') +TEST_PLAN = re.compile(r'^\s*1\.\.([0-9]+)') def parse_test_plan(lines: LineStream, test: Test) -> bool: """ @@ -350,9 +348,9 @@ def parse_test_plan(lines: LineStream, test: Test) -> bool: lines.pop() return True -TEST_RESULT = re.compile(r'^(ok|not ok) ([0-9]+) (- )?([^#]*)( # .*)?$') +TEST_RESULT = re.compile(r'^\s*(ok|not ok) ([0-9]+) (- )?([^#]*)( # .*)?$') -TEST_RESULT_SKIP = re.compile(r'^(ok|not ok) ([0-9]+) (- )?(.*) # SKIP(.*)$') +TEST_RESULT_SKIP = re.compile(r'^\s*(ok|not ok) ([0-9]+) (- )?(.*) # SKIP(.*)$') def peek_test_name_match(lines: LineStream, test: Test) -> bool: """ @@ -511,8 +509,9 @@ def print_test_header(test: Test) -> None: def print_log(log: Iterable[str]) -> None: """Prints all strings in saved log for test in yellow.""" - for m in log: - stdout.print_with_timestamp(stdout.yellow(m)) + formatted = textwrap.dedent('\n'.join(log)) + for line in formatted.splitlines(): + stdout.print_with_timestamp(stdout.yellow(line)) def format_test_result(test: Test) -> str: """ diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py index 1ef921ac4331..0c2190514103 100755 --- a/tools/testing/kunit/kunit_tool_test.py +++ b/tools/testing/kunit/kunit_tool_test.py @@ -336,12 +336,14 @@ class KUnitParserTest(unittest.TestCase): KTAP version 1 1..1 Test output. + Indented more. not ok 1 test1 """ result = kunit_parser.parse_run_tests(output.splitlines()) self.assertEqual(kunit_parser.TestStatus.FAILURE, result.status) self.print_mock.assert_any_call(StrContains('Test output.')) + self.print_mock.assert_any_call(StrContains(' Indented more.')) self.noPrintCallContains('not ok 1 test1') def line_stream_from_strs(strs: Iterable[str]) -> kunit_parser.LineStream: base-commit: 0f08f3e2a0186dfb8e33cb46105228eb18448a0e -- 2.38.1.584.g0f3c55d4c2-goog

2 years

2
2
0 0

Re: [PATCH v3 18/20] drm/vc4: tests: Fail the current test if we access a register

by Maíra Canal

On 12/1/22 12:11, Maxime Ripard wrote: > Accessing a register when running under kunit is a bad idea since our > device is completely mocked. > > Fail the current test if we ever access any of our hardware registers. > > Reviewed-by: Javier Martinez Canillas <javierm(a)redhat.com> > Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> Reviewed-by: Maíra Canal <mcanal(a)igalia.com> Just a small nit: I believe that macros with multiple statements should be enclosed in a do-while block [1], even READ macros. I saw that you enclosed the WRITE macros on a do-while block, but not the READ macros. [1] https://www.kernel.org/doc/html/latest/process/coding-style.html#macros-enu… Best Regards, - Maíra Canal > --- > drivers/gpu/drm/vc4/vc4_crtc.c | 13 +++++++++++-- > drivers/gpu/drm/vc4/vc4_dpi.c | 13 +++++++++++-- > drivers/gpu/drm/vc4/vc4_drv.h | 29 +++++++++++++++++++++++++---- > drivers/gpu/drm/vc4/vc4_dsi.c | 9 ++++++++- > drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 4 ++++ > drivers/gpu/drm/vc4/vc4_txp.c | 13 +++++++++++-- > drivers/gpu/drm/vc4/vc4_vec.c | 13 +++++++++++-- > 7 files changed, 81 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c > index 7d1a696477ce..a1a3465948c4 100644 > --- a/drivers/gpu/drm/vc4/vc4_crtc.c > +++ b/drivers/gpu/drm/vc4/vc4_crtc.c > @@ -50,8 +50,17 @@ > > #define HVS_FIFO_LATENCY_PIX 6 > > -#define CRTC_WRITE(offset, val) writel(val, vc4_crtc->regs + (offset)) > -#define CRTC_READ(offset) readl(vc4_crtc->regs + (offset)) > +#define CRTC_WRITE(offset, val) \ > + do { \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + writel(val, vc4_crtc->regs + (offset)); \ > + } while (0) > + > +#define CRTC_READ(offset) \ > + ({ \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + readl(vc4_crtc->regs + (offset)); \ > + }) > > static const struct debugfs_reg32 crtc_regs[] = { > VC4_REG32(PV_CONTROL), > diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c > index 1f8f44b7b5a5..0edf3c4c98c8 100644 > --- a/drivers/gpu/drm/vc4/vc4_dpi.c > +++ b/drivers/gpu/drm/vc4/vc4_dpi.c > @@ -103,8 +103,17 @@ to_vc4_dpi(struct drm_encoder *encoder) > return container_of(encoder, struct vc4_dpi, encoder.base); > } > > -#define DPI_READ(offset) readl(dpi->regs + (offset)) > -#define DPI_WRITE(offset, val) writel(val, dpi->regs + (offset)) > +#define DPI_READ(offset) \ > + ({ \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + readl(dpi->regs + (offset)); \ > + }) > + > +#define DPI_WRITE(offset, val) \ > + do { \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + writel(val, dpi->regs + (offset)); \ > + } while (0) > > static const struct debugfs_reg32 dpi_regs[] = { > VC4_REG32(DPI_C), > diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h > index 418f4f308e36..78fda5332cb3 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.h > +++ b/drivers/gpu/drm/vc4/vc4_drv.h > @@ -19,6 +19,8 @@ > #include <drm/drm_mm.h> > #include <drm/drm_modeset_lock.h> > > +#include <kunit/test-bug.h> > + > #include "uapi/drm/vc4_drm.h" > > struct drm_device; > @@ -645,10 +647,29 @@ to_vc4_crtc_state(const struct drm_crtc_state *crtc_state) > return container_of(crtc_state, struct vc4_crtc_state, base); > } > > -#define V3D_READ(offset) readl(vc4->v3d->regs + offset) > -#define V3D_WRITE(offset, val) writel(val, vc4->v3d->regs + offset) > -#define HVS_READ(offset) readl(hvs->regs + offset) > -#define HVS_WRITE(offset, val) writel(val, hvs->regs + offset) > +#define V3D_READ(offset) \ > + ({ \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + readl(vc4->v3d->regs + (offset)); \ > + }) > + > +#define V3D_WRITE(offset, val) \ > + do { \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + writel(val, vc4->v3d->regs + (offset)); \ > + } while (0) > + > +#define HVS_READ(offset) \ > + ({ \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + readl(hvs->regs + (offset)); \ > + }) > + > +#define HVS_WRITE(offset, val) \ > + do { \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + writel(val, hvs->regs + (offset)); \ > + } while (0) > > #define VC4_REG32(reg) { .name = #reg, .offset = reg } > > diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c > index 878e05d79e81..2c9cb27903a0 100644 > --- a/drivers/gpu/drm/vc4/vc4_dsi.c > +++ b/drivers/gpu/drm/vc4/vc4_dsi.c > @@ -617,6 +617,8 @@ dsi_dma_workaround_write(struct vc4_dsi *dsi, u32 offset, u32 val) > dma_cookie_t cookie; > int ret; > > + kunit_fail_current_test("Accessing a register in a unit test!\n"); > + > /* DSI0 should be able to write normally. */ > if (!chan) { > writel(val, dsi->regs + offset); > @@ -645,7 +647,12 @@ dsi_dma_workaround_write(struct vc4_dsi *dsi, u32 offset, u32 val) > DRM_ERROR("Failed to wait for DMA: %d\n", ret); > } > > -#define DSI_READ(offset) readl(dsi->regs + (offset)) > +#define DSI_READ(offset) \ > + ({ \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + readl(dsi->regs + (offset)); \ > + }) > + > #define DSI_WRITE(offset, val) dsi_dma_workaround_write(dsi, offset, val) > #define DSI_PORT_READ(offset) \ > DSI_READ(dsi->variant->port ? DSI1_##offset : DSI0_##offset) > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h > index 48db438550b1..b04b2fc8d831 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h > +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h > @@ -456,6 +456,8 @@ static inline u32 vc4_hdmi_read(struct vc4_hdmi *hdmi, > > WARN_ON(pm_runtime_status_suspended(&hdmi->pdev->dev)); > > + kunit_fail_current_test("Accessing an HDMI register in a unit test!\n"); > + > if (reg >= variant->num_registers) { > dev_warn(&hdmi->pdev->dev, > "Invalid register ID %u\n", reg); > @@ -486,6 +488,8 @@ static inline void vc4_hdmi_write(struct vc4_hdmi *hdmi, > > WARN_ON(pm_runtime_status_suspended(&hdmi->pdev->dev)); > > + kunit_fail_current_test("Accessing an HDMI register in a unit test!\n"); > + > if (reg >= variant->num_registers) { > dev_warn(&hdmi->pdev->dev, > "Invalid register ID %u\n", reg); > diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c > index 2b69454b8534..ef5cab2a3aa9 100644 > --- a/drivers/gpu/drm/vc4/vc4_txp.c > +++ b/drivers/gpu/drm/vc4/vc4_txp.c > @@ -145,8 +145,17 @@ > /* Number of lines received and committed to memory. */ > #define TXP_PROGRESS 0x10 > > -#define TXP_READ(offset) readl(txp->regs + (offset)) > -#define TXP_WRITE(offset, val) writel(val, txp->regs + (offset)) > +#define TXP_READ(offset) \ > + ({ \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + readl(txp->regs + (offset)); \ > + }) > + > +#define TXP_WRITE(offset, val) \ > + do { \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + writel(val, txp->regs + (offset)); \ > + } while (0) > > struct vc4_txp { > struct vc4_crtc base; > diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c > index e270a4099be3..f589ab918f4d 100644 > --- a/drivers/gpu/drm/vc4/vc4_vec.c > +++ b/drivers/gpu/drm/vc4/vc4_vec.c > @@ -207,8 +207,17 @@ struct vc4_vec { > struct debugfs_regset32 regset; > }; > > -#define VEC_READ(offset) readl(vec->regs + (offset)) > -#define VEC_WRITE(offset, val) writel(val, vec->regs + (offset)) > +#define VEC_READ(offset) \ > + ({ \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + readl(vec->regs + (offset)); \ > + }) > + > +#define VEC_WRITE(offset, val) \ > + do { \ > + kunit_fail_current_test("Accessing a register in a unit test!\n"); \ > + writel(val, vec->regs + (offset)); \ > + } while (0) > > static inline struct vc4_vec * > encoder_to_vc4_vec(struct drm_encoder *encoder) >

2 years

2
1
0 0

Re: [PATCH v3 19/20] drm/vc4: tests: Add unit test suite for the PV muxing

by Maíra Canal

On 12/1/22 12:11, Maxime Ripard wrote: > The HVS to PixelValve muxing code is fairly error prone and has a bunch > of arbitrary constraints due to the hardware setup. > > Let's create a test suite that makes sure that the possible combinations > work and the invalid ones don't. > > Reviewed-by: Javier Martinez Canillas <javierm(a)redhat.com> > Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> Reviewed-by: Maíra Canal <mcanal(a)igalia.com> Best Regards, - Maíra Canal > --- > drivers/gpu/drm/vc4/Makefile | 3 +- > drivers/gpu/drm/vc4/tests/vc4_mock.h | 9 +- > drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 49 +- > drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 1039 ++++++++++++++++++++++++ > 4 files changed, 1091 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile > index f974a8c80e2f..c41f89a15a55 100644 > --- a/drivers/gpu/drm/vc4/Makefile > +++ b/drivers/gpu/drm/vc4/Makefile > @@ -29,7 +29,8 @@ vc4-$(CONFIG_DRM_VC4_KUNIT_TEST) += \ > tests/vc4_mock.o \ > tests/vc4_mock_crtc.o \ > tests/vc4_mock_output.o \ > - tests/vc4_mock_plane.o > + tests/vc4_mock_plane.o \ > + tests/vc4_test_pv_muxing.o > > vc4-$(CONFIG_DEBUG_FS) += vc4_debugfs.o > > diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.h b/drivers/gpu/drm/vc4/tests/vc4_mock.h > index ace5b2e00f4a..db8e9a141ef8 100644 > --- a/drivers/gpu/drm/vc4/tests/vc4_mock.h > +++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h > @@ -53,8 +53,11 @@ struct vc4_dummy_output *vc4_dummy_output(struct kunit *test, > struct vc4_dev *vc4_mock_device(struct kunit *test); > struct vc4_dev *vc5_mock_device(struct kunit *test); > > -int vc4_mock_atomic_add_output(struct kunit *test, struct drm_device *drm, > - enum vc4_encoder_type type, > - struct drm_atomic_state *state); > +int vc4_mock_atomic_add_output(struct kunit *test, > + struct drm_atomic_state *state, > + enum vc4_encoder_type type); > +int vc4_mock_atomic_del_output(struct kunit *test, > + struct drm_atomic_state *state, > + enum vc4_encoder_type type); > > #endif // VC4_MOCK_H_ > diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c > index cb16ab4451f7..8d33be828d9a 100644 > --- a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c > +++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c > @@ -61,16 +61,17 @@ static const struct drm_display_mode default_mode = { > DRM_SIMPLE_MODE(640, 480, 64, 48) > }; > > -int vc4_mock_atomic_add_output(struct kunit *test, struct drm_device *drm, > - enum vc4_encoder_type type, > - struct drm_atomic_state *state) > +int vc4_mock_atomic_add_output(struct kunit *test, > + struct drm_atomic_state *state, > + enum vc4_encoder_type type) > { > + struct drm_device *drm = state->dev; > + struct drm_connector_state *conn_state; > + struct drm_crtc_state *crtc_state; > struct vc4_dummy_output *output; > struct drm_connector *conn; > - struct drm_connector_state *conn_state; > struct drm_encoder *encoder; > struct drm_crtc *crtc; > - struct drm_crtc_state *crtc_state; > int ret; > > encoder = vc4_find_encoder_by_type(drm, type); > @@ -97,3 +98,41 @@ int vc4_mock_atomic_add_output(struct kunit *test, struct drm_device *drm, > > return 0; > } > + > +int vc4_mock_atomic_del_output(struct kunit *test, > + struct drm_atomic_state *state, > + enum vc4_encoder_type type) > +{ > + struct drm_device *drm = state->dev; > + struct drm_connector_state *conn_state; > + struct drm_crtc_state *crtc_state; > + struct vc4_dummy_output *output; > + struct drm_connector *conn; > + struct drm_encoder *encoder; > + struct drm_crtc *crtc; > + int ret; > + > + encoder = vc4_find_encoder_by_type(drm, type); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder); > + > + crtc = vc4_find_crtc_for_encoder(test, drm, encoder); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc); > + > + crtc_state = drm_atomic_get_crtc_state(state, crtc); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); > + > + crtc_state->active = false; > + > + ret = drm_atomic_set_mode_for_crtc(crtc_state, NULL); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + output = container_of(encoder, struct vc4_dummy_output, encoder.base); > + conn = &output->connector; > + conn_state = drm_atomic_get_connector_state(state, conn); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); > + > + ret = drm_atomic_set_crtc_for_connector(conn_state, NULL); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + return 0; > +} > diff --git a/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c > new file mode 100644 > index 000000000000..ae0bd0f81698 > --- /dev/null > +++ b/drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c > @@ -0,0 +1,1039 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_atomic_state_helper.h> > +#include <drm/drm_atomic_uapi.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_fourcc.h> > +#include <drm/drm_kunit_helpers.h> > +#include <drm/drm_mode.h> > +#include <drm/drm_modeset_helper_vtables.h> > +#include <drm/drm_plane.h> > + > +#include <kunit/test.h> > + > +#include "../vc4_drv.h" > + > +#include "vc4_mock.h" > + > +struct pv_muxing_priv { > + struct vc4_dev *vc4; > + struct drm_modeset_acquire_ctx ctx; > + struct drm_atomic_state *state; > +}; > + > +static bool check_fifo_conflict(struct kunit *test, > + const struct drm_atomic_state *state) > +{ > + struct vc4_hvs_state *hvs_state; > + unsigned int used_fifos = 0; > + unsigned int i; > + > + hvs_state = vc4_hvs_get_new_global_state(state); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, hvs_state); > + > + for (i = 0; i < HVS_NUM_CHANNELS; i++) { > + if (!hvs_state->fifo_state[i].in_use) > + continue; > + > + KUNIT_EXPECT_FALSE(test, used_fifos & BIT(i)); > + used_fifos |= BIT(i); > + } > + > + return true; > +} > + > +struct encoder_constraint { > + enum vc4_encoder_type type; > + unsigned int *channels; > + size_t nchannels; > +}; > + > +#define ENCODER_CONSTRAINT(_type, ...) \ > + { \ > + .type = _type, \ > + .channels = (unsigned int[]) { __VA_ARGS__ }, \ > + .nchannels = sizeof((unsigned int[]) { __VA_ARGS__ }) / \ > + sizeof(unsigned int), \ > + } > + > +static bool __check_encoder_constraints(const struct encoder_constraint *constraints, > + size_t nconstraints, > + enum vc4_encoder_type type, > + unsigned int channel) > +{ > + unsigned int i; > + > + for (i = 0; i < nconstraints; i++) { > + const struct encoder_constraint *constraint = &constraints[i]; > + unsigned int j; > + > + if (constraint->type != type) > + continue; > + > + for (j = 0; j < constraint->nchannels; j++) { > + unsigned int _channel = constraint->channels[j]; > + > + if (channel != _channel) > + continue; > + > + return true; > + } > + } > + > + return false; > +} > + > +static const struct encoder_constraint vc4_encoder_constraints[] = { > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DPI, 0), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI0, 0), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 1), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_VEC, 1), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP, 2), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 2), > +}; > + > +static const struct encoder_constraint vc5_encoder_constraints[] = { > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DPI, 0), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI0, 0), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_VEC, 1), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_TXP, 0, 2), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_DSI1, 0, 1, 2), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI0, 0, 1, 2), > + ENCODER_CONSTRAINT(VC4_ENCODER_TYPE_HDMI1, 0, 1, 2), > +}; > + > +static bool check_vc4_encoder_constraints(enum vc4_encoder_type type, unsigned int channel) > +{ > + return __check_encoder_constraints(vc4_encoder_constraints, > + ARRAY_SIZE(vc4_encoder_constraints), > + type, channel); > +} > + > +static bool check_vc5_encoder_constraints(enum vc4_encoder_type type, unsigned int channel) > +{ > + return __check_encoder_constraints(vc5_encoder_constraints, > + ARRAY_SIZE(vc5_encoder_constraints), > + type, channel); > +} > + > +static struct vc4_crtc_state * > +get_vc4_crtc_state_for_encoder(struct kunit *test, > + const struct drm_atomic_state *state, > + enum vc4_encoder_type type) > +{ > + struct drm_device *drm = state->dev; > + struct drm_crtc_state *new_crtc_state; > + struct drm_encoder *encoder; > + struct drm_crtc *crtc; > + > + encoder = vc4_find_encoder_by_type(drm, type); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder); > + > + crtc = vc4_find_crtc_for_encoder(test, drm, encoder); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc); > + > + new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc); > + if (!new_crtc_state) > + return NULL; > + > + return to_vc4_crtc_state(new_crtc_state); > +} > + > +static bool check_channel_for_encoder(struct kunit *test, > + const struct drm_atomic_state *state, > + enum vc4_encoder_type type, > + bool (*check_fn)(enum vc4_encoder_type type, unsigned int channel)) > +{ > + struct vc4_crtc_state *new_vc4_crtc_state; > + struct vc4_hvs_state *new_hvs_state; > + unsigned int channel; > + > + new_hvs_state = vc4_hvs_get_new_global_state(state); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state); > + > + new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state, type); > + KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state); > + > + channel = new_vc4_crtc_state->assigned_channel; > + KUNIT_EXPECT_NE(test, channel, VC4_HVS_CHANNEL_DISABLED); > + > + KUNIT_EXPECT_TRUE(test, new_hvs_state->fifo_state[channel].in_use); > + > + KUNIT_EXPECT_TRUE(test, check_fn(type, channel)); > + > + return true; > +} > + > +struct pv_muxing_param { > + const char *name; > + struct vc4_dev *(*mock_fn)(struct kunit *test); > + bool (*check_fn)(enum vc4_encoder_type type, unsigned int channel); > + enum vc4_encoder_type *encoders; > + size_t nencoders; > +}; > + > +static void vc4_test_pv_muxing_desc(const struct pv_muxing_param *t, char *desc) > +{ > + strscpy(desc, t->name, KUNIT_PARAM_DESC_SIZE); > +} > + > +#define PV_MUXING_TEST(_name, _mock_fn, _check_fn, ...) \ > + { \ > + .name = _name, \ > + .mock_fn = &_mock_fn, \ > + .check_fn = &_check_fn, \ > + .encoders = (enum vc4_encoder_type[]) { __VA_ARGS__ }, \ > + .nencoders = sizeof((enum vc4_encoder_type[]) { __VA_ARGS__ }) / \ > + sizeof(enum vc4_encoder_type), \ > + } > + > +#define VC4_PV_MUXING_TEST(_name, ...) \ > + PV_MUXING_TEST(_name, vc4_mock_device, check_vc4_encoder_constraints, __VA_ARGS__) > + > +#define VC5_PV_MUXING_TEST(_name, ...) \ > + PV_MUXING_TEST(_name, vc5_mock_device, check_vc5_encoder_constraints, __VA_ARGS__) > + > +static const struct pv_muxing_param vc4_test_pv_muxing_params[] = { > + VC4_PV_MUXING_TEST("1 output: DSI0", > + VC4_ENCODER_TYPE_DSI0), > + VC4_PV_MUXING_TEST("1 output: DPI", > + VC4_ENCODER_TYPE_DPI), > + VC4_PV_MUXING_TEST("1 output: HDMI0", > + VC4_ENCODER_TYPE_HDMI0), > + VC4_PV_MUXING_TEST("1 output: VEC", > + VC4_ENCODER_TYPE_VEC), > + VC4_PV_MUXING_TEST("1 output: DSI1", > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("1 output: TXP", > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("2 outputs: DSI0, HDMI0", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_HDMI0), > + VC4_PV_MUXING_TEST("2 outputs: DSI0, VEC", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC), > + VC4_PV_MUXING_TEST("2 outputs: DSI0, DSI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("2 outputs: DSI0, TXP", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("2 outputs: DPI, HDMI0", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_HDMI0), > + VC4_PV_MUXING_TEST("2 outputs: DPI, VEC", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC), > + VC4_PV_MUXING_TEST("2 outputs: DPI, DSI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("2 outputs: DPI, TXP", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("2 outputs: HDMI0, DSI1", > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("2 outputs: HDMI0, TXP", > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("2 outputs: VEC, DSI1", > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("2 outputs: VEC, TXP", > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, DSI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, TXP", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("3 outputs: DSI0, VEC, DSI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("3 outputs: DSI0, VEC, TXP", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("3 outputs: DPI, HDMI0, DSI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("3 outputs: DPI, HDMI0, TXP", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("3 outputs: DPI, VEC, DSI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("3 outputs: DPI, VEC, TXP", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP), > +}; > + > +KUNIT_ARRAY_PARAM(vc4_test_pv_muxing, > + vc4_test_pv_muxing_params, > + vc4_test_pv_muxing_desc); > + > +static const struct pv_muxing_param vc4_test_pv_muxing_invalid_params[] = { > + VC4_PV_MUXING_TEST("DPI/DSI0 Conflict", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_DSI0), > + VC4_PV_MUXING_TEST("TXP/DSI1 Conflict", > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1), > + VC4_PV_MUXING_TEST("HDMI0/VEC Conflict", > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_VEC), > + VC4_PV_MUXING_TEST("More than 3 outputs: DSI0, HDMI0, DSI1, TXP", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, TXP", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("More than 3 outputs: DPI, HDMI0, DSI1, TXP", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_TXP), > + VC4_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, TXP", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_TXP), > +}; > + > +KUNIT_ARRAY_PARAM(vc4_test_pv_muxing_invalid, > + vc4_test_pv_muxing_invalid_params, > + vc4_test_pv_muxing_desc); > + > +static const struct pv_muxing_param vc5_test_pv_muxing_params[] = { > + VC5_PV_MUXING_TEST("1 output: DPI", > + VC4_ENCODER_TYPE_DPI), > + VC5_PV_MUXING_TEST("1 output: DSI0", > + VC4_ENCODER_TYPE_DSI0), > + VC5_PV_MUXING_TEST("1 output: DSI1", > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("1 output: HDMI0", > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("1 output: HDMI1", > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("1 output: VEC", > + VC4_ENCODER_TYPE_VEC), > + VC5_PV_MUXING_TEST("2 outputs: DPI, DSI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("2 outputs: DPI, HDMI0", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("2 outputs: DPI, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("2 outputs: DPI, TXP", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_TXP), > + VC5_PV_MUXING_TEST("2 outputs: DPI, VEC", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC), > + VC5_PV_MUXING_TEST("2 outputs: DPI, DSI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("2 outputs: DSI0, DSI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("2 outputs: DSI0, HDMI0", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("2 outputs: DSI0, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("2 outputs: DSI0, TXP", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_TXP), > + VC5_PV_MUXING_TEST("2 outputs: DSI0, VEC", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC), > + VC5_PV_MUXING_TEST("2 outputs: DSI0, DSI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("2 outputs: DSI1, VEC", > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_VEC), > + VC5_PV_MUXING_TEST("2 outputs: DSI1, TXP", > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_TXP), > + VC5_PV_MUXING_TEST("2 outputs: DSI1, HDMI0", > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("2 outputs: DSI1, HDMI1", > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("2 outputs: HDMI0, VEC", > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_VEC), > + VC5_PV_MUXING_TEST("2 outputs: HDMI0, TXP", > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_TXP), > + VC5_PV_MUXING_TEST("2 outputs: HDMI0, HDMI1", > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("2 outputs: HDMI1, VEC", > + VC4_ENCODER_TYPE_HDMI1, > + VC4_ENCODER_TYPE_VEC), > + VC5_PV_MUXING_TEST("2 outputs: HDMI1, TXP", > + VC4_ENCODER_TYPE_HDMI1, > + VC4_ENCODER_TYPE_TXP), > + VC5_PV_MUXING_TEST("2 outputs: TXP, VEC", > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_VEC), > + VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, TXP", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP), > + VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, DSI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, HDMI0", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("3 outputs: DPI, VEC, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, DSI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, HDMI0", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("3 outputs: DPI, TXP, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("3 outputs: DPI, DSI1, HDMI0", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("3 outputs: DPI, DSI1, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("3 outputs: DPI, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, TXP", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, DSI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, HDMI0", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, VEC, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, DSI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, HDMI0", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, TXP, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, DSI1, HDMI0", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, DSI1, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("3 outputs: DSI0, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > +}; > + > +KUNIT_ARRAY_PARAM(vc5_test_pv_muxing, > + vc5_test_pv_muxing_params, > + vc4_test_pv_muxing_desc); > + > +static const struct pv_muxing_param vc5_test_pv_muxing_invalid_params[] = { > + VC5_PV_MUXING_TEST("DPI/DSI0 Conflict", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_DSI0), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI0", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI0", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI0", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, DSI1, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI0", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, DSI1, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, TXP, DSI1, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI0", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI0", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI0", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, DSI1, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI0", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, DSI1, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, TXP, DSI1, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: VEC, TXP, DSI1, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DPI, VEC, TXP, DSI1, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DPI, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > + VC5_PV_MUXING_TEST("More than 3 outputs: DSI0, VEC, TXP, DSI1, HDMI0, HDMI1", > + VC4_ENCODER_TYPE_DSI0, > + VC4_ENCODER_TYPE_VEC, > + VC4_ENCODER_TYPE_TXP, > + VC4_ENCODER_TYPE_DSI1, > + VC4_ENCODER_TYPE_HDMI0, > + VC4_ENCODER_TYPE_HDMI1), > +}; > + > +KUNIT_ARRAY_PARAM(vc5_test_pv_muxing_invalid, > + vc5_test_pv_muxing_invalid_params, > + vc4_test_pv_muxing_desc); > + > +static void drm_vc4_test_pv_muxing(struct kunit *test) > +{ > + const struct pv_muxing_param *params = test->param_value; > + const struct pv_muxing_priv *priv = test->priv; > + struct drm_atomic_state *state = priv->state; > + unsigned int i; > + int ret; > + > + for (i = 0; i < params->nencoders; i++) { > + enum vc4_encoder_type enc_type = params->encoders[i]; > + > + ret = vc4_mock_atomic_add_output(test, state, enc_type); > + KUNIT_ASSERT_EQ(test, ret, 0); > + } > + > + ret = drm_atomic_check_only(state); > + KUNIT_EXPECT_EQ(test, ret, 0); > + > + KUNIT_EXPECT_TRUE(test, > + check_fifo_conflict(test, state)); > + > + for (i = 0; i < params->nencoders; i++) { > + enum vc4_encoder_type enc_type = params->encoders[i]; > + > + KUNIT_EXPECT_TRUE(test, check_channel_for_encoder(test, state, enc_type, > + params->check_fn)); > + } > +} > + > +static void drm_vc4_test_pv_muxing_invalid(struct kunit *test) > +{ > + const struct pv_muxing_param *params = test->param_value; > + const struct pv_muxing_priv *priv = test->priv; > + struct drm_atomic_state *state = priv->state; > + unsigned int i; > + int ret; > + > + for (i = 0; i < params->nencoders; i++) { > + enum vc4_encoder_type enc_type = params->encoders[i]; > + > + ret = vc4_mock_atomic_add_output(test, state, enc_type); > + KUNIT_ASSERT_EQ(test, ret, 0); > + } > + > + ret = drm_atomic_check_only(state); > + KUNIT_EXPECT_LT(test, ret, 0); > +} > + > +static int vc4_pv_muxing_test_init(struct kunit *test) > +{ > + const struct pv_muxing_param *params = test->param_value; > + struct drm_atomic_state *state; > + struct pv_muxing_priv *priv; > + struct drm_device *drm; > + struct vc4_dev *vc4; > + > + priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL); > + KUNIT_ASSERT_NOT_NULL(test, priv); > + test->priv = priv; > + > + vc4 = params->mock_fn(test); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4); > + priv->vc4 = vc4; > + > + drm_modeset_acquire_init(&priv->ctx, 0); > + > + drm = &vc4->base; > + state = drm_atomic_state_alloc(drm); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); > + > + state->acquire_ctx = &priv->ctx; > + > + priv->state = state; > + > + return 0; > +} > + > +static void vc4_pv_muxing_test_exit(struct kunit *test) > +{ > + struct pv_muxing_priv *priv = test->priv; > + struct vc4_dev *vc4 = priv->vc4; > + struct drm_device *drm = &vc4->base; > + struct drm_atomic_state *state = priv->state; > + > + drm_atomic_state_put(state); > + drm_modeset_drop_locks(&priv->ctx); > + drm_modeset_acquire_fini(&priv->ctx); > + drm_dev_unregister(drm); > + drm_kunit_helper_free_device(test, vc4->dev); > +} > + > +static struct kunit_case vc4_pv_muxing_tests[] = { > + KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing, > + vc4_test_pv_muxing_gen_params), > + KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing_invalid, > + vc4_test_pv_muxing_invalid_gen_params), > + {} > +}; > + > +static struct kunit_suite vc4_pv_muxing_test_suite = { > + .name = "vc4-pv-muxing-combinations", > + .init = vc4_pv_muxing_test_init, > + .exit = vc4_pv_muxing_test_exit, > + .test_cases = vc4_pv_muxing_tests, > +}; > + > +static struct kunit_case vc5_pv_muxing_tests[] = { > + KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing, > + vc5_test_pv_muxing_gen_params), > + KUNIT_CASE_PARAM(drm_vc4_test_pv_muxing_invalid, > + vc5_test_pv_muxing_invalid_gen_params), > + {} > +}; > + > +static struct kunit_suite vc5_pv_muxing_test_suite = { > + .name = "vc5-pv-muxing-combinations", > + .init = vc4_pv_muxing_test_init, > + .exit = vc4_pv_muxing_test_exit, > + .test_cases = vc5_pv_muxing_tests, > +}; > + > +/* See > + * https://lore.kernel.org/all/3e113525-aa89-b1e2-56b7-ca55bd41d057@samsung.co… > + * and > + * https://lore.kernel.org/dri-devel/20200917121623.42023-1-maxime@cerno.tech/ > + */ > +static void drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable(struct kunit *test) > +{ > + struct drm_modeset_acquire_ctx ctx; > + struct drm_atomic_state *state; > + struct vc4_crtc_state *new_vc4_crtc_state; > + struct vc4_hvs_state *new_hvs_state; > + unsigned int hdmi0_channel; > + unsigned int hdmi1_channel; > + struct drm_device *drm; > + struct vc4_dev *vc4; > + int ret; > + > + vc4 = vc5_mock_device(test); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4); > + > + drm_modeset_acquire_init(&ctx, 0); > + > + drm = &vc4->base; > + state = drm_atomic_state_alloc(drm); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); > + > + state->acquire_ctx = &ctx; > + > + ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = drm_atomic_check_only(state); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + new_hvs_state = vc4_hvs_get_new_global_state(state); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state); > + > + new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state, > + VC4_ENCODER_TYPE_HDMI0); > + KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state); > + > + hdmi0_channel = new_vc4_crtc_state->assigned_channel; > + KUNIT_ASSERT_NE(test, hdmi0_channel, VC4_HVS_CHANNEL_DISABLED); > + KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[hdmi0_channel].in_use); > + > + ret = drm_atomic_helper_swap_state(state, false); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + drm_atomic_state_put(state); > + > + state = drm_atomic_state_alloc(drm); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); > + > + state->acquire_ctx = &ctx; > + > + ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = drm_atomic_check_only(state); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + new_hvs_state = vc4_hvs_get_new_global_state(state); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state); > + > + new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state, > + VC4_ENCODER_TYPE_HDMI1); > + KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state); > + > + hdmi1_channel = new_vc4_crtc_state->assigned_channel; > + KUNIT_ASSERT_NE(test, hdmi1_channel, VC4_HVS_CHANNEL_DISABLED); > + KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[hdmi1_channel].in_use); > + > + KUNIT_EXPECT_NE(test, hdmi0_channel, hdmi1_channel); > + > + drm_atomic_state_put(state); > + drm_modeset_drop_locks(&ctx); > + drm_modeset_acquire_fini(&ctx); > + drm_dev_unregister(drm); > + drm_kunit_helper_free_device(test, vc4->dev); > +} > + > +static void drm_test_vc5_pv_muxing_bugs_stable_fifo(struct kunit *test) > +{ > + struct drm_modeset_acquire_ctx ctx; > + struct drm_atomic_state *state; > + struct vc4_crtc_state *new_vc4_crtc_state; > + struct vc4_hvs_state *new_hvs_state; > + unsigned int old_hdmi0_channel; > + unsigned int old_hdmi1_channel; > + struct drm_device *drm; > + struct vc4_dev *vc4; > + int ret; > + > + vc4 = vc5_mock_device(test); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4); > + > + drm_modeset_acquire_init(&ctx, 0); > + > + drm = &vc4->base; > + state = drm_atomic_state_alloc(drm); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); > + > + state->acquire_ctx = &ctx; > + > + ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = drm_atomic_check_only(state); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + new_hvs_state = vc4_hvs_get_new_global_state(state); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state); > + > + new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state, > + VC4_ENCODER_TYPE_HDMI0); > + KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state); > + > + old_hdmi0_channel = new_vc4_crtc_state->assigned_channel; > + KUNIT_ASSERT_NE(test, old_hdmi0_channel, VC4_HVS_CHANNEL_DISABLED); > + KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[old_hdmi0_channel].in_use); > + > + new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state, > + VC4_ENCODER_TYPE_HDMI1); > + KUNIT_ASSERT_NOT_NULL(test, new_vc4_crtc_state); > + > + old_hdmi1_channel = new_vc4_crtc_state->assigned_channel; > + KUNIT_ASSERT_NE(test, old_hdmi1_channel, VC4_HVS_CHANNEL_DISABLED); > + KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[old_hdmi1_channel].in_use); > + > + ret = drm_atomic_helper_swap_state(state, false); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + drm_atomic_state_put(state); > + > + state = drm_atomic_state_alloc(drm); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); > + > + state->acquire_ctx = &ctx; > + > + ret = vc4_mock_atomic_del_output(test, state, VC4_ENCODER_TYPE_HDMI0); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = drm_atomic_check_only(state); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + new_hvs_state = vc4_hvs_get_new_global_state(state); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, new_hvs_state); > + > + new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state, > + VC4_ENCODER_TYPE_HDMI1); > + > + if (new_vc4_crtc_state) { > + unsigned int hdmi1_channel; > + > + hdmi1_channel = new_vc4_crtc_state->assigned_channel; > + KUNIT_ASSERT_NE(test, hdmi1_channel, VC4_HVS_CHANNEL_DISABLED); > + KUNIT_ASSERT_TRUE(test, new_hvs_state->fifo_state[hdmi1_channel].in_use); > + > + KUNIT_EXPECT_EQ(test, old_hdmi1_channel, hdmi1_channel); > + } > + > + drm_atomic_state_put(state); > + drm_modeset_drop_locks(&ctx); > + drm_modeset_acquire_fini(&ctx); > + drm_dev_unregister(drm); > + drm_kunit_helper_free_device(test, vc4->dev); > +} > + > +static void > +drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state(struct kunit *test) > +{ > + struct drm_modeset_acquire_ctx ctx; > + struct drm_atomic_state *state; > + struct vc4_crtc_state *new_vc4_crtc_state; > + struct drm_device *drm; > + struct vc4_dev *vc4; > + int ret; > + > + vc4 = vc5_mock_device(test); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4); > + > + drm_modeset_acquire_init(&ctx, 0); > + > + drm = &vc4->base; > + state = drm_atomic_state_alloc(drm); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); > + > + state->acquire_ctx = &ctx; > + > + ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI0); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = drm_atomic_check_only(state); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = drm_atomic_helper_swap_state(state, false); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + drm_atomic_state_put(state); > + > + state = drm_atomic_state_alloc(drm); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); > + > + state->acquire_ctx = &ctx; > + > + ret = vc4_mock_atomic_add_output(test, state, VC4_ENCODER_TYPE_HDMI1); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = drm_atomic_check_only(state); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + new_vc4_crtc_state = get_vc4_crtc_state_for_encoder(test, state, > + VC4_ENCODER_TYPE_HDMI0); > + KUNIT_EXPECT_NULL(test, new_vc4_crtc_state); > + > + drm_atomic_state_put(state); > + drm_modeset_drop_locks(&ctx); > + drm_modeset_acquire_fini(&ctx); > + drm_dev_unregister(drm); > + drm_kunit_helper_free_device(test, vc4->dev); > +} > + > +static struct kunit_case vc5_pv_muxing_bugs_tests[] = { > + KUNIT_CASE(drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable), > + KUNIT_CASE(drm_test_vc5_pv_muxing_bugs_subsequent_crtc_enable_too_many_crtc_state), > + KUNIT_CASE(drm_test_vc5_pv_muxing_bugs_stable_fifo), > + {} > +}; > + > +static struct kunit_suite vc5_pv_muxing_bugs_test_suite = { > + .name = "vc5-pv-muxing-bugs", > + .test_cases = vc5_pv_muxing_bugs_tests, > +}; > + > +kunit_test_suites( > + &vc4_pv_muxing_test_suite, > + &vc5_pv_muxing_test_suite, > + &vc5_pv_muxing_bugs_test_suite > +); >

2 years

1
0
0 0

Re: [PATCH v3 17/20] drm/vc4: tests: Introduce a mocking infrastructure

by Maíra Canal

On 12/1/22 12:11, Maxime Ripard wrote: > In order to test the current atomic_check hooks we need to have a DRM > device that has roughly the same capabilities and layout that the actual > hardware. We'll also need a bunch of functions to create arbitrary > atomic states. > > Let's create some helpers to create a device that behaves like the real > one, and some helpers to maintain the atomic state we want to check. > > Reviewed-by: Javier Martinez Canillas <javierm(a)redhat.com> > Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> Reviewed-by: Maíra Canal <mcanal(a)igalia.com> But it would be nice if you could fix the checkpatch problems in the vc4/tests folder. Best Regards, - Maíra Canal > --- > drivers/gpu/drm/vc4/Kconfig | 16 +++ > drivers/gpu/drm/vc4/Makefile | 6 + > drivers/gpu/drm/vc4/tests/.kunitconfig | 13 ++ > drivers/gpu/drm/vc4/tests/vc4_mock.c | 200 ++++++++++++++++++++++++++++ > drivers/gpu/drm/vc4/tests/vc4_mock.h | 60 +++++++++ > drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c | 41 ++++++ > drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 99 ++++++++++++++ > drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 47 +++++++ > drivers/gpu/drm/vc4/vc4_crtc.c | 20 +-- > drivers/gpu/drm/vc4/vc4_drv.c | 4 +- > drivers/gpu/drm/vc4/vc4_drv.h | 16 +++ > drivers/gpu/drm/vc4/vc4_txp.c | 2 +- > 12 files changed, 511 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig > index 246305d17a52..f423941c028d 100644 > --- a/drivers/gpu/drm/vc4/Kconfig > +++ b/drivers/gpu/drm/vc4/Kconfig > @@ -34,3 +34,19 @@ config DRM_VC4_HDMI_CEC > help > Choose this option if you have a Broadcom VC4 GPU > and want to use CEC. > + > +config DRM_VC4_KUNIT_TEST > + bool "KUnit tests for VC4" if !KUNIT_ALL_TESTS > + depends on DRM_VC4 && KUNIT > + select DRM_KUNIT_TEST_HELPERS > + default KUNIT_ALL_TESTS > + help > + This builds unit tests for the VC4 DRM/KMS driver. This option is > + not useful for distributions or general kernels, but only for kernel > + developers working on the VC4 driver. > + > + For more information on KUnit and unit tests in general, > + please refer to the KUnit documentation in > + Documentation/dev-tools/kunit/. > + > + If in doubt, say "N". > diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile > index d0163e18e9ca..f974a8c80e2f 100644 > --- a/drivers/gpu/drm/vc4/Makefile > +++ b/drivers/gpu/drm/vc4/Makefile > @@ -25,6 +25,12 @@ vc4-y := \ > vc4_validate.o \ > vc4_validate_shaders.o > > +vc4-$(CONFIG_DRM_VC4_KUNIT_TEST) += \ > + tests/vc4_mock.o \ > + tests/vc4_mock_crtc.o \ > + tests/vc4_mock_output.o \ > + tests/vc4_mock_plane.o > + > vc4-$(CONFIG_DEBUG_FS) += vc4_debugfs.o > > obj-$(CONFIG_DRM_VC4) += vc4.o > diff --git a/drivers/gpu/drm/vc4/tests/.kunitconfig b/drivers/gpu/drm/vc4/tests/.kunitconfig > new file mode 100644 > index 000000000000..b503e9036c7f > --- /dev/null > +++ b/drivers/gpu/drm/vc4/tests/.kunitconfig > @@ -0,0 +1,13 @@ > +CONFIG_ARCH_BCM=y > +CONFIG_ARCH_BCM2835=y > +CONFIG_BCM2835_MBOX=y > +CONFIG_KUNIT=y > +CONFIG_DRM=y > +CONFIG_DRM_VC4=y > +CONFIG_DRM_VC4_KUNIT_TEST=y > +CONFIG_MAILBOX=y > +CONFIG_RASPBERRYPI_FIRMWARE=y > +CONFIG_SND=y > +CONFIG_SND_SOC=y > +CONFIG_SOUND=y > +CONFIG_COMMON_CLK=y > diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.c b/drivers/gpu/drm/vc4/tests/vc4_mock.c > new file mode 100644 > index 000000000000..a4bed26af32f > --- /dev/null > +++ b/drivers/gpu/drm/vc4/tests/vc4_mock.c > @@ -0,0 +1,200 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include <drm/drm_drv.h> > +#include <drm/drm_kunit_helpers.h> > + > +#include <kunit/test.h> > + > +#include "vc4_mock.h" > + > +struct vc4_mock_output_desc { > + enum vc4_encoder_type vc4_encoder_type; > + unsigned int encoder_type; > + unsigned int connector_type; > +}; > + > +#define VC4_MOCK_OUTPUT_DESC(_vc4_type, _etype, _ctype) \ > + { \ > + .vc4_encoder_type = _vc4_type, \ > + .encoder_type = _etype, \ > + .connector_type = _ctype, \ > + } > + > +struct vc4_mock_pipe_desc { > + const struct vc4_crtc_data *data; > + const struct vc4_mock_output_desc *outputs; > + unsigned int noutputs; > +}; > + > +#define VC4_MOCK_CRTC_DESC(_data, ...) \ > + { \ > + .data = _data, \ > + .outputs = (struct vc4_mock_output_desc[]) { __VA_ARGS__ }, \ > + .noutputs = sizeof((struct vc4_mock_output_desc[]) { __VA_ARGS__ }) / \ > + sizeof(struct vc4_mock_output_desc), \ > + } > + > +#define VC4_MOCK_PIXELVALVE_DESC(_data, ...) \ > + VC4_MOCK_CRTC_DESC(&(_data)->base, __VA_ARGS__) > + > +struct vc4_mock_desc { > + const struct vc4_mock_pipe_desc *pipes; > + unsigned int npipes; > +}; > + > +#define VC4_MOCK_DESC(...) \ > + { \ > + .pipes = (struct vc4_mock_pipe_desc[]) { __VA_ARGS__ }, \ > + .npipes = sizeof((struct vc4_mock_pipe_desc[]) { __VA_ARGS__ }) / \ > + sizeof(struct vc4_mock_pipe_desc), \ > + } > + > +static const struct vc4_mock_desc vc4_mock = > + VC4_MOCK_DESC( > + VC4_MOCK_CRTC_DESC(&vc4_txp_crtc_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP, > + DRM_MODE_ENCODER_VIRTUAL, > + DRM_MODE_CONNECTOR_WRITEBACK)), > + VC4_MOCK_PIXELVALVE_DESC(&bcm2835_pv0_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DSI0, > + DRM_MODE_ENCODER_DSI, > + DRM_MODE_CONNECTOR_DSI), > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DPI, > + DRM_MODE_ENCODER_DPI, > + DRM_MODE_CONNECTOR_DPI)), > + VC4_MOCK_PIXELVALVE_DESC(&bcm2835_pv1_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DSI1, > + DRM_MODE_ENCODER_DSI, > + DRM_MODE_CONNECTOR_DSI)), > + VC4_MOCK_PIXELVALVE_DESC(&bcm2835_pv2_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI0, > + DRM_MODE_ENCODER_TMDS, > + DRM_MODE_CONNECTOR_HDMIA), > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_VEC, > + DRM_MODE_ENCODER_TVDAC, > + DRM_MODE_CONNECTOR_Composite)), > +); > + > +static const struct vc4_mock_desc vc5_mock = > + VC4_MOCK_DESC( > + VC4_MOCK_CRTC_DESC(&vc4_txp_crtc_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_TXP, > + DRM_MODE_ENCODER_VIRTUAL, > + DRM_MODE_CONNECTOR_WRITEBACK)), > + VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv0_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DSI0, > + DRM_MODE_ENCODER_DSI, > + DRM_MODE_CONNECTOR_DSI), > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DPI, > + DRM_MODE_ENCODER_DPI, > + DRM_MODE_CONNECTOR_DPI)), > + VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv1_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_DSI1, > + DRM_MODE_ENCODER_DSI, > + DRM_MODE_CONNECTOR_DSI)), > + VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv2_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI0, > + DRM_MODE_ENCODER_TMDS, > + DRM_MODE_CONNECTOR_HDMIA)), > + VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv3_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_VEC, > + DRM_MODE_ENCODER_TVDAC, > + DRM_MODE_CONNECTOR_Composite)), > + VC4_MOCK_PIXELVALVE_DESC(&bcm2711_pv4_data, > + VC4_MOCK_OUTPUT_DESC(VC4_ENCODER_TYPE_HDMI1, > + DRM_MODE_ENCODER_TMDS, > + DRM_MODE_CONNECTOR_HDMIA)), > +); > + > +static int __build_one_pipe(struct kunit *test, struct drm_device *drm, > + const struct vc4_mock_pipe_desc *pipe) > +{ > + struct vc4_dummy_plane *dummy_plane; > + struct drm_plane *plane; > + struct vc4_dummy_crtc *dummy_crtc; > + struct drm_crtc *crtc; > + unsigned int i; > + > + dummy_plane = vc4_dummy_plane(test, drm, DRM_PLANE_TYPE_PRIMARY); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_plane); > + > + plane = &dummy_plane->plane.base; > + dummy_crtc = vc4_mock_pv(test, drm, plane, pipe->data); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_crtc); > + > + crtc = &dummy_crtc->crtc.base; > + for (i = 0; i < pipe->noutputs; i++) { > + const struct vc4_mock_output_desc *mock_output = &pipe->outputs[i]; > + struct vc4_dummy_output *dummy_output; > + > + dummy_output = vc4_dummy_output(test, drm, crtc, > + mock_output->vc4_encoder_type, > + mock_output->encoder_type, > + mock_output->connector_type); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_output); > + } > + > + return 0; > +} > + > +static int __build_mock(struct kunit *test, struct drm_device *drm, > + const struct vc4_mock_desc *mock) > +{ > + unsigned int i; > + > + for (i = 0; i < mock->npipes; i++) { > + const struct vc4_mock_pipe_desc *pipe = &mock->pipes[i]; > + int ret; > + > + ret = __build_one_pipe(test, drm, pipe); > + KUNIT_ASSERT_EQ(test, ret, 0); > + } > + > + return 0; > +} > + > +static struct vc4_dev *__mock_device(struct kunit *test, bool is_vc5) > +{ > + struct drm_device *drm; > + const struct drm_driver *drv = is_vc5 ? &vc5_drm_driver : &vc4_drm_driver; > + const struct vc4_mock_desc *desc = is_vc5 ? &vc5_mock : &vc4_mock; > + struct vc4_dev *vc4; > + struct device *dev; > + int ret; > + > + dev = drm_kunit_helper_alloc_device(test); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dev); > + > + vc4 = drm_kunit_helper_alloc_drm_device_with_driver(test, dev, > + struct vc4_dev, base, > + drv); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4); > + > + vc4->dev = dev; > + vc4->is_vc5 = is_vc5; > + > + vc4->hvs = __vc4_hvs_alloc(vc4, NULL); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, vc4->hvs); > + > + drm = &vc4->base; > + ret = __build_mock(test, drm, desc); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = vc4_kms_load(drm); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + ret = drm_dev_register(drm, 0); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + return vc4; > +} > + > +struct vc4_dev *vc4_mock_device(struct kunit *test) > +{ > + return __mock_device(test, false); > +} > + > +struct vc4_dev *vc5_mock_device(struct kunit *test) > +{ > + return __mock_device(test, true); > +} > diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock.h b/drivers/gpu/drm/vc4/tests/vc4_mock.h > new file mode 100644 > index 000000000000..ace5b2e00f4a > --- /dev/null > +++ b/drivers/gpu/drm/vc4/tests/vc4_mock.h > @@ -0,0 +1,60 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef VC4_MOCK_H_ > +#define VC4_MOCK_H_ > + > +#include "../vc4_drv.h" > + > +static inline > +struct drm_crtc *vc4_find_crtc_for_encoder(struct kunit *test, > + struct drm_device *drm, > + struct drm_encoder *encoder) > +{ > + struct drm_crtc *crtc; > + > + KUNIT_ASSERT_EQ(test, hweight32(encoder->possible_crtcs), 1); > + > + drm_for_each_crtc(crtc, drm) > + if (encoder->possible_crtcs & drm_crtc_mask(crtc)) > + return crtc; > + > + return NULL; > +} > + > +struct vc4_dummy_plane { > + struct vc4_plane plane; > +}; > + > +struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test, > + struct drm_device *drm, > + enum drm_plane_type type); > + > +struct vc4_dummy_crtc { > + struct vc4_crtc crtc; > +}; > + > +struct vc4_dummy_crtc *vc4_mock_pv(struct kunit *test, > + struct drm_device *drm, > + struct drm_plane *plane, > + const struct vc4_crtc_data *data); > + > +struct vc4_dummy_output { > + struct vc4_encoder encoder; > + struct drm_connector connector; > +}; > + > +struct vc4_dummy_output *vc4_dummy_output(struct kunit *test, > + struct drm_device *drm, > + struct drm_crtc *crtc, > + enum vc4_encoder_type vc4_encoder_type, > + unsigned int kms_encoder_type, > + unsigned int connector_type); > + > +struct vc4_dev *vc4_mock_device(struct kunit *test); > +struct vc4_dev *vc5_mock_device(struct kunit *test); > + > +int vc4_mock_atomic_add_output(struct kunit *test, struct drm_device *drm, > + enum vc4_encoder_type type, > + struct drm_atomic_state *state); > + > +#endif // VC4_MOCK_H_ > diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c b/drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c > new file mode 100644 > index 000000000000..5d12d7beef0e > --- /dev/null > +++ b/drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c > @@ -0,0 +1,41 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include <drm/drm_atomic_state_helper.h> > +#include <drm/drm_modeset_helper_vtables.h> > + > +#include <kunit/test.h> > + > +#include "vc4_mock.h" > + > +static const struct drm_crtc_helper_funcs vc4_dummy_crtc_helper_funcs = { > + .atomic_check = vc4_crtc_atomic_check, > +}; > + > +static const struct drm_crtc_funcs vc4_dummy_crtc_funcs = { > + .atomic_destroy_state = vc4_crtc_destroy_state, > + .atomic_duplicate_state = vc4_crtc_duplicate_state, > + .reset = vc4_crtc_reset, > +}; > + > +struct vc4_dummy_crtc *vc4_mock_pv(struct kunit *test, > + struct drm_device *drm, > + struct drm_plane *plane, > + const struct vc4_crtc_data *data) > +{ > + struct vc4_dummy_crtc *dummy_crtc; > + struct vc4_crtc *vc4_crtc; > + int ret; > + > + dummy_crtc = kunit_kzalloc(test, sizeof(*dummy_crtc), GFP_KERNEL); > + KUNIT_ASSERT_NOT_NULL(test, dummy_crtc); > + > + vc4_crtc = &dummy_crtc->crtc; > + ret = __vc4_crtc_init(drm, NULL, > + vc4_crtc, data, plane, > + &vc4_dummy_crtc_funcs, > + &vc4_dummy_crtc_helper_funcs, > + false); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + return dummy_crtc; > +} > diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_output.c b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c > new file mode 100644 > index 000000000000..cb16ab4451f7 > --- /dev/null > +++ b/drivers/gpu/drm/vc4/tests/vc4_mock_output.c > @@ -0,0 +1,99 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include <drm/drm_atomic_state_helper.h> > +#include <drm/drm_atomic_uapi.h> > +#include <drm/drm_connector.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_encoder.h> > +#include <drm/drm_modeset_helper_vtables.h> > + > +#include <kunit/test.h> > + > +#include "vc4_mock.h" > + > +static const struct drm_connector_helper_funcs vc4_dummy_connector_helper_funcs = { > +}; > + > +static const struct drm_connector_funcs vc4_dummy_connector_funcs = { > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .reset = drm_atomic_helper_connector_reset, > +}; > + > +struct vc4_dummy_output *vc4_dummy_output(struct kunit *test, > + struct drm_device *drm, > + struct drm_crtc *crtc, > + enum vc4_encoder_type vc4_encoder_type, > + unsigned int kms_encoder_type, > + unsigned int connector_type) > +{ > + struct vc4_dummy_output *dummy_output; > + struct drm_connector *conn; > + struct drm_encoder *enc; > + int ret; > + > + dummy_output = kunit_kzalloc(test, sizeof(*dummy_output), GFP_KERNEL); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_output); > + dummy_output->encoder.type = vc4_encoder_type; > + > + enc = &dummy_output->encoder.base; > + ret = drmm_encoder_init(drm, enc, > + NULL, > + kms_encoder_type, > + NULL); > + KUNIT_ASSERT_EQ(test, ret, 0); > + enc->possible_crtcs = drm_crtc_mask(crtc); > + > + conn = &dummy_output->connector; > + ret = drmm_connector_init(drm, conn, > + &vc4_dummy_connector_funcs, > + connector_type, > + NULL); > + KUNIT_ASSERT_EQ(test, ret, 0); > + > + drm_connector_helper_add(conn, &vc4_dummy_connector_helper_funcs); > + drm_connector_attach_encoder(conn, enc); > + > + return dummy_output; > +} > + > +static const struct drm_display_mode default_mode = { > + DRM_SIMPLE_MODE(640, 480, 64, 48) > +}; > + > +int vc4_mock_atomic_add_output(struct kunit *test, struct drm_device *drm, > + enum vc4_encoder_type type, > + struct drm_atomic_state *state) > +{ > + struct vc4_dummy_output *output; > + struct drm_connector *conn; > + struct drm_connector_state *conn_state; > + struct drm_encoder *encoder; > + struct drm_crtc *crtc; > + struct drm_crtc_state *crtc_state; > + int ret; > + > + encoder = vc4_find_encoder_by_type(drm, type); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, encoder); > + > + crtc = vc4_find_crtc_for_encoder(test, drm, encoder); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc); > + > + output = container_of(encoder, struct vc4_dummy_output, encoder.base); > + conn = &output->connector; > + conn_state = drm_atomic_get_connector_state(state, conn); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); > + > + ret = drm_atomic_set_crtc_for_connector(conn_state, crtc); > + KUNIT_EXPECT_EQ(test, ret, 0); > + > + crtc_state = drm_atomic_get_crtc_state(state, crtc); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); > + > + ret = drm_atomic_set_mode_for_crtc(crtc_state, &default_mode); > + KUNIT_EXPECT_EQ(test, ret, 0); > + > + crtc_state->active = true; > + > + return 0; > +} > diff --git a/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c > new file mode 100644 > index 000000000000..62b18f5f41db > --- /dev/null > +++ b/drivers/gpu/drm/vc4/tests/vc4_mock_plane.c > @@ -0,0 +1,47 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include <drm/drm_atomic_state_helper.h> > +#include <drm/drm_fourcc.h> > +#include <drm/drm_modeset_helper_vtables.h> > +#include <drm/drm_plane.h> > + > +#include <kunit/test.h> > + > +#include "vc4_mock.h" > + > +static const struct drm_plane_helper_funcs vc4_dummy_plane_helper_funcs = { > +}; > + > +static const struct drm_plane_funcs vc4_dummy_plane_funcs = { > + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, > + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, > + .reset = drm_atomic_helper_plane_reset, > +}; > + > +static const uint32_t vc4_dummy_plane_formats[] = { > + DRM_FORMAT_XRGB8888, > +}; > + > +struct vc4_dummy_plane *vc4_dummy_plane(struct kunit *test, > + struct drm_device *drm, > + enum drm_plane_type type) > +{ > + struct vc4_dummy_plane *dummy_plane; > + struct drm_plane *plane; > + > + dummy_plane = drmm_universal_plane_alloc(drm, > + struct vc4_dummy_plane, plane.base, > + 0, > + &vc4_dummy_plane_funcs, > + vc4_dummy_plane_formats, > + ARRAY_SIZE(vc4_dummy_plane_formats), > + NULL, > + DRM_PLANE_TYPE_PRIMARY, > + NULL); > + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, dummy_plane); > + > + plane = &dummy_plane->plane.base; > + drm_plane_helper_add(plane, &vc4_dummy_plane_helper_funcs); > + > + return dummy_plane; > +} > diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c > index 195d2b61839d..7d1a696477ce 100644 > --- a/drivers/gpu/drm/vc4/vc4_crtc.c > +++ b/drivers/gpu/drm/vc4/vc4_crtc.c > @@ -675,8 +675,8 @@ void vc4_crtc_get_margins(struct drm_crtc_state *state, > } > } > > -static int vc4_crtc_atomic_check(struct drm_crtc *crtc, > - struct drm_atomic_state *state) > +int vc4_crtc_atomic_check(struct drm_crtc *crtc, > + struct drm_atomic_state *state) > { > struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, > crtc); > @@ -1116,7 +1116,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = { > .get_scanout_position = vc4_crtc_get_scanout_position, > }; > > -static const struct vc4_pv_data bcm2835_pv0_data = { > +const struct vc4_pv_data bcm2835_pv0_data = { > .base = { > .name = "pixelvalve-0", > .debugfs_name = "crtc0_regs", > @@ -1131,7 +1131,7 @@ static const struct vc4_pv_data bcm2835_pv0_data = { > }, > }; > > -static const struct vc4_pv_data bcm2835_pv1_data = { > +const struct vc4_pv_data bcm2835_pv1_data = { > .base = { > .name = "pixelvalve-1", > .debugfs_name = "crtc1_regs", > @@ -1146,7 +1146,7 @@ static const struct vc4_pv_data bcm2835_pv1_data = { > }, > }; > > -static const struct vc4_pv_data bcm2835_pv2_data = { > +const struct vc4_pv_data bcm2835_pv2_data = { > .base = { > .name = "pixelvalve-2", > .debugfs_name = "crtc2_regs", > @@ -1161,7 +1161,7 @@ static const struct vc4_pv_data bcm2835_pv2_data = { > }, > }; > > -static const struct vc4_pv_data bcm2711_pv0_data = { > +const struct vc4_pv_data bcm2711_pv0_data = { > .base = { > .name = "pixelvalve-0", > .debugfs_name = "crtc0_regs", > @@ -1176,7 +1176,7 @@ static const struct vc4_pv_data bcm2711_pv0_data = { > }, > }; > > -static const struct vc4_pv_data bcm2711_pv1_data = { > +const struct vc4_pv_data bcm2711_pv1_data = { > .base = { > .name = "pixelvalve-1", > .debugfs_name = "crtc1_regs", > @@ -1191,7 +1191,7 @@ static const struct vc4_pv_data bcm2711_pv1_data = { > }, > }; > > -static const struct vc4_pv_data bcm2711_pv2_data = { > +const struct vc4_pv_data bcm2711_pv2_data = { > .base = { > .name = "pixelvalve-2", > .debugfs_name = "crtc2_regs", > @@ -1205,7 +1205,7 @@ static const struct vc4_pv_data bcm2711_pv2_data = { > }, > }; > > -static const struct vc4_pv_data bcm2711_pv3_data = { > +const struct vc4_pv_data bcm2711_pv3_data = { > .base = { > .name = "pixelvalve-3", > .debugfs_name = "crtc3_regs", > @@ -1219,7 +1219,7 @@ static const struct vc4_pv_data bcm2711_pv3_data = { > }, > }; > > -static const struct vc4_pv_data bcm2711_pv4_data = { > +const struct vc4_pv_data bcm2711_pv4_data = { > .base = { > .name = "pixelvalve-4", > .debugfs_name = "crtc4_regs", > diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c > index 5990d8f8c363..3b0ae2c3e33c 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.c > +++ b/drivers/gpu/drm/vc4/vc4_drv.c > @@ -196,7 +196,7 @@ static const struct drm_ioctl_desc vc4_drm_ioctls[] = { > DRM_IOCTL_DEF_DRV(VC4_PERFMON_GET_VALUES, vc4_perfmon_get_values_ioctl, DRM_RENDER_ALLOW), > }; > > -static const struct drm_driver vc4_drm_driver = { > +const struct drm_driver vc4_drm_driver = { > .driver_features = (DRIVER_MODESET | > DRIVER_ATOMIC | > DRIVER_GEM | > @@ -225,7 +225,7 @@ static const struct drm_driver vc4_drm_driver = { > .patchlevel = DRIVER_PATCHLEVEL, > }; > > -static const struct drm_driver vc5_drm_driver = { > +const struct drm_driver vc5_drm_driver = { > .driver_features = (DRIVER_MODESET | > DRIVER_ATOMIC | > DRIVER_GEM), > diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h > index e0be7a81a24a..418f4f308e36 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.h > +++ b/drivers/gpu/drm/vc4/vc4_drv.h > @@ -24,6 +24,9 @@ > struct drm_device; > struct drm_gem_object; > > +extern const struct drm_driver vc4_drm_driver; > +extern const struct drm_driver vc5_drm_driver; > + > /* Don't forget to update vc4_bo.c: bo_type_names[] when adding to > * this. > */ > @@ -523,6 +526,8 @@ struct vc4_crtc_data { > int hvs_output; > }; > > +extern const struct vc4_crtc_data vc4_txp_crtc_data; > + > struct vc4_pv_data { > struct vc4_crtc_data base; > > @@ -535,6 +540,15 @@ struct vc4_pv_data { > enum vc4_encoder_type encoder_types[4]; > }; > > +extern const struct vc4_pv_data bcm2835_pv0_data; > +extern const struct vc4_pv_data bcm2835_pv1_data; > +extern const struct vc4_pv_data bcm2835_pv2_data; > +extern const struct vc4_pv_data bcm2711_pv0_data; > +extern const struct vc4_pv_data bcm2711_pv1_data; > +extern const struct vc4_pv_data bcm2711_pv2_data; > +extern const struct vc4_pv_data bcm2711_pv3_data; > +extern const struct vc4_pv_data bcm2711_pv4_data; > + > struct vc4_crtc { > struct drm_crtc base; > struct platform_device *pdev; > @@ -920,6 +934,8 @@ int vc4_page_flip(struct drm_crtc *crtc, > struct drm_pending_vblank_event *event, > uint32_t flags, > struct drm_modeset_acquire_ctx *ctx); > +int vc4_crtc_atomic_check(struct drm_crtc *crtc, > + struct drm_atomic_state *state); > struct drm_crtc_state *vc4_crtc_duplicate_state(struct drm_crtc *crtc); > void vc4_crtc_destroy_state(struct drm_crtc *crtc, > struct drm_crtc_state *state); > diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c > index 4f7ce5d3e8ad..2b69454b8534 100644 > --- a/drivers/gpu/drm/vc4/vc4_txp.c > +++ b/drivers/gpu/drm/vc4/vc4_txp.c > @@ -479,7 +479,7 @@ static irqreturn_t vc4_txp_interrupt(int irq, void *data) > return IRQ_HANDLED; > } > > -static const struct vc4_crtc_data vc4_txp_crtc_data = { > +const struct vc4_crtc_data vc4_txp_crtc_data = { > .name = "txp", > .debugfs_name = "txp_regs", > .hvs_available_channels = BIT(2), >

2 years

1
0
0 0

Re: [PATCH v3 04/20] drm/tests: helpers: Switch to EXPORT_SYMBOL_GPL

by Maíra Canal

On 12/1/22 12:11, Maxime Ripard wrote: > drm_kunit_device_init() among other things will allocate a device and > wrap around root_device_register. This function is exported with > EXPORT_SYMBOL_GPL, so we can't really change the license. > > Fixes: 199557fab925 ("drm/tests: helpers: Add missing export") > Suggested-by: Javier Martinez Canillas <javierm(a)redhat.com> > Signed-off-by: Maxime Ripard <maxime(a)cerno.tech> Reviewed-by: Maíra Canal <mcanal(a)igalia.com> Best Regards, - Maíra Canal > --- > drivers/gpu/drm/tests/drm_kunit_helpers.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c > index 9ed3cfc2ac03..4fe131141718 100644 > --- a/drivers/gpu/drm/tests/drm_kunit_helpers.c > +++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c > @@ -82,7 +82,7 @@ struct drm_device *drm_kunit_device_init(struct kunit *test, u32 features, char > > return drm; > } > -EXPORT_SYMBOL(drm_kunit_device_init); > +EXPORT_SYMBOL_GPL(drm_kunit_device_init); > > MODULE_AUTHOR("Maxime Ripard <maxime(a)cerno.tech>"); > MODULE_LICENSE("GPL"); >

2 years

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror December 2022