Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1947fd13 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Don't initialize plane_to_crtc_mapping[] on SKL+ 



We don't use the enum i9xx_plane_id namespace on SKL+ anymore, so
do not initialize the related plane_to_crtc_mapping[] table either.

Actually the only remaining user of that table is the pre-g4x
watermark code, but no harm in initializing the table on all
pre-SKL platforms.

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


Reviewed-by: default avatarDhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
parent 957d32fe

drivers/gpu/drm/i915/intel_display.c

+11 −4
Original line number Diff line number Diff line
@@ -13570,10 +13570,17 @@ static int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) 
	/* initialize shared scalers */

	intel_crtc_init_scalers(intel_crtc, crtc_state);



	BUG_ON(pipe >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||

	       dev_priv->plane_to_crtc_mapping[primary->i9xx_plane] != NULL);

	dev_priv->plane_to_crtc_mapping[primary->i9xx_plane] = intel_crtc;

	dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = intel_crtc;

	BUG_ON(pipe >= ARRAY_SIZE(dev_priv->pipe_to_crtc_mapping) ||

	       dev_priv->pipe_to_crtc_mapping[pipe] != NULL);

	dev_priv->pipe_to_crtc_mapping[pipe] = intel_crtc;



	if (INTEL_GEN(dev_priv) < 9) {

		enum i9xx_plane_id i9xx_plane = primary->i9xx_plane;



		BUG_ON(i9xx_plane >= ARRAY_SIZE(dev_priv->plane_to_crtc_mapping) ||

		       dev_priv->plane_to_crtc_mapping[i9xx_plane] != NULL);

		dev_priv->plane_to_crtc_mapping[i9xx_plane] = intel_crtc;

	}



	drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);