Commit 0c841271 authored by Manasi Navare's avatar Manasi Navare
Browse files

drm/i915/display: Rename update_crtcs() to commit_modeset_enables() 



This patch has no functional changes. This just renames the update_crtcs()
hooks to commit_modeset_enables() to match the drm_atomic helper naming
conventions.

v2:
* Rebase on drm-tip

Suggested-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190827221735.29351-2-manasi.d.navare@intel.com
parent 31444afb

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

+5 −5
Original line number Diff line number Diff line
@@ -13743,7 +13743,7 @@ static void intel_update_crtc(struct intel_crtc *crtc, 
	intel_finish_crtc_commit(state, crtc);

}



static void intel_update_crtcs(struct intel_atomic_state *state)

static void intel_commit_modeset_enables(struct intel_atomic_state *state)

{

	struct intel_crtc *crtc;

	struct intel_crtc_state *old_crtc_state, *new_crtc_state;
@@ -13758,7 +13758,7 @@ static void intel_update_crtcs(struct intel_atomic_state *state) 
	}

}



static void skl_update_crtcs(struct intel_atomic_state *state)

static void skl_commit_modeset_enables(struct intel_atomic_state *state)

{

	struct drm_i915_private *dev_priv = to_i915(state->base.dev);

	struct intel_crtc *crtc;
@@ -13999,7 +13999,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) 
		intel_encoders_update_prepare(state);



	/* Now enable the clocks, plane, pipe, and connectors that we set up. */

	dev_priv->display.update_crtcs(state);

	dev_priv->display.commit_modeset_enables(state);



	if (state->modeset) {

		intel_encoders_update_complete(state);
@@ -15906,9 +15906,9 @@ void intel_init_display_hooks(struct drm_i915_private *dev_priv) 
	}



	if (INTEL_GEN(dev_priv) >= 9)

		dev_priv->display.update_crtcs = skl_update_crtcs;

		dev_priv->display.commit_modeset_enables = skl_commit_modeset_enables;

	else

		dev_priv->display.update_crtcs = intel_update_crtcs;

		dev_priv->display.commit_modeset_enables = intel_commit_modeset_enables;

}



static i915_reg_t i915_vgacntrl_reg(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/i915_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ struct drm_i915_display_funcs { 
			    struct intel_atomic_state *old_state);

	void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,

			     struct intel_atomic_state *old_state);

	void (*update_crtcs)(struct intel_atomic_state *state);

	void (*commit_modeset_enables)(struct intel_atomic_state *state);

	void (*audio_codec_enable)(struct intel_encoder *encoder,

				   const struct intel_crtc_state *crtc_state,

				   const struct drm_connector_state *conn_state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE