summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Roper <matthew.d.roper@intel.com>2023-06-03 02:52:09 +0300
committerRodrigo Vivi <rodrigo.vivi@intel.com>2023-12-20 02:34:28 +0300
commit17a6726c3d3040c0a47d7ec5bd8cc4056a379017 (patch)
tree6a9c51ab9c68afce4bad073b77b5b39ef54a1d11
parent066d0952489b6ea269823dbbbb85d580ee6d23e0 (diff)
downloadlinux-17a6726c3d3040c0a47d7ec5bd8cc4056a379017.tar.xz
drm/xe: Initialize MOCS earlier
xe_mocs_init_early doesn't touch the hardware, it just sets up internal software state. There's no need to perform this step in the "forcewake held" region. Moving the init earlier will also make the uc_index values available earlier which will be important for an upcoming GuC init patch. Reviewed-by: Matthew Brost <matthew.brost@intel.com> Link: https://lore.kernel.org/r/20230602235210.1314028-2-matthew.d.roper@intel.com Signed-off-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
-rw-r--r--drivers/gpu/drm/xe/xe_gt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 335148f1cd39..3799e663bad3 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -315,8 +315,6 @@ static int gt_fw_domain_init(struct xe_gt *gt)
/* Rerun MCR init as we now have hw engine list */
xe_gt_mcr_init(gt);
- xe_mocs_init_early(gt);
-
err = xe_hw_engines_init_early(gt);
if (err)
goto err_force_wake;
@@ -429,6 +427,8 @@ int xe_gt_init(struct xe_gt *gt)
if (err)
return err;
+ xe_mocs_init_early(gt);
+
xe_gt_sysfs_init(gt);
err = gt_fw_domain_init(gt);