From 809961459f5770f21991a9bfa53ea9ad8f1287a3 Mon Sep 17 00:00:00 2001 From: Katarzyna Dec Date: Wed, 11 Apr 2018 10:14:59 +0200 Subject: lib: Remove duplications in gpu_fill library After moving all functions needed for gpgpu and media fill testing there is a lot of duplications which can be removed: Library media_fill_gen8 and media_fill_gen8lp for CHT was removed, media state flush for !CHT was added to gen7_emit_media_objects. Many gen8 functions were replaced with gen7 version with devid parameter (gen7_fill_curbe_load, gen7_emit_interface_descriptor, gen7_fill_binding_table, gen7_emit_media_objects). Unified fill kernel function so it is applicable to all gens and both media and gpgpu (merged gen7_fill_media_kernel and gen8_fill_media_kernel). Duplicated constants like GEN8_MEDIA_VFE_STATE, GEN8_MEDIA_CURBE_LOAD, GEN8_MEDIA_INTERFACE_DESCRIPTOR_LOAD, GEN8_MEDIA_OBJECT were replaced by GEN7 version. However this constants were not removed from gen8_media.h library, because they are used by other tests for Gen8+. More refactoring in this gen*_media.h libraries is needed. It seems that further unification of *_fillfunc functions will introduce more confusion in understanding what the tests are doing and what were changes between Gens. v2: Moved some reduntant changes from Move gpgpu/media fill to gpu_fill... to this patch. Applied comments from review. v3: rebase Signed-off-by: Katarzyna Dec Cc: Lukasz Kalamarz Cc: Daniele Ceraolo Spurio Reviewed-by: Radoslaw Szwichtenberg --- lib/gpgpu_fill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/gpgpu_fill.c') diff --git a/lib/gpgpu_fill.c b/lib/gpgpu_fill.c index f2765fd6..579ce78d 100644 --- a/lib/gpgpu_fill.c +++ b/lib/gpgpu_fill.c @@ -180,7 +180,7 @@ gen8_gpgpu_fillfunc(struct intel_batchbuffer *batch, gen8_emit_state_base_address(batch); gen8_emit_vfe_state_gpgpu(batch); gen7_emit_curbe_load(batch, curbe_buffer); - gen8_emit_interface_descriptor_load(batch, interface_descriptor); + gen7_emit_interface_descriptor_load(batch, interface_descriptor); gen8_emit_gpgpu_walk(batch, x, y, width, height); OUT_BATCH(MI_BATCH_BUFFER_END); -- cgit v1.2.3