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

Commit d6dfee7a authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira Committed by Daniel Vetter
Browse files

drm/i915: Covert remaining platforms to choose DPLLS before disabling CRTCs 



Use the infrastructure added in a previous patch to choose shared DPLLs
and calculate clocks before touching the hardware.

v2: Don't set mode_set hooks since dev_priv is kzalloc()'d (Ville)

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 3fb37703

drivers/gpu/drm/i915/intel_display.c

+3 −5
Original line number Diff line number Diff line
@@ -6395,9 +6395,7 @@ static void i9xx_set_pipeconf(struct intel_crtc *intel_crtc) 
	POSTING_READ(PIPECONF(intel_crtc->pipe));

}



static int i9xx_crtc_mode_set(struct intel_crtc *crtc,

			      int x, int y,

			      struct drm_framebuffer *fb)

static int i9xx_crtc_compute_clock(struct intel_crtc *crtc)

{

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -12484,7 +12482,7 @@ static void intel_init_display(struct drm_device *dev) 
	} else if (IS_VALLEYVIEW(dev)) {

		dev_priv->display.get_pipe_config = i9xx_get_pipe_config;

		dev_priv->display.get_plane_config = i9xx_get_plane_config;

		dev_priv->display.crtc_mode_set = i9xx_crtc_mode_set;

		dev_priv->display.crtc_compute_clock = i9xx_crtc_compute_clock;

		dev_priv->display.crtc_enable = valleyview_crtc_enable;

		dev_priv->display.crtc_disable = i9xx_crtc_disable;

		dev_priv->display.off = i9xx_crtc_off;
@@ -12493,7 +12491,7 @@ static void intel_init_display(struct drm_device *dev) 
	} else {

		dev_priv->display.get_pipe_config = i9xx_get_pipe_config;

		dev_priv->display.get_plane_config = i9xx_get_plane_config;

		dev_priv->display.crtc_mode_set = i9xx_crtc_mode_set;

		dev_priv->display.crtc_compute_clock = i9xx_crtc_compute_clock;

		dev_priv->display.crtc_enable = i9xx_crtc_enable;

		dev_priv->display.crtc_disable = i9xx_crtc_disable;

		dev_priv->display.off = i9xx_crtc_off;