Commit 0191fddf authored by Ashutosh Dixit's avatar Ashutosh Dixit Committed by Matt Roper
Browse files

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

This reverts commit 55858fa7.

'55858fa7 ("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: 55858fa7 ("drm/xe/xe_guc_ads: save/restore OA registers and allowlist regs")
Signed-off-by: default avatarAshutosh Dixit <ashutosh.dixit@intel.com>
Reviewed-by: default avatarJonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241029200147.1476513-1-ashutosh.dixit@intel.com
parent db38fdb7

drivers/gpu/drm/xe/xe_guc_ads.c

+0 −14
Original line number Diff line number Diff line
@@ -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;

}