[PATCH] Revert "drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs"

[Cavitt, Jonathan]

-----Original Message-----
From: Dixit, Ashutosh <ashutosh.dixit at intel.com> 
Sent: Tuesday, October 29, 2024 1:02 PM
To: intel-xe at lists.freedesktop.org
Cc: De Marchi, Lucas <lucas.demarchi at intel.com>; Cavitt, Jonathan <jonathan.cavitt at intel.com>; Harrison, John C <john.c.harrison at intel.com>; Nerlige Ramappa, Umesh <umesh.nerlige.ramappa at intel.com>; Roper, Matthew D <matthew.d.roper at intel.com>
Subject: [PATCH] Revert "drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs"
> 
> This reverts commit 55858fa7eb2f163f7aa34339fd3399ba4ff564c6.
> 
> '55858fa7eb2f ("drm/xe/xe_guc_ads: save/restore OA registers and allowlist
> regs")' was not properly reviewed and also causes dmesg asserts in
> CI. Revert it.
> 
> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/3295
> Fixes: 55858fa7eb2f ("drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs")
> Signed-off-by: Ashutosh Dixit <ashutosh.dixit at intel.com>

Reviewed-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
-Jonathan Cavitt

> ---
>  drivers/gpu/drm/xe/xe_guc_ads.c | 14 --------------
>  1 file changed, 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
> index a196c4fb90fc9..4e746ae98888f 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -15,7 +15,6 @@
>  #include "regs/xe_engine_regs.h"
>  #include "regs/xe_gt_regs.h"
>  #include "regs/xe_guc_regs.h"
> -#include "regs/xe_oa_regs.h"
>  #include "xe_bo.h"
>  #include "xe_gt.h"
>  #include "xe_gt_ccs_mode.h"
> @@ -741,11 +740,6 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
>  		guc_mmio_regset_write_one(ads, regset_map, e->reg, count++);
>  	}
>  
> -	for (i = 0; i < RING_MAX_NONPRIV_SLOTS; i++)
> -		guc_mmio_regset_write_one(ads, regset_map,
> -					  RING_FORCE_TO_NONPRIV(hwe->mmio_base, i),
> -					  count++);
> -
>  	/* Wa_1607983814 */
>  	if (needs_wa_1607983814(xe) && hwe->class == XE_ENGINE_CLASS_RENDER) {
>  		for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) {
> @@ -754,14 +748,6 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads,
>  		}
>  	}
>  
> -	guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL0, count++);
> -	guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL1, count++);
> -	guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL2, count++);
> -	guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL3, count++);
> -	guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL4, count++);
> -	guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL5, count++);
> -	guc_mmio_regset_write_one(ads, regset_map, EU_PERF_CNTL6, count++);
> -
>  	return count;
>  }
>  
> -- 
> 2.41.0
> 
>