drm/xe: Remove unseless xe_force_wake_prune.

(!(gt->info.engine_mask & BIT(i))) cases are already
handled in the init function. And these masks are not
modified between the init and the prune.

Suggested-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_force_wake.c b/drivers/gpu/drm/xe/xe_force_wake.c
index d2080e6fbe10cbea5629f7ad6ff32dd8005532f1..5bd87118ac73afe70ebd91f0f4321dc7a416cc7e 100644 (file)
--- a/drivers/gpu/drm/xe/xe_force_wake.c
+++ b/drivers/gpu/drm/xe/xe_force_wake.c
@@ -100,21 +100,6 @@ void xe_force_wake_init_engines(struct xe_gt *gt, struct xe_force_wake *fw)
        }
 }
 
-void xe_force_wake_prune(struct xe_gt *gt, struct xe_force_wake *fw)
-{
-       int i, j;
-
-       /* Call after fuses have been read, prune domains that are fused off */
-
-       for (i = XE_HW_ENGINE_VCS0, j = 0; i <= XE_HW_ENGINE_VCS7; ++i, ++j)
-               if (!(gt->info.engine_mask & BIT(i)))
-                       fw->domains[XE_FW_DOMAIN_ID_MEDIA_VDBOX0 + j].reg_ctl = 0;
-
-       for (i = XE_HW_ENGINE_VECS0, j =0; i <= XE_HW_ENGINE_VECS3; ++i, ++j)
-               if (!(gt->info.engine_mask & BIT(i)))
-                       fw->domains[XE_FW_DOMAIN_ID_MEDIA_VEBOX0 + j].reg_ctl = 0;
-}
-
 static void domain_wake(struct xe_gt *gt, struct xe_force_wake_domain *domain)
 {
        xe_mmio_write32(gt, domain->reg_ctl, domain->mask | domain->val);

diff --git a/drivers/gpu/drm/xe/xe_force_wake.h b/drivers/gpu/drm/xe/xe_force_wake.h
index 5adb8daa3b7185adffa6a3d7c23707a2fe7b61bf..7c534cdd5fe93539775f55eee3d2878f4848a025 100644 (file)
--- a/drivers/gpu/drm/xe/xe_force_wake.h
+++ b/drivers/gpu/drm/xe/xe_force_wake.h
@@ -15,8 +15,6 @@ void xe_force_wake_init_gt(struct xe_gt *gt,
                           struct xe_force_wake *fw);
 void xe_force_wake_init_engines(struct xe_gt *gt,
                                struct xe_force_wake *fw);
-void xe_force_wake_prune(struct  xe_gt *gt,
-                        struct xe_force_wake *fw);
 int xe_force_wake_get(struct xe_force_wake *fw,
                      enum xe_force_wake_domains domains);
 int xe_force_wake_put(struct xe_force_wake *fw,

diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 20dbc08d368556175fcda9438083dbc8182bc48c..c17279653561b2ba65e9ad04ac3984a514628793 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -602,8 +602,6 @@ int xe_gt_init(struct xe_gt *gt)
        if (err)
                return err;
 
-       xe_force_wake_prune(gt, gt_to_fw(gt));
-
        err = drmm_add_action_or_reset(&gt_to_xe(gt)->drm, gt_fini, gt);
        if (err)
                return err;