diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-07-11 19:07:24 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-07-16 10:12:14 +0200 |
commit | b9cac102542f2fbbbed9e5aa2b1ac04ec3795bc6 (patch) | |
tree | 554674cf8ed6c1f94f2a7f984e83213c16147372 | |
parent | 41ff022b62b45a5b84504daa3537fa1b295b97c9 (diff) |
lib: Ditch "DRIVER_* for kms tests" cargo cult
KMS is meant to be a (at least somewhat) generic userspace API. We do
not want nor need to add a special match function for every driver
ever written, that doesn't make sense, defeats the point of having
generic tests for a generic testsuite, and really doesn't scale.
Also add a comment so people don't try to add ever more of these.
Also, this means no autoloading for you, but really igt should
reinvent udev, and mostly this was needed for 2 reasons:
- CI configuration falling to pieces because tests unloaded a driver,
and then died before cleaning up.
- vgem, which is fake, and needs to be requested explictily.
We might want to throw that all out again, except for vgem.
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Deepak Rawat <drawat@vmware.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Cc: Leo Li <sunpeng.li@amd.com>
Cc: MichaĆ Winiarski <michal.winiarski@intel.com>
Cc: "Ser, Simon" <simon.ser@intel.com>
Cc: Oleg Vasilev <oleg.vasilev@intel.com>
Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Acked-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Reviewed-by: Simon Ser <simon.ser@intel.com>
Acked-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
-rw-r--r-- | lib/drmtest.c | 9 | ||||
-rw-r--r-- | lib/drmtest.h | 13 |
2 files changed, 9 insertions, 13 deletions
diff --git a/lib/drmtest.c b/lib/drmtest.c index 25f20353..c379a7b7 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -187,12 +187,6 @@ static int modprobe(const char *driver) return igt_kmod_load(driver, ""); } -/* virtio's driver name is virtio_gpu but the module is virtio-gpu.ko */ -static void modprobe_virtio(const char *name) -{ - igt_kmod_load("virtio-gpu", ""); -} - static void modprobe_i915(const char *name) { /* When loading i915, we also want to load snd-hda et al */ @@ -210,7 +204,6 @@ static const struct module { { DRIVER_V3D, "v3d" }, { DRIVER_VC4, "vc4" }, { DRIVER_VGEM, "vgem" }, - { DRIVER_VIRTIO, "virtio_gpu", modprobe_virtio }, {} }; @@ -363,8 +356,6 @@ static const char *chipset_to_str(int chipset) return "vc4"; case DRIVER_VGEM: return "vgem"; - case DRIVER_VIRTIO: - return "virtio"; case DRIVER_AMDGPU: return "amdgpu"; case DRIVER_PANFROST: diff --git a/lib/drmtest.h b/lib/drmtest.h index 6c4c3899..614f57e6 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -38,13 +38,18 @@ #include "igt_core.h" +/* + * NOTE: Theser are _only_ for testcases exercising driver specific rendering + * ioctls and uapi (and a bunch of historical reasons). And KMS testcase should + * be build on top of DRIVER_ANY. Do _NOT_ add your driver here for enabling KMS + * tests. + */ #define DRIVER_INTEL (1 << 0) #define DRIVER_VC4 (1 << 1) #define DRIVER_VGEM (1 << 2) -#define DRIVER_VIRTIO (1 << 3) -#define DRIVER_AMDGPU (1 << 4) -#define DRIVER_V3D (1 << 5) -#define DRIVER_PANFROST (1 << 6) +#define DRIVER_AMDGPU (1 << 3) +#define DRIVER_V3D (1 << 4) +#define DRIVER_PANFROST (1 << 5) /* * Exclude DRVER_VGEM from DRIVER_ANY since if you run on a system * with vgem as well as a supported driver, you can end up with a |