github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915: Make intel_bw_modeset_checks() internal to intel_bw_atomic_check()

Browse Source 
Now that all the sagv computation has been moved from the
skl+ watermark code into intel_bw_atomic_check() there is
no point in calling intel_bw_modeset_checks() before the
wm computation. Hide it within intel_bw_atomic_check().

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250326162544.3642-13-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Ville Syrjälä 2025-03-26 18:25:42 +02:00
parent d1381206b1
commit 4d5204b304
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/i915/display/intel_bw.c
View File

@ -1414,7 +1414,7 @@ static int intel_bw_check_data_rate(struct intel_atomic_state *state, bool *chan
return 0;
}
int intel_bw_modeset_checks(struct intel_atomic_state *state)
static int intel_bw_modeset_checks(struct intel_atomic_state *state)
{
struct intel_display *display = to_intel_display(state);
const struct intel_bw_state *old_bw_state;
@ -1483,7 +1483,7 @@ static int intel_bw_check_sagv_mask(struct intel_atomic_state *state)
return 0;
}
int intel_bw_atomic_check(struct intel_atomic_state *state)
int intel_bw_atomic_check(struct intel_atomic_state *state, bool any_ms)
{
struct intel_display *display = to_intel_display(state);
struct drm_i915_private *i915 = to_i915(display->drm);
@ -1495,6 +1495,12 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)
if (DISPLAY_VER(i915) < 9)
return 0;
if (any_ms) {
ret = intel_bw_modeset_checks(state);
if (ret)
return ret;
}
ret = intel_bw_check_sagv_mask(state);
if (ret)
return ret;

3
drivers/gpu/drm/i915/display/intel_bw.h
View File

@ -66,8 +66,7 @@ intel_atomic_get_bw_state(struct intel_atomic_state *state);
void intel_bw_init_hw(struct intel_display *display);
int intel_bw_init(struct intel_display *display);
int intel_bw_modeset_checks(struct intel_atomic_state *state);
int intel_bw_atomic_check(struct intel_atomic_state *state);
int intel_bw_atomic_check(struct intel_atomic_state *state, bool any_ms);
int icl_pcode_restrict_qgv_points(struct intel_display *display,
u32 points_mask);
int intel_bw_calc_min_cdclk(struct intel_atomic_state *state,

8
drivers/gpu/drm/i915/display/intel_display.c
View File

@ -6443,17 +6443,11 @@ int intel_atomic_check(struct drm_device *dev,
if (ret)
goto fail;
if (any_ms) {
ret = intel_bw_modeset_checks(state);
if (ret)
goto fail;
}
ret = intel_compute_global_watermarks(state);
if (ret)
goto fail;
ret = intel_bw_atomic_check(state);
ret = intel_bw_atomic_check(state, any_ms);
if (ret)
goto fail;