diff options
author | Katarzyna Dec <katarzyna.dec@intel.com> | 2018-04-11 10:14:59 +0200 |
---|---|---|
committer | Arkadiusz Hiler <arkadiusz.hiler@intel.com> | 2018-04-12 23:56:46 +0300 |
commit | 809961459f5770f21991a9bfa53ea9ad8f1287a3 (patch) | |
tree | 872d227341d82fadbd55ef68b27de51c65e42db1 /lib/gpu_fill.h | |
parent | 081f77178f9821cf39e238452700562561ce2eb2 (diff) |
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 <katarzyna.dec@intel.com>
Cc: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Radoslaw Szwichtenberg <radoslaw.szwichtenberg@intel.com>
Diffstat (limited to 'lib/gpu_fill.h')
-rw-r--r-- | lib/gpu_fill.h | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/lib/gpu_fill.h b/lib/gpu_fill.h index 87e62c86..072e9f7c 100644 --- a/lib/gpu_fill.h +++ b/lib/gpu_fill.h @@ -70,12 +70,7 @@ gen7_fill_binding_table(struct intel_batchbuffer *batch, struct igt_buf *dst); uint32_t -gen7_fill_media_kernel(struct intel_batchbuffer *batch, - const uint32_t kernel[][4], - size_t size); - -uint32_t -gen8_fill_media_kernel(struct intel_batchbuffer *batch, +gen7_fill_kernel(struct intel_batchbuffer *batch, const uint32_t kernel[][4], size_t size); @@ -108,13 +103,6 @@ gen7_emit_gpgpu_walk(struct intel_batchbuffer *batch, unsigned x, unsigned y, unsigned width, unsigned height); -void -gen8_render_flush(struct intel_batchbuffer *batch, uint32_t batch_end); - -uint32_t -gen8_fill_curbe_buffer_data(struct intel_batchbuffer *batch, - uint8_t color); - uint32_t gen8_fill_surface_state(struct intel_batchbuffer *batch, struct igt_buf *buf, @@ -122,39 +110,19 @@ gen8_fill_surface_state(struct intel_batchbuffer *batch, int is_dst); uint32_t -gen8_fill_binding_table(struct intel_batchbuffer *batch, - struct igt_buf *dst); - -uint32_t gen8_fill_interface_descriptor(struct intel_batchbuffer *batch, struct igt_buf *dst, const uint32_t kernel[][4], size_t size); void gen8_emit_state_base_address(struct intel_batchbuffer *batch); void -gen8_emit_vfe_state(struct intel_batchbuffer *batch); - -void -gen8_emit_vfe_state_gpgpu(struct intel_batchbuffer *batch); - -void -gen8_emit_curbe_load(struct intel_batchbuffer *batch, uint32_t curbe_buffer); - -void -gen8_emit_interface_descriptor_load(struct intel_batchbuffer *batch, uint32_t interface_descriptor); - -void gen8_emit_media_state_flush(struct intel_batchbuffer *batch); void -gen8_emit_media_objects(struct intel_batchbuffer *batch, - unsigned x, unsigned y, - unsigned width, unsigned height); +gen8_emit_vfe_state(struct intel_batchbuffer *batch); void -gen8lp_emit_media_objects(struct intel_batchbuffer *batch, - unsigned x, unsigned y, - unsigned width, unsigned height); +gen8_emit_vfe_state_gpgpu(struct intel_batchbuffer *batch); void gen8_emit_gpgpu_walk(struct intel_batchbuffer *batch, |