diff options
| author | Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> | 2020-05-29 12:41:27 +0200 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-06-01 12:55:40 +0100 |
| commit | 587cbed206689abbad60689d4a32bf9caf0cc124 (patch) | |
| tree | e980cb8e8a2d60bea27744e2eab227cae3dd96cb /lib/intel_batchbuffer.c | |
| parent | 3730d63a4ea89c2ca10073825d26b555816475dc (diff) | |
tests/gem_(gpgpu|media)_fill: remove the _v2 suffix
Remove libdrm functions and replace them with new ones after removing
_v2 suffix introduced for transition state.
Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib/intel_batchbuffer.c')
| -rw-r--r-- | lib/intel_batchbuffer.c | 56 |
1 files changed, 2 insertions, 54 deletions
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c index 02c293be7..49f2d0fee 100644 --- a/lib/intel_batchbuffer.c +++ b/lib/intel_batchbuffer.c @@ -1118,32 +1118,6 @@ igt_fillfunc_t igt_get_media_fillfunc(int devid) return fill; } - -/** - * igt_get_media_fillfunc_v2: - * @devid: pci device id - * - * Returns: - * - * The platform-specific media fill function pointer for the device specified - * with @devid. Will return NULL when no media fill function is implemented. - */ -igt_fillfunc_v2_t igt_get_media_fillfunc_v2(int devid) -{ - igt_fillfunc_v2_t fill = NULL; - - if (IS_GEN12(devid)) - fill = gen12_media_fillfunc_v2; - else if (IS_GEN9(devid) || IS_GEN10(devid) || IS_GEN11(devid)) - fill = gen9_media_fillfunc_v2; - else if (IS_GEN8(devid)) - fill = gen8_media_fillfunc_v2; - else if (IS_GEN7(devid)) - fill = gen7_media_fillfunc_v2; - - return fill; -} - igt_vme_func_t igt_get_media_vme_func(int devid) { igt_vme_func_t fill = NULL; @@ -1153,6 +1127,7 @@ igt_vme_func_t igt_get_media_vme_func(int devid) return fill; } + /** * igt_get_gpgpu_fillfunc: * @devid: pci device id @@ -1168,7 +1143,7 @@ igt_fillfunc_t igt_get_gpgpu_fillfunc(int devid) if (IS_GEN7(devid)) fill = gen7_gpgpu_fillfunc; - else if (IS_BROADWELL(devid)) + else if (IS_GEN8(devid)) fill = gen8_gpgpu_fillfunc; else if (IS_GEN9(devid) || IS_GEN10(devid)) fill = gen9_gpgpu_fillfunc; @@ -1181,33 +1156,6 @@ igt_fillfunc_t igt_get_gpgpu_fillfunc(int devid) } /** - * igt_get_gpgpu_fillfunc_v2: - * @devid: pci device id - * - * Returns: - * - * The platform-specific gpgpu fill function pointer for the device specified - * with @devid. Will return NULL when no gpgpu fill function is implemented. - */ -igt_fillfunc_v2_t igt_get_gpgpu_fillfunc_v2(int devid) -{ - igt_fillfunc_v2_t fill = NULL; - - if (IS_GEN7(devid)) - fill = gen7_gpgpu_fillfunc_v2; - else if (IS_GEN8(devid)) - fill = gen8_gpgpu_fillfunc_v2; - else if (IS_GEN9(devid) || IS_GEN10(devid)) - fill = gen9_gpgpu_fillfunc_v2; - else if (IS_GEN11(devid)) - fill = gen11_gpgpu_fillfunc_v2; - else if (IS_GEN12(devid)) - fill = gen12_gpgpu_fillfunc_v2; - - return fill; -} - -/** * igt_get_media_spinfunc: * @devid: pci device id * |