Re: [PATCH 10/12] drm/xe/kunit: Include hw_engines in xe_wa test

[Matt Roper <matthew.d.roper@intel.com>]

On Fri, Jan 16, 2026 at 07:12:18PM -0300, Gustavo Sousa wrote:
> For better coverage, include RTP to register save/store processing for
> hw_engines as another xe_wa test case.
> 
> Note that, since one of the RTP rules involve calling
> xe_rtp_cfeg_wmtp_disabled(), we need to intercept a MMIO read to
> XEHP_FUSE4 to allow the test to run without crashing.
> 
> Signed-off-by: Gustavo Sousa <gustavo.sousa@intel.com>

The read interception approach may need to be changed if you take
Michal's suggestion on patches 5/6, but otherwise,

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>


> ---
>  drivers/gpu/drm/xe/tests/xe_wa_test.c | 50 ++++++++++++++++++++++++++++++++++-
>  1 file changed, 49 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/tests/xe_wa_test.c b/drivers/gpu/drm/xe/tests/xe_wa_test.c
> index 2bf6fab015cd..3311f05a6fc2 100644
> --- a/drivers/gpu/drm/xe/tests/xe_wa_test.c
> +++ b/drivers/gpu/drm/xe/tests/xe_wa_test.c
> @@ -6,15 +6,34 @@
>  #include <drm/drm_drv.h>
>  #include <drm/drm_kunit_helpers.h>
>  
> +#include <kunit/static_stub.h>
>  #include <kunit/test.h>
>  
> +#include "regs/xe_gt_regs.h"
> +#include "tests/xe_mmio_intercept.h"
>  #include "xe_device.h"
> +#include "xe_gt.h"
> +#include "xe_hw_engine.h"
>  #include "xe_kunit_helpers.h"
>  #include "xe_pci_test.h"
>  #include "xe_reg_sr.h"
>  #include "xe_tuning.h"
>  #include "xe_wa.h"
>  
> +static bool xe_wa_mmio_intercept_read32(struct kunit *test,
> +					struct xe_mmio *mmio,
> +					struct xe_reg reg,
> +					u32 *val)
> +{
> +	/* For XE_RTP_RULES(...FUNC(xe_rtp_cfeg_wmtp_disabled)...). */
> +	if (reg.raw == XEHP_FUSE4.raw) {
> +		*val = CFEG_WMTP_DISABLE;
> +		return true;
> +	}
> +
> +	return false;
> +}
> +
>  static int xe_wa_test_init(struct kunit *test)
>  {
>  	const struct xe_pci_fake_data *param = test->param_value;
> @@ -33,10 +52,13 @@ static int xe_wa_test_init(struct kunit *test)
>  	ret = xe_pci_fake_device_init(xe);
>  	KUNIT_ASSERT_EQ(test, ret, 0);
>  
> +	kunit_activate_static_stub(test,
> +				   xe_mmio_intercept_read32,
> +				   xe_wa_mmio_intercept_read32);
> +
>  	if (!param->graphics_verx100)
>  		xe->info.step = param->step;
>  
> -	/* TODO: init hw engines for engine/LRC WAs */
>  	xe->drm.dev = dev;
>  	test->priv = xe;
>  
> @@ -59,8 +81,34 @@ static void xe_wa_gt(struct kunit *test)
>  	}
>  }
>  
> +static void xe_wa_hw_engines(struct kunit *test)
> +{
> +	struct xe_device *xe = test->priv;
> +	struct xe_gt *gt;
> +	int id;
> +
> +	for_each_gt(gt, xe, id) {
> +		struct xe_hw_engine *hwe;
> +		int hwe_id;
> +
> +		/*
> +		 * The early initialization also causes RTP processing to build
> +		 * up each engine's reg_sr.
> +		 */
> +		xe_hw_engines_init_early(gt);
> +		for_each_hw_engine(hwe, gt, hwe_id)
> +			KUNIT_EXPECT_EQ(test, hwe->reg_sr.errors, 0);
> +
> +		for_each_hw_engine(hwe, gt, hwe_id) {
> +			xe_hw_engine_setup_reg_lrc(hwe);
> +			KUNIT_EXPECT_EQ(test, hwe->reg_lrc.errors, 0);
> +		}
> +	}
> +}
> +
>  static struct kunit_case xe_wa_tests[] = {
>  	KUNIT_CASE_PARAM(xe_wa_gt, xe_pci_fake_data_gen_params),
> +	KUNIT_CASE_PARAM(xe_wa_hw_engines, xe_pci_fake_data_gen_params),
>  	{}
>  };
>  
> 
> -- 
> 2.52.0
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation