Commit 882ecff7 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Use intel_crtc_needs_modeset() more 



Prefer our own intel_crtc_needs_modeset() wrapper to
drm_atomic_crtc_needs_modeset() whenever we are dealing
with the intel_ types instead of drm_ types. Makes things
a bit neater in general.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221031214037.1636-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 9034f9c4

drivers/gpu/drm/i915/display/intel_cdclk.c

+1 −1
Original line number Diff line number Diff line
@@ -2755,7 +2755,7 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state) 
		if (IS_ERR(crtc_state))

			return PTR_ERR(crtc_state);



		if (drm_atomic_crtc_needs_modeset(&crtc_state->uapi))

		if (intel_crtc_needs_modeset(crtc_state))

			pipe = INVALID_PIPE;

	}

drivers/gpu/drm/i915/display/intel_color.c

+1 −1
Original line number Diff line number Diff line
@@ -1239,7 +1239,7 @@ intel_color_add_affected_planes(struct intel_crtc_state *new_crtc_state) 
	struct intel_plane *plane;



	if (!new_crtc_state->hw.active ||

	    drm_atomic_crtc_needs_modeset(&new_crtc_state->uapi))

	    intel_crtc_needs_modeset(new_crtc_state))

		return 0;



	if (new_crtc_state->gamma_enable == old_crtc_state->gamma_enable &&

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -5931,7 +5931,7 @@ int intel_modeset_all_pipes(struct intel_atomic_state *state, 
			return PTR_ERR(crtc_state);



		if (!crtc_state->hw.active ||

		    drm_atomic_crtc_needs_modeset(&crtc_state->uapi))

		    intel_crtc_needs_modeset(crtc_state))

			continue;



		drm_dbg_kms(&dev_priv->drm, "[CRTC:%d:%s] Full modeset due to %s\n",

drivers/gpu/drm/i915/display/intel_fbc.c

+1 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ static bool intel_fbc_can_flip_nuke(struct intel_atomic_state *state, 
	const struct drm_framebuffer *old_fb = old_plane_state->hw.fb;

	const struct drm_framebuffer *new_fb = new_plane_state->hw.fb;



	if (drm_atomic_crtc_needs_modeset(&new_crtc_state->uapi))

	if (intel_crtc_needs_modeset(new_crtc_state))

		return false;



	if (!intel_fbc_is_ok(old_plane_state) ||

drivers/gpu/drm/i915/display/skl_watermark.c

+1 −1
Original line number Diff line number Diff line
@@ -2744,7 +2744,7 @@ static int skl_wm_add_affected_planes(struct intel_atomic_state *state, 
		 * power well the hardware state will go out of sync

		 * with the software state.

		 */

		if (!drm_atomic_crtc_needs_modeset(&new_crtc_state->uapi) &&

		if (!intel_crtc_needs_modeset(new_crtc_state) &&

		    skl_plane_selected_wm_equals(plane,

						 &old_crtc_state->wm.skl.optimal,

						 &new_crtc_state->wm.skl.optimal))