mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-13 10:38:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Make intel_bw_check_sagv_mask() internal to intel_bw.c

Browse Source 
The only thing between the current intel_bw_check_sagv_mask() call
site and intel_bw_atomic_check() is skl_wm_add_affected_planes()
which no longer depends on the sagv mask, so we can make life
a lot less confusing by calling intel_bw_check_sagv_mask() from
intel_bw_atomic_check() instead.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250326162544.3642-12-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:41 +02:00
parent 014ea4d39c
commit d1381206b1
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1443,7 +1443,7 @@ int intel_bw_modeset_checks(struct intel_atomic_state *state)
return 0;
}
int intel_bw_check_sagv_mask(struct intel_atomic_state *state)
static int intel_bw_check_sagv_mask(struct intel_atomic_state *state)
{
struct intel_display *display = to_intel_display(state);
struct drm_i915_private *i915 = to_i915(display->drm);
@@ -1492,6 +1492,13 @@ int intel_bw_atomic_check(struct intel_atomic_state *state)
const struct intel_bw_state *old_bw_state;
int ret;
if (DISPLAY_VER(i915) < 9)
return 0;
ret = intel_bw_check_sagv_mask(state);
if (ret)
return ret;
/* FIXME earlier gens need some checks too */
if (DISPLAY_VER(display) < 11)
return 0;

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

@@ -67,7 +67,6 @@ 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_check_sagv_mask(struct intel_atomic_state *state);
int intel_bw_atomic_check(struct intel_atomic_state *state);
int icl_pcode_restrict_qgv_points(struct intel_display *display,
u32 points_mask);

5
drivers/gpu/drm/i915/display/skl_watermark.c
View File

@@ -454,7 +454,6 @@ static int intel_compute_sagv_mask(struct intel_atomic_state *state)
{
struct intel_display *display = to_intel_display(state);
struct drm_i915_private *i915 = to_i915(state->base.dev);
int ret;
struct intel_crtc *crtc;
struct intel_crtc_state *new_crtc_state;
int i;
@@ -485,10 +484,6 @@ static int intel_compute_sagv_mask(struct intel_atomic_state *state)
intel_crtc_can_enable_sagv(new_crtc_state);
}
ret = intel_bw_check_sagv_mask(state);
if (ret)
return ret;
return 0;
}