Skip to content

Commit

Permalink
drm/xe: Assume MTL's forcewake register continues to future platforms
Browse files Browse the repository at this point in the history
Starting with MTL, the GT forcewake ack register moved from 0x130044 to
0xDFC.  We expect this change to carry forward to future platforms as
well, so forcewake initialization should use an IP version check instead
of matching the MTL platform specifically.

The (re)definition of FORCEWAKE_ACK_GT_MTL in the forcewake file is also
unnecessary; we can take the definition that already exists in the
dedicated register header.

Bspec: 65031, 64629
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
  • Loading branch information
Matt Roper authored and Rodrigo Vivi committed Dec 19, 2023
1 parent 74f800c commit ba11f1b
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/gpu/drm/xe/xe_force_wake.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ static void domain_init(struct xe_force_wake_domain *domain,
domain->mask = mask;
}

#define FORCEWAKE_ACK_GT_MTL _MMIO(0xdfc)

void xe_force_wake_init_gt(struct xe_gt *gt, struct xe_force_wake *fw)
{
struct xe_device *xe = gt_to_xe(gt);
Expand All @@ -48,7 +46,7 @@ void xe_force_wake_init_gt(struct xe_gt *gt, struct xe_force_wake *fw)
/* Assuming gen11+ so assert this assumption is correct */
XE_BUG_ON(GRAPHICS_VER(gt_to_xe(gt)) < 11);

if (xe->info.platform == XE_METEORLAKE) {
if (xe->info.graphics_verx100 >= 1270) {
domain_init(&fw->domains[XE_FW_DOMAIN_ID_GT],
XE_FW_DOMAIN_ID_GT,
FORCEWAKE_GT_GEN9.reg,
Expand Down

0 comments on commit ba11f1b

Please sign in to comment.