Skip to content

Commit c014e07

Browse files
committed
drm/i915/gt: Do not attempt to reprogram IA/ring frequencies for dgfx
For dgfx, we do not need to reconfigure the IA/ring frequencies of the main processors as they are distinct devices. Signed-off-by: Chris Wilson <[email protected]> Cc: Andi Shyti <[email protected]> Cc: Tvrtko Ursulin <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent bd3d1f8 commit c014e07

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

drivers/gpu/drm/i915/gt/intel_llc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ static bool get_ia_constants(struct intel_llc *llc,
5050
struct drm_i915_private *i915 = llc_to_gt(llc)->i915;
5151
struct intel_rps *rps = &llc_to_gt(llc)->rps;
5252

53+
if (!HAS_LLC(i915) || IS_DGFX(i915))
54+
return false;
55+
5356
if (rps->max_freq <= rps->min_freq)
5457
return false;
5558

@@ -147,8 +150,7 @@ static void gen6_update_ring_freq(struct intel_llc *llc)
147150

148151
void intel_llc_enable(struct intel_llc *llc)
149152
{
150-
if (HAS_LLC(llc_to_gt(llc)->i915))
151-
gen6_update_ring_freq(llc);
153+
gen6_update_ring_freq(llc);
152154
}
153155

154156
void intel_llc_disable(struct intel_llc *llc)

drivers/gpu/drm/i915/gt/selftest_llc.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ static int gen6_verify_ring_freq(struct intel_llc *llc)
1818

1919
wakeref = intel_runtime_pm_get(llc_to_gt(llc)->uncore->rpm);
2020

21-
if (!get_ia_constants(llc, &consts)) {
22-
err = -ENODEV;
21+
if (!get_ia_constants(llc, &consts))
2322
goto out_rpm;
24-
}
2523

2624
for (gpu_freq = consts.min_gpu_freq;
2725
gpu_freq <= consts.max_gpu_freq;
@@ -71,10 +69,5 @@ static int gen6_verify_ring_freq(struct intel_llc *llc)
7169

7270
int st_llc_verify(struct intel_llc *llc)
7371
{
74-
int err = 0;
75-
76-
if (HAS_LLC(llc_to_gt(llc)->i915))
77-
err = gen6_verify_ring_freq(llc);
78-
79-
return err;
72+
return gen6_verify_ring_freq(llc);
8073
}

0 commit comments

Comments
 (0)