[PATCH i-g-t v3 0/2] Update compression in config based on platform

[PATCH i-g-t v3 0/2] Update compression in config based on platform

[Akshata Jahagirdar]

In Xe2+ platforms, we need to run the xe_ccs test regardless of the status of
flat-ccs.
Check if the platform supports compression and has flat ccs enabled before
the execution of this test, and if it doesn't, then update to compression
disabled and proceed with the test.

Akshata Jahagirdar (2):
  lib/intel_blt: Add helper function to ensure platform has flat-ccs
    enabled
  tests/xe_ccs: Update compression in config based on flat-ccs
    enablement

 lib/intel_blt.c      | 14 ++++++++++++++
 lib/intel_blt.h      |  1 +
 tests/intel/xe_ccs.c | 26 ++++++++++++++++++++++++--
 3 files changed, 39 insertions(+), 2 deletions(-)

-- 
2.34.1

✗ Fi.CI.BUILD: failure for Update compression in config based on platform (rev2)

[Patchwork]

== Series Details ==

Series: Update compression in config based on platform (rev2)
URL   : https://patchwork.freedesktop.org/series/131802/
State : failure

== Summary ==

IGT patchset build failed on latest successful build
5ec1ff6da3535cf80fd4e1844867d75c481ef86a lib: sync xe_pciids.h with kernel

Tail of build.log:
[664/1674] Compiling C object 'tests/vc4/e4667e8@@vc4_mmap@exe/vc4_mmap.c.o'.
[665/1674] Compiling C object 'tests/vc4/e4667e8@@vc4_wait_seqno@exe/vc4_wait_seqno.c.o'.
[666/1674] Compiling C object 'tests/59830eb@@xe_pm@exe/intel_xe_pm.c.o'.
[667/1674] Compiling C object 'tests/v3d/cad21b8@@v3d_perfmon@exe/v3d_perfmon.c.o'.
[668/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_registers_cflgt3.c.o'.
[669/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_registers_tglgt2.c.o'.
[670/1674] Compiling C object 'tests/59830eb@@xe_query@exe/intel_xe_query.c.o'.
[671/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_registers_sklgt3.c.o'.
[672/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_registers_bdw.c.o'.
[673/1674] Compiling C object 'tests/v3d/cad21b8@@v3d_job_submission@exe/v3d_job_submission.c.o'.
[674/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_registers_kblgt3.c.o'.
[675/1674] Compiling C object 'tests/vc4/e4667e8@@vc4_perfmon@exe/vc4_perfmon.c.o'.
[676/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_registers_kblgt2.c.o'.
[677/1674] Compiling C object 'tests/vc4/e4667e8@@vc4_tiling@exe/vc4_tiling.c.o'.
[678/1674] Compiling C object 'tests/59830eb@@xe_evict@exe/intel_xe_evict.c.o'.
[679/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_registers_sklgt4.c.o'.
[680/1674] Compiling C object 'tests/59830eb@@i915_query@exe/intel_i915_query.c.o'.
[681/1674] Compiling C object 'tests/v3d/cad21b8@@v3d_wait_bo@exe/v3d_wait_bo.c.o'.
[682/1674] Compiling C object 'tests/vc4/e4667e8@@vc4_wait_bo@exe/vc4_wait_bo.c.o'.
[683/1674] Compiling C object 'tests/59830eb@@kms_pm_rpm@exe/intel_kms_pm_rpm.c.o'.
[684/1674] Compiling C object 'tests/59830eb@@kms_chamelium_audio@exe/chamelium_kms_chamelium_audio.c.o'.
[685/1674] Compiling C object 'tests/vc4/e4667e8@@vc4_purgeable_bo@exe/vc4_purgeable_bo.c.o'.
[686/1674] Compiling C object 'tests/59830eb@@xe_pat@exe/intel_xe_pat.c.o'.
[687/1674] Compiling C object 'tests/59830eb@@kms_chamelium_edid@exe/chamelium_kms_chamelium_edid.c.o'.
[688/1674] Compiling C object 'tests/v3d/cad21b8@@v3d_submit_csd@exe/v3d_submit_csd.c.o'.
[689/1674] Compiling C object 'tests/59830eb@@kms_chamelium_color@exe/chamelium_kms_chamelium_color.c.o'.
[690/1674] Compiling C object 'tests/59830eb@@xe_intel_bb@exe/intel_xe_intel_bb.c.o'.
[691/1674] Compiling C object 'tests/vmwgfx/776e741@@vmw_execution_buffer@exe/vmw_execution_buffer.c.o'.
[692/1674] Compiling C object 'tests/59830eb@@kms_chamelium_hpd@exe/chamelium_kms_chamelium_hpd.c.o'.
[693/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_metrics_hsw.c.o'.
[694/1674] Compiling C object 'tests/59830eb@@xe_exec_threads@exe/intel_xe_exec_threads.c.o'.
[695/1674] Compiling C object 'tests/v3d/cad21b8@@v3d_submit_cl@exe/v3d_submit_cl.c.o'.
[696/1674] Compiling C object 'tests/59830eb@@kms_psr2_sf@exe/intel_kms_psr2_sf.c.o'.
[697/1674] Compiling C object 'tests/59830eb@@kms_chamelium_frames@exe/chamelium_kms_chamelium_frames.c.o'.
[698/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_metrics_chv.c.o'.
[699/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_metrics_sklgt2.c.o'.
[700/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_metrics_kblgt2.c.o'.
[701/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_metrics_sklgt3.c.o'.
[702/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_metrics_bdw.c.o'.
[703/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_metrics_sklgt4.c.o'.
[704/1674] Compiling C object 'tests/59830eb@@gem_userptr_blits@exe/intel_gem_userptr_blits.c.o'.
[705/1674] Compiling C object 'tests/59830eb@@xe_vm@exe/intel_xe_vm.c.o'.
[706/1674] Compiling C object 'tests/59830eb@@gem_exec_fence@exe/intel_gem_exec_fence.c.o'.
[707/1674] Compiling C object 'tests/59830eb@@kms_frontbuffer_tracking@exe/intel_kms_frontbuffer_tracking.c.o'.
[708/1674] Compiling C object 'tests/59830eb@@perf_pmu@exe/intel_perf_pmu.c.o'.
[709/1674] Compiling C object 'tests/59830eb@@gem_exec_schedule@exe/intel_gem_exec_schedule.c.o'.
[710/1674] Compiling C object 'tests/59830eb@@perf@exe/intel_perf.c.o'.
[711/1674] Linking target lib/libigt.so.0.
[712/1674] Compiling C object 'lib/76b5a35@@i915_perf@sha/meson-generated_.._i915_perf_equations.c.o'.
ninja: build stopped: subcommand failed.

✗ GitLab.Pipeline: warning for Update compression in config based on platform (rev2)

[Patchwork]

== Series Details ==

Series: Update compression in config based on platform (rev2)
URL   : https://patchwork.freedesktop.org/series/131802/
State : warning

== Summary ==

Pipeline status: FAILED.

see https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/1140422 for the overview.

build:tests-debian-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/56943254):
  [1257/1796] Compiling C object 'tests/59830eb@@kms_psr2_sf@exe/intel_kms_psr2_sf.c.o'.
  ninja: build stopped: subcommand failed.
  ninja: Entering directory `build'
  [1/1101] Generating version.h with a custom command.
  [2/541] Compiling C object 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o'.
  FAILED: tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o 
  cc -Itests/59830eb@@xe_ccs@exe -Itests -I../tests -I../include -I../include/drm-uapi -I../include/linux-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/x86_64-linux-gnu -I/usr/include/valgrind -I/usr/include/alsa -I/usr/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread  -MD -MQ 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -MF 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o.d' -o 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -c ../tests/intel/xe_ccs.c
  ../tests/intel/xe_ccs.c: In function ‘__igt_unique____real_main713’:
  ../tests/intel/xe_ccs.c:748:31: error: implicit declaration of function ‘blt_platform_has_flat_ccs_enabled’ [-Werror=implicit-function-declaration]
     if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ../tests/intel/xe_ccs.c:748:31: warning: nested extern declaration of ‘blt_platform_has_flat_ccs_enabled’ [-Wnested-externs]
  cc1: some warnings being treated as errors
  ninja: build stopped: subcommand failed.
  section_end:1711690486:step_script
  section_start:1711690486:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1711690487:cleanup_file_variables
  ERROR: Job failed: exit code 1
  

build:tests-debian-meson-arm64 has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/56943257):
  ninja: Entering directory `build'
  [1/721] Generating version.h with a custom command.
  [2/417] Linking target tests/kms_frontbuffer_tracking.
  [3/417] Linking target tests/kms_psr2_sf.
  [4/417] Compiling C object 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o'.
  FAILED: tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o 
  /usr/bin/aarch64-linux-gnu-gcc -Itests/59830eb@@xe_ccs@exe -Itests -I../tests -I../include -I../include/drm-uapi -I../include/linux-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/aarch64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/aarch64-linux-gnu -I/usr/include/valgrind -I/usr/include/alsa -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread  -MD -MQ 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -MF 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o.d' -o 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -c ../tests/intel/xe_ccs.c
  ../tests/intel/xe_ccs.c: In function ‘__igt_unique____real_main713’:
  ../tests/intel/xe_ccs.c:748:31: error: implicit declaration of function ‘blt_platform_has_flat_ccs_enabled’ [-Werror=implicit-function-declaration]
     if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ../tests/intel/xe_ccs.c:748:31: warning: nested extern declaration of ‘blt_platform_has_flat_ccs_enabled’ [-Wnested-externs]
  cc1: some warnings being treated as errors
  ninja: build stopped: subcommand failed.
  section_end:1711690486:step_script
  section_start:1711690486:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1711690487:cleanup_file_variables
  ERROR: Job failed: exit code 1
  

build:tests-debian-meson-armhf has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/56943256):
  ninja: build stopped: subcommand failed.
  ninja: Entering directory `build'
  [1/719] Generating version.h with a custom command.
  [2/411] Linking target tests/kms_frontbuffer_tracking.
  [3/411] Compiling C object 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o'.
  FAILED: tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o 
  /usr/bin/arm-linux-gnueabihf-gcc -Itests/59830eb@@xe_ccs@exe -Itests -I../tests -I../include -I../include/drm-uapi -I../include/linux-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/arm-linux-gnueabihf -I/usr/include/valgrind -I/usr/include/alsa -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread  -MD -MQ 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -MF 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o.d' -o 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -c ../tests/intel/xe_ccs.c
  ../tests/intel/xe_ccs.c: In function ‘__igt_unique____real_main713’:
  ../tests/intel/xe_ccs.c:748:31: error: implicit declaration of function ‘blt_platform_has_flat_ccs_enabled’ [-Werror=implicit-function-declaration]
     if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ../tests/intel/xe_ccs.c:748:31: warning: nested extern declaration of ‘blt_platform_has_flat_ccs_enabled’ [-Wnested-externs]
  cc1: some warnings being treated as errors
  ninja: build stopped: subcommand failed.
  section_end:1711690471:step_script
  section_start:1711690471:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1711690471:cleanup_file_variables
  ERROR: Job failed: exit code 1
  

build:tests-debian-meson-mips has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/56943258):
  [5/427] Linking target tests/gem_barrier_race.
  [6/427] Linking target tests/perf.
  [7/427] Linking target tests/kms_frontbuffer_tracking.
  [8/427] Linking target tests/kms_psr2_sf.
  [9/427] Compiling C object 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o'.
  FAILED: tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o 
  /usr/bin/mips-linux-gnu-gcc -Itests/59830eb@@xe_ccs@exe -Itests -I../tests -I../include -I../include/drm-uapi -I../include/linux-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/mips-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/mips-linux-gnu -I/usr/include/valgrind -I/usr/include/alsa -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread  -MD -MQ 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -MF 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o.d' -o 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -c ../tests/intel/xe_ccs.c
  ../tests/intel/xe_ccs.c: In function ‘__igt_unique____real_main713’:
  ../tests/intel/xe_ccs.c:748:31: error: implicit declaration of function ‘blt_platform_has_flat_ccs_enabled’ [-Werror=implicit-function-declaration]
     if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
                                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ../tests/intel/xe_ccs.c:748:31: warning: nested extern declaration of ‘blt_platform_has_flat_ccs_enabled’ [-Wnested-externs]
  cc1: some warnings being treated as errors
  ninja: build stopped: subcommand failed.
  section_end:1711690491:step_script
  section_start:1711690491:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1711690492:cleanup_file_variables
  ERROR: Job failed: exit code 1
  

build:tests-fedora has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/56943249):
  ninja: build stopped: subcommand failed.
  ninja: Entering directory `build'
  [1/1102] Generating version.h with a custom command.
  [2/532] Generating kms_psr2_sf.testlist with a meson_exe.py custom command.
  [3/532] Compiling C object 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o'.
  FAILED: tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o 
  cc -Itests/59830eb@@xe_ccs@exe -Itests -I../tests -I../include -I../include/drm-uapi -I../include/linux-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/valgrind -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread -MD -MQ 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -MF 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o.d' -o 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -c ../tests/intel/xe_ccs.c
  ../tests/intel/xe_ccs.c: In function ‘__igt_unique____real_main713’:
  ../tests/intel/xe_ccs.c:748:31: error: implicit declaration of function ‘blt_platform_has_flat_ccs_enabled’ [-Werror=implicit-function-declaration]
    748 |   if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
        |                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ../tests/intel/xe_ccs.c:748:31: warning: nested extern declaration of ‘blt_platform_has_flat_ccs_enabled’ [-Wnested-externs]
  cc1: some warnings being treated as errors
  ninja: build stopped: subcommand failed.
  section_end:1711690456:step_script
  section_start:1711690456:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1711690456:cleanup_file_variables
  ERROR: Job failed: exit code 1
  

build:tests-fedora-clang has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/56943253):
  ../tests/intel/xe_ccs.c:782:31: error: implicit declaration of function 'blt_platform_has_flat_ccs_enabled' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
                  if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
                                              ^
  ../tests/intel/xe_ccs.c:793:31: error: implicit declaration of function 'blt_platform_has_flat_ccs_enabled' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
                  if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
                                              ^
  ../tests/intel/xe_ccs.c:806:31: error: implicit declaration of function 'blt_platform_has_flat_ccs_enabled' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
                  if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
                                              ^
  ../tests/intel/xe_ccs.c:818:31: error: implicit declaration of function 'blt_platform_has_flat_ccs_enabled' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
                  if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
                                              ^
  1 warning and 7 errors generated.
  ninja: build stopped: subcommand failed.
  section_end:1711690478:step_script
  section_start:1711690478:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1711690479:cleanup_file_variables
  ERROR: Job failed: exit code 1
  

build:tests-fedora-no-libdrm-nouveau has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/56943252):
  ninja: build stopped: subcommand failed.
  ninja: Entering directory `build'
  [1/972] Generating version.h with a custom command.
  [2/405] Generating kms_frontbuffer_tracking.testlist with a meson_exe.py custom command.
  [3/405] Compiling C object 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o'.
  FAILED: tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o 
  cc -Itests/59830eb@@xe_ccs@exe -Itests -I../tests -I../include -I../include/drm-uapi -I../include/linux-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/valgrind -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread -MD -MQ 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -MF 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o.d' -o 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -c ../tests/intel/xe_ccs.c
  ../tests/intel/xe_ccs.c: In function ‘__igt_unique____real_main713’:
  ../tests/intel/xe_ccs.c:748:31: error: implicit declaration of function ‘blt_platform_has_flat_ccs_enabled’ [-Werror=implicit-function-declaration]
    748 |   if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
        |                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ../tests/intel/xe_ccs.c:748:31: warning: nested extern declaration of ‘blt_platform_has_flat_ccs_enabled’ [-Wnested-externs]
  cc1: some warnings being treated as errors
  ninja: build stopped: subcommand failed.
  section_end:1711690490:step_script
  section_start:1711690490:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1711690490:cleanup_file_variables
  ERROR: Job failed: exit code 1
  

build:tests-fedora-no-libunwind has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/56943250):
  ninja: build stopped: subcommand failed.
  ninja: Entering directory `build'
  [1/1102] Generating version.h with a custom command.
  [2/533] Generating kms_psr2_sf.testlist with a meson_exe.py custom command.
  [3/533] Compiling C object 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o'.
  FAILED: tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o 
  cc -Itests/59830eb@@xe_ccs@exe -Itests -I../tests -I../include -I../include/drm-uapi -I../include/linux-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I../lib/stubs/libunwind -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/valgrind -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread -MD -MQ 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -MF 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o.d' -o 'tests/59830eb@@xe_ccs@exe/intel_xe_ccs.c.o' -c ../tests/intel/xe_ccs.c
  ../tests/intel/xe_ccs.c: In function ‘__igt_unique____real_main713’:
  ../tests/intel/xe_ccs.c:748:31: error: implicit declaration of function ‘blt_platform_has_flat_ccs_enabled’ [-Werror=implicit-function-declaration]
    748 |   if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
        |                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ../tests/intel/xe_ccs.c:748:31: warning: nested extern declaration of ‘blt_platform_has_flat_ccs_enabled’ [-Wnested-externs]
  cc1: some warnings being treated as errors
  ninja: build stopped: subcommand failed.
  section_end:1711690462:step_script
  section_start:1711690462:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1711690463:cleanup_file_variables
  ERROR: Job failed: exit code 1
  

build:tests-fedora-oldest-meson has failed (https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/jobs/56943251):
  [1272/1802] Linking target tests/xe_compute.
  ninja: build stopped: subcommand failed.
  ninja: Entering directory `build'
  [1/1103] Generating version.h with a custom command.
  [2/532] Compiling C object 'tests/tests@@xe_ccs@exe/intel_xe_ccs.c.o'.
  FAILED: tests/tests@@xe_ccs@exe/intel_xe_ccs.c.o 
  cc -Itests/tests@@xe_ccs@exe -Itests -I../tests -I../include -I../include/drm-uapi -I../include/linux-uapi -Ilib -I../lib -I../lib/stubs/syscalls -I. -I../ -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/libdrm -I/usr/include/libdrm/nouveau -I/usr/include/valgrind -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu11 -O2 -g -D_GNU_SOURCE -include config.h -D_FORTIFY_SOURCE=2 -Wbad-function-cast -Wdeclaration-after-statement -Wformat=2 -Wimplicit-fallthrough=0 -Wlogical-op -Wmissing-declarations -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wuninitialized -Wunused -Wno-clobbered -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-pointer-arith -Wno-address-of-packed-member -Wno-sign-compare -Wno-type-limits -Wno-unused-parameter -Wno-unused-result -Werror=address -Werror=array-bounds -Werror=implicit -Werror=init-self -Werror=int-to-pointer-cast -Werror=main -Werror=missing-braces -Werror=nonnull -Werror=pointer-to-int-cast -Werror=return-type -Werror=sequence-point -Werror=trigraphs -Werror=write-strings -fno-builtin-malloc -fno-builtin-calloc -pthread  -MD -MQ 'tests/tests@@xe_ccs@exe/intel_xe_ccs.c.o' -MF 'tests/tests@@xe_ccs@exe/intel_xe_ccs.c.o.d' -o 'tests/tests@@xe_ccs@exe/intel_xe_ccs.c.o' -c ../tests/intel/xe_ccs.c
  ../tests/intel/xe_ccs.c: In function ‘__igt_unique____real_main713’:
  ../tests/intel/xe_ccs.c:748:31: error: implicit declaration of function ‘blt_platform_has_flat_ccs_enabled’ [-Werror=implicit-function-declaration]
    748 |   if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
        |                               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ../tests/intel/xe_ccs.c:748:31: warning: nested extern declaration of ‘blt_platform_has_flat_ccs_enabled’ [-Wnested-externs]
  cc1: some warnings being treated as errors
  ninja: build stopped: subcommand failed.
  section_end:1711690490:step_script
  section_start:1711690490:cleanup_file_variables
  Cleaning up project directory and file based variables
  section_end:1711690491:cleanup_file_variables
  ERROR: Job failed: exit code 1

== Logs ==

For more details see: https://gitlab.freedesktop.org/gfx-ci/igt-ci-tags/-/pipelines/1140422

[PATCH i-g-t v3 1/2] lib/intel_blt: Add helper function to ensure platform has flat-ccs enabled

[Akshata Jahagirdar]

Add helper function to check if platform has flat-ccs enabled  by
reading from debugfs entry.

Signed-off-by: Akshata Jahagirdar <akshata.jahagirdar@intel.com>
---
 lib/intel_blt.c | 14 ++++++++++++++
 lib/intel_blt.h |  1 +
 2 files changed, 15 insertions(+)

diff --git a/lib/intel_blt.c b/lib/intel_blt.c
index fe0a45cb8..a5ee302c4 100644
--- a/lib/intel_blt.c
+++ b/lib/intel_blt.c
@@ -464,6 +464,20 @@ bool blt_block_copy_supports_compression(int fd)
 				    BLT_CMD_SUPPORTS_COMPRESSION);
 }
 
+/**
+ * blt_platform_has_flat_ccs_enabled
+ * @fd: drm fd
+ *
+ * Check if platform provided by @fd device has flat-ccs enabled.
+ *
+ * Returns:
+ * true if it does, false otherwise.
+ */
+bool blt_platform_has_flat_ccs_enabled(int fd)
+{
+	return igt_debugfs_search(fd, "info", "has_flat_ccs yes");
+}
+
 /**
  * blt_uses_extended_block_copy
  * @fd: drm fd
diff --git a/lib/intel_blt.h b/lib/intel_blt.h
index 1f6c71359..a2c4a4adb 100644
--- a/lib/intel_blt.h
+++ b/lib/intel_blt.h
@@ -209,6 +209,7 @@ bool blt_fast_copy_supports_tiling(int fd, enum blt_tiling_type tiling);
 bool blt_block_copy_supports_tiling(int fd, enum blt_tiling_type tiling);
 bool blt_xy_src_copy_supports_tiling(int fd, enum blt_tiling_type tiling);
 bool blt_block_copy_supports_compression(int fd);
+bool blt_platform_supports_compression(int fd);
 bool blt_uses_extended_block_copy(int fd);
 
 const char *blt_tiling_name(enum blt_tiling_type tiling);
-- 
2.34.1

Re: [PATCH i-g-t v3 1/2] lib/intel_blt: Add helper function to ensure platform has flat-ccs enabled

[Zbigniew Kempczyński]

On Fri, Mar 29, 2024 at 10:27:00AM -0700, Akshata Jahagirdar wrote:
> Add helper function to check if platform has flat-ccs enabled  by
> reading from debugfs entry.
> 
> Signed-off-by: Akshata Jahagirdar <akshata.jahagirdar@intel.com>
> ---
>  lib/intel_blt.c | 14 ++++++++++++++
>  lib/intel_blt.h |  1 +
>  2 files changed, 15 insertions(+)
> 
> diff --git a/lib/intel_blt.c b/lib/intel_blt.c
> index fe0a45cb8..a5ee302c4 100644
> --- a/lib/intel_blt.c
> +++ b/lib/intel_blt.c
> @@ -464,6 +464,20 @@ bool blt_block_copy_supports_compression(int fd)
>  				    BLT_CMD_SUPPORTS_COMPRESSION);
>  }
>  
> +/**
> + * blt_platform_has_flat_ccs_enabled
> + * @fd: drm fd
> + *
> + * Check if platform provided by @fd device has flat-ccs enabled.
> + *
> + * Returns:
> + * true if it does, false otherwise.
> + */
> +bool blt_platform_has_flat_ccs_enabled(int fd)
> +{
> +	return igt_debugfs_search(fd, "info", "has_flat_ccs yes");
> +}
> +
>  /**
>   * blt_uses_extended_block_copy
>   * @fd: drm fd
> diff --git a/lib/intel_blt.h b/lib/intel_blt.h
> index 1f6c71359..a2c4a4adb 100644
> --- a/lib/intel_blt.h
> +++ b/lib/intel_blt.h
> @@ -209,6 +209,7 @@ bool blt_fast_copy_supports_tiling(int fd, enum blt_tiling_type tiling);
>  bool blt_block_copy_supports_tiling(int fd, enum blt_tiling_type tiling);
>  bool blt_xy_src_copy_supports_tiling(int fd, enum blt_tiling_type tiling);
>  bool blt_block_copy_supports_compression(int fd);
> +bool blt_platform_supports_compression(int fd);
>  bool blt_uses_extended_block_copy(int fd);
>  
>  const char *blt_tiling_name(enum blt_tiling_type tiling);
> -- 
> 2.34.1
> 

LGTM:

Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>

--
Zbigniew

[PATCH i-g-t v3 2/2] tests/xe_ccs: Update compression in config based on flat-ccs enablement

[Akshata Jahagirdar]

In Xe2+ platforms, we need to run this test regardless of the status of
flat-ccs. Check if the platform supports compression and has flat ccs enabled,
before the execution and if it doesn't, then update to compression
disabled and proceed with the test.

Signed-off-by: Akshata Jahagirdar <akshata.jahagirdar@intel.com>
---
 tests/intel/xe_ccs.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/tests/intel/xe_ccs.c b/tests/intel/xe_ccs.c
index ad2eeb259..073eca355 100644
--- a/tests/intel/xe_ccs.c
+++ b/tests/intel/xe_ccs.c
@@ -116,7 +116,6 @@ static void surf_copy(int xe,
 	uint16_t cpu_caching = __xe_default_cpu_caching(xe, sysmem, 0);
 	int result;
 
-	igt_assert(mid->compression);
 	if (AT_LEAST_GEN(intel_get_drm_devid(xe), 20) && mid->compression) {
 		comp_pat_index  = intel_get_pat_idx_uc_comp(xe);
 		cpu_caching = DRM_XE_GEM_CPU_CACHING_WC;
@@ -193,7 +192,8 @@ static void surf_copy(int xe,
 	intel_ctx_xe_sync(ctx, true);
 	WRITE_PNG(xe, run_id, "corrupted", &blt.dst, dst->x2, dst->y2, bpp);
 	result = memcmp(src->ptr, dst->ptr, src->size);
-	igt_assert(result != 0);
+	if(mid->compression)
+		igt_assert(result != 0);
 
 	/* retrieve back ccs */
 	memcpy(ccsmap, ccscopy, ccssize);
@@ -747,6 +747,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 	igt_subtest_with_dynamic("block-copy-compressed") {
 		struct test_config config = { .compression = true };
 
+		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
+			config.compression = false;
+
 		block_copy_test(xe, &config, set, BLOCK_COPY);
 	}
 
@@ -756,6 +759,10 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 					      .width_increment = 15,
 					      .width_steps = 512 };
 
+		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
+			config.compression = false;
+
+		igt_info("p1: config.compression:%d\n",config.compression);
 		block_copy_test(xe, &config, set, BLOCK_COPY);
 	}
 
@@ -763,6 +770,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 	igt_subtest_with_dynamic("block-multicopy-compressed") {
 		struct test_config config = { .compression = true };
 
+		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
+			config.compression = false;
+
 		block_copy_test(xe, &config, set, BLOCK_MULTICOPY);
 	}
 
@@ -771,6 +781,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 		struct test_config config = { .compression = true,
 					      .inplace = true };
 
+		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
+			config.compression = false;
+
 		block_copy_test(xe, &config, set, BLOCK_MULTICOPY);
 	}
 
@@ -779,6 +792,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 		struct test_config config = { .compression = true,
 					      .surfcopy = true };
 
+		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
+			config.compression = false;
+
 		block_copy_test(xe, &config, set, BLOCK_COPY);
 	}
 
@@ -789,6 +805,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 					      .surfcopy = true,
 					      .new_ctx = true };
 
+		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
+			config.compression = false;
+
 		block_copy_test(xe, &config, set, BLOCK_COPY);
 	}
 
@@ -798,6 +817,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
 					      .surfcopy = true,
 					      .suspend_resume = true };
 
+		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
+			config.compression = false;
+
 		block_copy_test(xe, &config, set, BLOCK_COPY);
 	}
 
-- 
2.34.1

Re: [PATCH i-g-t v3 2/2] tests/xe_ccs: Update compression in config based on flat-ccs enablement

[Zbigniew Kempczyński]

On Fri, Mar 29, 2024 at 10:27:01AM -0700, Akshata Jahagirdar wrote:
> In Xe2+ platforms, we need to run this test regardless of the status of
> flat-ccs. Check if the platform supports compression and has flat ccs enabled,
> before the execution and if it doesn't, then update to compression
> disabled and proceed with the test.
> 
> Signed-off-by: Akshata Jahagirdar <akshata.jahagirdar@intel.com>
> ---
>  tests/intel/xe_ccs.c | 26 ++++++++++++++++++++++++--
>  1 file changed, 24 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/intel/xe_ccs.c b/tests/intel/xe_ccs.c
> index ad2eeb259..073eca355 100644
> --- a/tests/intel/xe_ccs.c
> +++ b/tests/intel/xe_ccs.c
> @@ -116,7 +116,6 @@ static void surf_copy(int xe,
>  	uint16_t cpu_caching = __xe_default_cpu_caching(xe, sysmem, 0);
>  	int result;
>  
> -	igt_assert(mid->compression);
>  	if (AT_LEAST_GEN(intel_get_drm_devid(xe), 20) && mid->compression) {
>  		comp_pat_index  = intel_get_pat_idx_uc_comp(xe);
>  		cpu_caching = DRM_XE_GEM_CPU_CACHING_WC;
> @@ -193,7 +192,8 @@ static void surf_copy(int xe,
>  	intel_ctx_xe_sync(ctx, true);
>  	WRITE_PNG(xe, run_id, "corrupted", &blt.dst, dst->x2, dst->y2, bpp);
>  	result = memcmp(src->ptr, dst->ptr, src->size);
> -	igt_assert(result != 0);
> +	if(mid->compression)
> +		igt_assert(result != 0);

Instead of artificially disabling compression in the configuration I
would just skip the check (memcmp() either) if:

	HAS_FLATCCS() == true && !blt_platform_has_flat_ccs_enabled()

I've introduced helper which extracts ccs data from the surface:
https://patchwork.freedesktop.org/patch/585475/?series=131808&rev=1

When it will be merged we need to change xe_ccs.c to replace the
compression check on Xe2 (I mean add use of your helper).

>  
>  	/* retrieve back ccs */
>  	memcpy(ccsmap, ccscopy, ccssize);
> @@ -747,6 +747,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  	igt_subtest_with_dynamic("block-copy-compressed") {
>  		struct test_config config = { .compression = true };
>  
> +		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))

Hint, use if<space() to conform codestyle rules.

--
Zbigniew

> +			config.compression = false;
> +
>  		block_copy_test(xe, &config, set, BLOCK_COPY);
>  	}
>  
> @@ -756,6 +759,10 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  					      .width_increment = 15,
>  					      .width_steps = 512 };
>  
> +		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
> +			config.compression = false;
> +
> +		igt_info("p1: config.compression:%d\n",config.compression);
>  		block_copy_test(xe, &config, set, BLOCK_COPY);
>  	}
>  
> @@ -763,6 +770,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  	igt_subtest_with_dynamic("block-multicopy-compressed") {
>  		struct test_config config = { .compression = true };
>  
> +		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
> +			config.compression = false;
> +
>  		block_copy_test(xe, &config, set, BLOCK_MULTICOPY);
>  	}
>  
> @@ -771,6 +781,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  		struct test_config config = { .compression = true,
>  					      .inplace = true };
>  
> +		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
> +			config.compression = false;
> +
>  		block_copy_test(xe, &config, set, BLOCK_MULTICOPY);
>  	}
>  
> @@ -779,6 +792,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  		struct test_config config = { .compression = true,
>  					      .surfcopy = true };
>  
> +		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
> +			config.compression = false;
> +
>  		block_copy_test(xe, &config, set, BLOCK_COPY);
>  	}
>  
> @@ -789,6 +805,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  					      .surfcopy = true,
>  					      .new_ctx = true };
>  
> +		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
> +			config.compression = false;
> +
>  		block_copy_test(xe, &config, set, BLOCK_COPY);
>  	}
>  
> @@ -798,6 +817,9 @@ igt_main_args("bf:pst:W:H:", NULL, help_str, opt_handler, NULL)
>  					      .surfcopy = true,
>  					      .suspend_resume = true };
>  
> +		if(AT_LEAST_GEN(xe, 20) && !blt_platform_has_flat_ccs_enabled(xe))
> +			config.compression = false;
> +
>  		block_copy_test(xe, &config, set, BLOCK_COPY);
>  	}
>  
> -- 
> 2.34.1
>