Merge tag 'drm-intel-gt-next-2024-04-26' of https://anongit.freedesktop.org/git/drm...

[linux-block.git] / drivers / gpu / drm / i915 / gt / intel_gt_sysfs_pm.c

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
index eca4a6a65556b0b70acb7d3a89a1490804900b83..d7784650e4d93260cc0961d5ccdfc7078623643e 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c
@@ -573,7 +573,6 @@ static ssize_t media_freq_factor_show(struct kobject *kobj,
                                      char *buff)
 {
        struct intel_gt *gt = intel_gt_sysfs_get_drvdata(kobj, attr->attr.name);
-       struct intel_guc_slpc *slpc = &gt_to_guc(gt)->slpc;
        intel_wakeref_t wakeref;
        u32 mode;
 
@@ -581,20 +580,12 @@ static ssize_t media_freq_factor_show(struct kobject *kobj,
         * Retrieve media_ratio_mode from GEN6_RPNSWREQ bit 13 set by
         * GuC. GEN6_RPNSWREQ:13 value 0 represents 1:2 and 1 represents 1:1
         */
-       if (IS_XEHPSDV(gt->i915) &&
-           slpc->media_ratio_mode == SLPC_MEDIA_RATIO_MODE_DYNAMIC_CONTROL) {
-               /*
-                * For XEHPSDV dynamic mode GEN6_RPNSWREQ:13 does not contain
-                * the media_ratio_mode, just return the cached media ratio
-                */
-               mode = slpc->media_ratio_mode;
-       } else {
-               with_intel_runtime_pm(gt->uncore->rpm, wakeref)
-                       mode = intel_uncore_read(gt->uncore, GEN6_RPNSWREQ);
-               mode = REG_FIELD_GET(GEN12_MEDIA_FREQ_RATIO, mode) ?
-                       SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_ONE :
-                       SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO;
-       }
+       with_intel_runtime_pm(gt->uncore->rpm, wakeref)
+               mode = intel_uncore_read(gt->uncore, GEN6_RPNSWREQ);
+
+       mode = REG_FIELD_GET(GEN12_MEDIA_FREQ_RATIO, mode) ?
+               SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_ONE :
+               SLPC_MEDIA_RATIO_MODE_FIXED_ONE_TO_TWO;
 
        return sysfs_emit(buff, "%u\n", media_ratio_mode_to_factor(mode));
 }