Commit 49743e1d authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Use intel_crtc_state in sanitize_watermarks() too 



Get rid of all instances of drm_crtc_state, and rename cstate to
crtc_state for more clarity.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190628085517.31886-5-maarten.lankhorst@linux.intel.com
parent 3b4bf24d

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

+6 −8
Original line number Diff line number Diff line
@@ -15812,8 +15812,8 @@ static void sanitize_watermarks(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = to_i915(dev);

	struct drm_atomic_state *state;

	struct intel_atomic_state *intel_state;

	struct drm_crtc *crtc;

	struct drm_crtc_state *cstate;

	struct intel_crtc *crtc;

	struct intel_crtc_state *crtc_state;

	struct drm_modeset_acquire_ctx ctx;

	int ret;

	int i;
@@ -15868,13 +15868,11 @@ retry: 
	}



	/* Write calculated watermark values back */

	for_each_new_crtc_in_state(state, crtc, cstate, i) {

		struct intel_crtc_state *cs = to_intel_crtc_state(cstate);



		cs->wm.need_postvbl_update = true;

		dev_priv->display.optimize_watermarks(intel_state, cs);

	for_each_new_intel_crtc_in_state(intel_state, crtc, crtc_state, i) {

		crtc_state->wm.need_postvbl_update = true;

		dev_priv->display.optimize_watermarks(intel_state, crtc_state);



		to_intel_crtc_state(crtc->state)->wm = cs->wm;

		to_intel_crtc_state(crtc->base.state)->wm = crtc_state->wm;

	}



put_state:

CRA Git | Maintained and supported by SUSTech CRA and CCSE