File tree Expand file tree Collapse file tree 2 files changed +6
-11
lines changed Expand file tree Collapse file tree 2 files changed +6
-11
lines changed Original file line number Diff line number Diff line change @@ -50,6 +50,9 @@ static bool get_ia_constants(struct intel_llc *llc,
50
50
struct drm_i915_private * i915 = llc_to_gt (llc )-> i915 ;
51
51
struct intel_rps * rps = & llc_to_gt (llc )-> rps ;
52
52
53
+ if (!HAS_LLC (i915 ) || IS_DGFX (i915 ))
54
+ return false;
55
+
53
56
if (rps -> max_freq <= rps -> min_freq )
54
57
return false;
55
58
@@ -147,8 +150,7 @@ static void gen6_update_ring_freq(struct intel_llc *llc)
147
150
148
151
void intel_llc_enable (struct intel_llc * llc )
149
152
{
150
- if (HAS_LLC (llc_to_gt (llc )-> i915 ))
151
- gen6_update_ring_freq (llc );
153
+ gen6_update_ring_freq (llc );
152
154
}
153
155
154
156
void intel_llc_disable (struct intel_llc * llc )
Original file line number Diff line number Diff line change @@ -18,10 +18,8 @@ static int gen6_verify_ring_freq(struct intel_llc *llc)
18
18
19
19
wakeref = intel_runtime_pm_get (llc_to_gt (llc )-> uncore -> rpm );
20
20
21
- if (!get_ia_constants (llc , & consts )) {
22
- err = - ENODEV ;
21
+ if (!get_ia_constants (llc , & consts ))
23
22
goto out_rpm ;
24
- }
25
23
26
24
for (gpu_freq = consts .min_gpu_freq ;
27
25
gpu_freq <= consts .max_gpu_freq ;
@@ -71,10 +69,5 @@ static int gen6_verify_ring_freq(struct intel_llc *llc)
71
69
72
70
int st_llc_verify (struct intel_llc * llc )
73
71
{
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 );
80
73
}
You can’t perform that action at this time.
0 commit comments