Skip to contentSkip to conversation

drm/i915: Split shared dpll setup out of __intel_set_mode()

PATCH In review Ander Conselvan de Oliveira 3 participants 6 messages Jan 29, 2015 – Jan 31, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 drm/i915: Split shared dpll setup out of __intel_set_mode()

This simplifies __intel_set_mode() a little.

---
 drivers/gpu/drm/i915/intel_display.c | 50 ++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +33 -17
index 423ef95..3d220a6 100644
@@ -11021,6 +11021,36 @@ out:
 	return pipe_config;
 }
 
+static int __intel_set_mode_setup_plls(struct drm_device *dev,
+				       unsigned modeset_pipes,
+				       unsigned disable_pipes)
+{
+	struct drm_i915_private *dev_priv = to_i915(dev);
+	unsigned clear_pipes = modeset_pipes | disable_pipes;
+	struct intel_crtc *intel_crtc;
+	int ret = 0;
+
+	if (!dev_priv->display.crtc_compute_clock)
+		return 0;
+
+	ret = intel_shared_dpll_start_config(dev_priv, clear_pipes);
+	if (ret)
+		goto done;
+
+	for_each_intel_crtc_masked(dev, modeset_pipes, intel_crtc) {
+		struct intel_crtc_state *state = intel_crtc->new_config;
+		ret = dev_priv->display.crtc_compute_clock(intel_crtc,
+							   state);
+		if (ret) {
+			intel_shared_dpll_abort_config(dev_priv);
+			goto done;
+		}
+	}
+
+done:
+	return ret;
+}
+
 static int __intel_set_mode(struct drm_crtc *crtc,
 			    struct drm_display_mode *mode,
 			    int x, int y, struct drm_framebuffer *fb,
@@ -11058,23 +11088,9 @@ static int __intel_set_mode(struct drm_crtc *crtc,
 		prepare_pipes &= ~disable_pipes;
 	}
 
-	if (dev_priv->display.crtc_compute_clock) {
-		unsigned clear_pipes = modeset_pipes | disable_pipes;
-
-		ret = intel_shared_dpll_start_config(dev_priv, clear_pipes);
-		if (ret)
-			goto done;
-
-		for_each_intel_crtc_masked(dev, modeset_pipes, intel_crtc) {
-			struct intel_crtc_state *state = intel_crtc->new_config;
-			ret = dev_priv->display.crtc_compute_clock(intel_crtc,
-								   state);
-			if (ret) {
-				intel_shared_dpll_abort_config(dev_priv);
-				goto done;
-			}
-		}
-	}
+	ret = __intel_set_mode_setup_plls(dev, modeset_pipes, disable_pipes);
+	if (ret)
+		goto done;
 
 	for_each_intel_crtc_masked(dev, disable_pipes, intel_crtc)
 		intel_crtc_disable(&intel_crtc->base);
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/4 drm/i915: Move pll new_config field into intel_atomic_state

In order to implement atomic mode sets, we'll need to hold state shared by multiple crtcs in the drm_atomic_state struct. This patch moves towards that goal by introducing struct intel_atomic_state for that purpose and moving the staged pll configuration into it. Current state will be moved in a follow up patch.

---
 drivers/gpu/drm/i915/i915_drv.h      |   3 +-
 drivers/gpu/drm/i915/intel_ddi.c     |  11 ++--
 drivers/gpu/drm/i915/intel_display.c | 104 +++++++++++++++--------------------
 drivers/gpu/drm/i915/intel_drv.h     |   8 ++-
 4 files changed, 59 insertions(+), 67 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
index b09173f..862edc4 100644
@@ -297,7 +297,6 @@ struct intel_shared_dpll_config {
 
 struct intel_shared_dpll {
 	struct intel_shared_dpll_config config;
-	struct intel_shared_dpll_config *new_config;
 
 	int active; /* count of number of active CRTCs (i.e. DPMS on) */
 	bool on; /* is the PLL actually active? Disabled during modeset */
@@ -504,6 +503,7 @@ struct drm_i915_error_state {
 struct intel_connector;
 struct intel_encoder;
 struct intel_crtc_state;
+struct intel_atomic_state;
 struct intel_initial_plane_config;
 struct intel_crtc;
 struct intel_limit;
@@ -546,6 +546,7 @@ struct drm_i915_display_funcs {
 	void (*get_initial_plane_config)(struct intel_crtc *,
 					 struct intel_initial_plane_config *);
 	int (*crtc_compute_clock)(struct intel_crtc *crtc,
+				  struct intel_atomic_state *state,
 				  struct intel_crtc_state *crtc_state);
 	void (*crtc_enable)(struct drm_crtc *crtc);
 	void (*crtc_disable)(struct drm_crtc *crtc);
drivers/gpu/drm/i915/intel_ddi.c +7 -4
index ad8b73d..1cd541f 100644
@@ -909,6 +909,7 @@ hsw_ddi_calculate_wrpll(int clock /* in Hz */,
 
 static bool
 hsw_ddi_pll_select(struct intel_crtc *intel_crtc,
+		   struct intel_atomic_state *state,
 		   struct intel_crtc_state *crtc_state,
 		   struct intel_encoder *intel_encoder,
 		   int clock)
@@ -926,7 +927,7 @@ hsw_ddi_pll_select(struct intel_crtc *intel_crtc,
 
 		crtc_state->dpll_hw_state.wrpll = val;
 
-		pll = intel_get_shared_dpll(intel_crtc, crtc_state);
+		pll = intel_get_shared_dpll(intel_crtc, state, crtc_state);
 		if (pll == NULL) {
 			DRM_DEBUG_DRIVER("failed to find PLL for pipe %c\n",
 					 pipe_name(intel_crtc->pipe));
@@ -1096,6 +1097,7 @@ found:
 
 static bool
 skl_ddi_pll_select(struct intel_crtc *intel_crtc,
+		   struct intel_atomic_state *state,
 		   struct intel_crtc_state *crtc_state,
 		   struct intel_encoder *intel_encoder,
 		   int clock)
@@ -1150,7 +1152,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,
 	crtc_state->dpll_hw_state.cfgcr1 = cfgcr1;
 	crtc_state->dpll_hw_state.cfgcr2 = cfgcr2;
 
-	pll = intel_get_shared_dpll(intel_crtc, crtc_state);
+	pll = intel_get_shared_dpll(intel_crtc, state, crtc_state);
 	if (pll == NULL) {
 		DRM_DEBUG_DRIVER("failed to find PLL for pipe %c\n",
 				 pipe_name(intel_crtc->pipe));
@@ -1171,6 +1173,7 @@ skl_ddi_pll_select(struct intel_crtc *intel_crtc,
  * function should be folded into compute_config() eventually.
  */
 bool intel_ddi_pll_select(struct intel_crtc *intel_crtc,
+			  struct intel_atomic_state *state,
 			  struct intel_crtc_state *crtc_state)
 {
 	struct drm_device *dev = intel_crtc->base.dev;
@@ -1179,10 +1182,10 @@ bool intel_ddi_pll_select(struct intel_crtc *intel_crtc,
 	int clock = crtc_state->port_clock;
 
 	if (IS_SKYLAKE(dev))
-		return skl_ddi_pll_select(intel_crtc, crtc_state,
+		return skl_ddi_pll_select(intel_crtc, state, crtc_state,
 					  intel_encoder, clock);
 	else
-		return hsw_ddi_pll_select(intel_crtc, crtc_state,
+		return hsw_ddi_pll_select(intel_crtc, state, crtc_state,
 					  intel_encoder, clock);
 }
 
drivers/gpu/drm/i915/intel_display.c +43 -61

247 lines not on this page · raw message

drivers/gpu/drm/i915/intel_drv.h +7 -1
index eef79cc..f2f4210 100644
@@ -243,6 +243,10 @@ typedef struct dpll {
 	int	p;
 } intel_clock_t;
 
+struct intel_atomic_state {
+	struct intel_shared_dpll_config shared_dpll[I915_NUM_PLLS];
+};
+
 struct intel_plane_state {
 	struct drm_plane_state base;
 	struct drm_rect src;
@@ -837,6 +841,7 @@ void intel_ddi_disable_transcoder_func(struct drm_i915_private *dev_priv,
 void intel_ddi_enable_pipe_clock(struct intel_crtc *intel_crtc);
 void intel_ddi_disable_pipe_clock(struct intel_crtc *intel_crtc);
 bool intel_ddi_pll_select(struct intel_crtc *crtc,
+			  struct intel_atomic_state *state,
 			  struct intel_crtc_state *crtc_state);
 void intel_ddi_set_pipe_settings(struct drm_crtc *crtc);
 void intel_ddi_prepare_link_retrain(struct drm_encoder *encoder);
@@ -962,7 +967,8 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv,
 #define assert_shared_dpll_enabled(d, p) assert_shared_dpll(d, p, true)
 #define assert_shared_dpll_disabled(d, p) assert_shared_dpll(d, p, false)
 struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc,
-						struct intel_crtc_state *state);
+						struct intel_atomic_state *state,
+						struct intel_crtc_state *crtc_state);
 void intel_put_shared_dpll(struct intel_crtc *crtc);
 
 void vlv_force_pll_on(struct drm_device *dev, enum pipe pipe,
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH 3/4 drm/i915: Move current pll config to shared global state

In reply to Ander Conselvan de Oliveira

This patch adds a display_state pointer to drm_i915_private and moves the current pll config into it.

---
 drivers/gpu/drm/i915/i915_debugfs.c  | 15 ++++---
 drivers/gpu/drm/i915/i915_drv.h      |  4 +-
 drivers/gpu/drm/i915/intel_ddi.c     | 13 ++++--
 drivers/gpu/drm/i915/intel_display.c | 86 +++++++++++++++++++++++++-----------
 4 files changed, 79 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +9 -6
index 3b332a4..eb18a99 100644
@@ -2765,17 +2765,20 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)
 	drm_modeset_lock_all(dev);
 	for (i = 0; i < dev_priv->num_shared_dpll; i++) {
 		struct intel_shared_dpll *pll = &dev_priv->shared_dplls[i];
+		struct intel_shared_dpll_config *pll_config;
+
+		pll_config = &dev_priv->display_state->shared_dpll[i];
 
 		seq_printf(m, "DPLL%i: %s, id: %i\n", i, pll->name, pll->id);
 		seq_printf(m, " crtc_mask: 0x%08x, active: %d, on: %s\n",
-			   pll->config.crtc_mask, pll->active, yesno(pll->on));
+			   pll_config->crtc_mask, pll->active, yesno(pll->on));
 		seq_printf(m, " tracked hardware state:\n");
-		seq_printf(m, " dpll:    0x%08x\n", pll->config.hw_state.dpll);
+		seq_printf(m, " dpll:    0x%08x\n", pll_config->hw_state.dpll);
 		seq_printf(m, " dpll_md: 0x%08x\n",
-			   pll->config.hw_state.dpll_md);
-		seq_printf(m, " fp0:     0x%08x\n", pll->config.hw_state.fp0);
-		seq_printf(m, " fp1:     0x%08x\n", pll->config.hw_state.fp1);
-		seq_printf(m, " wrpll:   0x%08x\n", pll->config.hw_state.wrpll);
+			   pll_config->hw_state.dpll_md);
+		seq_printf(m, " fp0:     0x%08x\n", pll_config->hw_state.fp0);
+		seq_printf(m, " fp1:     0x%08x\n", pll_config->hw_state.fp1);
+		seq_printf(m, " wrpll:   0x%08x\n", pll_config->hw_state.wrpll);
 	}
 	drm_modeset_unlock_all(dev);
 
drivers/gpu/drm/i915/i915_drv.h +2 -2
index 862edc4..132eb7b 100644
@@ -296,8 +296,6 @@ struct intel_shared_dpll_config {
 };
 
 struct intel_shared_dpll {
-	struct intel_shared_dpll_config config;
-
 	int active; /* count of number of active CRTCs (i.e. DPMS on) */
 	bool on; /* is the PLL actually active? Disabled during modeset */
 	const char *name;
@@ -1784,6 +1782,8 @@ struct drm_i915_private {
 	struct intel_pipe_crc pipe_crc[I915_MAX_PIPES];
 #endif
 
+	struct intel_atomic_state *display_state;
+
 	int num_shared_dpll;
 	struct intel_shared_dpll shared_dplls[I915_NUM_PLLS];
 	int dpio_phy_iosf_port[I915_NUM_PHYS_VLV];
drivers/gpu/drm/i915/intel_ddi.c +9 -4
index 1cd541f..ff2197c 100644
@@ -1747,7 +1747,10 @@ int intel_ddi_get_cdclk_freq(struct drm_i915_private *dev_priv)
 static void hsw_ddi_pll_enable(struct drm_i915_private *dev_priv,
 			       struct intel_shared_dpll *pll)
 {
-	I915_WRITE(WRPLL_CTL(pll->id), pll->config.hw_state.wrpll);
+	struct intel_shared_dpll_config *pll_config =
+		&dev_priv->display_state->shared_dpll[pll->id];
+
+	I915_WRITE(WRPLL_CTL(pll->id), pll_config->hw_state.wrpll);
 	POSTING_READ(WRPLL_CTL(pll->id));
 	udelay(20);
 }
@@ -1836,6 +1839,8 @@ static void skl_ddi_pll_enable(struct drm_i915_private *dev_priv,
 	uint32_t val;
 	unsigned int dpll;
 	const struct skl_dpll_regs *regs = skl_dpll_regs;
+	struct intel_shared_dpll_config *pll_config =
+		&dev_priv->display_state->shared_dpll[pll->id];
 
 	/* DPLL0 is not part of the shared DPLLs, so pll->id is 0 for DPLL1 */
 	dpll = pll->id + 1;
@@ -1844,13 +1849,13 @@ static void skl_ddi_pll_enable(struct drm_i915_private *dev_priv,
 
 	val &= ~(DPLL_CTRL1_HDMI_MODE(dpll) | DPLL_CTRL1_SSC(dpll) |
 		 DPLL_CRTL1_LINK_RATE_MASK(dpll));
-	val |= pll->config.hw_state.ctrl1 << (dpll * 6);
+	val |= pll_config->hw_state.ctrl1 << (dpll * 6);
 
 	I915_WRITE(DPLL_CTRL1, val);
 	POSTING_READ(DPLL_CTRL1);
 
-	I915_WRITE(regs[pll->id].cfgcr1, pll->config.hw_state.cfgcr1);
-	I915_WRITE(regs[pll->id].cfgcr2, pll->config.hw_state.cfgcr2);
+	I915_WRITE(regs[pll->id].cfgcr1, pll_config->hw_state.cfgcr1);
+	I915_WRITE(regs[pll->id].cfgcr2, pll_config->hw_state.cfgcr2);
 	POSTING_READ(regs[pll->id].cfgcr1);
 	POSTING_READ(regs[pll->id].cfgcr2);
 
drivers/gpu/drm/i915/intel_display.c +59 -27

222 lines not on this page · raw message

Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

PATCH 4/4 drm/i915: Simplify pll state commit by swapping new and old state

In reply to Ander Conselvan de Oliveira

This deletes some code and is closer to what the logic will look like with atomic mode setting.

---
 drivers/gpu/drm/i915/intel_display.c | 58 ++++++++----------------------------
 1 file changed, 12 insertions(+), 46 deletions(-)
drivers/gpu/drm/i915/intel_display.c +12 -46
index fecffbb..96176c1 100644
@@ -3963,46 +3963,11 @@ found:
 	return pll;
 }
 
-/**
- * intel_shared_dpll_start_config - start a new PLL staged config
- * @dev_priv: DRM device
- * @clear_pipes: mask of pipes that will have their PLLs freed
- *
- * Starts a new PLL staged config, copying the current config but
- * releasing the references of pipes specified in clear_pipes.
- */
-static int intel_shared_dpll_start_config(struct drm_i915_private *dev_priv,
-					  struct intel_atomic_state *state,
-					  unsigned clear_pipes)
-{
-	struct intel_shared_dpll_config *pll_config;
-	enum intel_dpll_id i;
-
-	/* FIXME: convert this to a simple memdup */
-
-	for (i = 0; i < dev_priv->num_shared_dpll; i++) {
-		pll_config = &dev_priv->display_state->shared_dpll[i];
-
-		memcpy(&state->shared_dpll[i], pll_config,
-		       sizeof *pll_config);
-		state->shared_dpll[i].crtc_mask &= ~clear_pipes;
-	}
-
-	return 0;
-}
-
-static void intel_shared_dpll_commit(struct drm_i915_private *dev_priv,
-				     struct intel_atomic_state *state)
+static struct intel_atomic_state *
+intel_atomic_state_duplicate(struct drm_i915_private *dev_priv)
 {
-	struct intel_shared_dpll_config *pll_config;
-	enum intel_dpll_id i;
-
-	/* FIXME: convert this to a poiner swap */
-
-	for (i = 0; i < dev_priv->num_shared_dpll; i++) {
-		pll_config = &dev_priv->display_state->shared_dpll[i];
-		*pll_config = state->shared_dpll[i];
-	}
+	return kmemdup(dev_priv->display_state,
+		       sizeof *dev_priv->display_state, GFP_KERNEL);
 }
 
 static void cpt_verify_modeset(struct drm_device *dev, int pipe)
@@ -10405,14 +10370,15 @@ static bool intel_crtc_in_use(struct drm_crtc *crtc)
 
 static void
 intel_modeset_update_state(struct drm_device *dev, unsigned prepare_pipes,
-			   struct intel_atomic_state *state)
+			   struct intel_atomic_state **state)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	struct intel_encoder *intel_encoder;
 	struct intel_crtc *intel_crtc;
 	struct drm_connector *connector;
 
-	intel_shared_dpll_commit(dev_priv, state);
+	/* Commit PLL and other global state */
+	swap(dev_priv->display_state, *state);
 
 	for_each_intel_encoder(dev, intel_encoder) {
 		if (!intel_encoder->base.crtc)
@@ -11020,13 +10986,13 @@ static int __intel_set_mode_setup_plls(struct drm_device *dev,
 	unsigned clear_pipes = modeset_pipes | disable_pipes;
 	struct intel_crtc *intel_crtc;
 	int ret = 0;
+	int i;
 
 	if (!dev_priv->display.crtc_compute_clock)
 		return 0;
 
-	ret = intel_shared_dpll_start_config(dev_priv, state, clear_pipes);
-	if (ret)
-		return ret;
+	for (i = 0; i < dev_priv->num_shared_dpll; i++)
+		state->shared_dpll[i].crtc_mask &= ~clear_pipes;
 
 	for_each_intel_crtc_masked(dev, modeset_pipes, intel_crtc) {
 		struct intel_crtc_state *crtc_state = intel_crtc->new_config;
@@ -11077,7 +11043,7 @@ static int __intel_set_mode(struct drm_crtc *crtc,
 		prepare_pipes &= ~disable_pipes;
 	}
 
-	state = kzalloc(sizeof *state, GFP_KERNEL);
+	state = intel_atomic_state_duplicate(dev_priv);
 	if (!state) {
 		ret = -ENOMEM;
 		goto done;
@@ -11120,7 +11086,7 @@ static int __intel_set_mode(struct drm_crtc *crtc,
 
 	/* Only after disabling all output pipelines that will be changed can we
 	 * update the the output configuration. */
-	intel_modeset_update_state(dev, prepare_pipes, state);
+	intel_modeset_update_state(dev, prepare_pipes, &state);
 
 	modeset_update_crtc_power_domains(dev);
 
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 4/4
#4 lore raw

Re: [PATCH 4/4] drm/i915: Simplify pll state commit by swapping new and old state

Task id: 5683 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied

PNV                                  353/353              353/353
ILK                                  353/353              353/353
SNB                                  400/422              400/422
IVB              +1                 485/487              486/487
BYT                                  296/296              296/296
HSW              +1-11              404/405              394/405
BDW                 -1              401/402              400/402
-------------------------------------Detailed-------------------------------------
Platform  Test                                drm-intel-nightly          Series Applied
 IVB  igt_gem_storedw_batches_loop_normal      DMESG_WARN(5, M34M4)PASS(15, M34M4M21)      PASS(1, M21)
*HSW  igt_gem_pwrite_pread_display-copy-performance      PASS(5, M40M20)      DMESG_WARN(1, M40)
 HSW  igt_gem_pwrite_pread_snooped-pwrite-blt-cpu_mmap-performance      DMESG_WARN(1, M40)PASS(18, M40M20)      PASS(1, M40)
*HSW  igt_kms_cursor_crc_cursor-size-change      PASS(2, M40)      TIMEOUT(1, M40)
*HSW  igt_kms_fence_pin_leak      PASS(2, M40)      TIMEOUT(1, M40)
*HSW  igt_kms_flip_bo-too-big      PASS(2, M40)      TIMEOUT(1, M40)
*HSW  igt_kms_flip_bo-too-big-interruptible      PASS(2, M40)      CRASH(1, M40)
*HSW  igt_kms_flip_dpms-vs-vblank-race      PASS(2, M40)      TIMEOUT(1, M40)
*HSW  igt_kms_flip_event_leak      PASS(2, M40)      TIMEOUT(1, M40)
*HSW  igt_kms_flip_flip-vs-dpms-off-vs-modeset      PASS(2, M40)      TIMEOUT(1, M40)
*HSW  igt_kms_flip_flip-vs-expired-vblank      PASS(2, M40)      TIMEOUT(1, M40)
*HSW  igt_kms_flip_flip-vs-expired-vblank-interruptible      PASS(2, M40)      CRASH(1, M40)
*HSW  igt_kms_flip_nonexisting-fb      PASS(3, M40M20)      TIMEOUT(1, M40)
*BDW  igt_kms_fence_pin_leak      PASS(2, M30)      TIMEOUT(1, M30)

Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
In reply to Ander Conselvan de Oliveira
Quoted 3 lines · Ander Conselvan de Oliveira

This simplifies __intel_set_mode() a little.

Merged this one here, please sign up Matt or someone else suitable for the in-depth review.
-Daniel

Quoted 79 lines
---
 drivers/gpu/drm/i915/intel_display.c | 50 ++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_display.c +33 -17
index 423ef95..3d220a6 100644
@@ -11021,6 +11021,36 @@ out:
 	return pipe_config;
 }
 
+static int __intel_set_mode_setup_plls(struct drm_device *dev,
+				       unsigned modeset_pipes,
+				       unsigned disable_pipes)
+{
+	struct drm_i915_private *dev_priv = to_i915(dev);
+	unsigned clear_pipes = modeset_pipes | disable_pipes;
+	struct intel_crtc *intel_crtc;
+	int ret = 0;
+
+	if (!dev_priv->display.crtc_compute_clock)
+		return 0;
+
+	ret = intel_shared_dpll_start_config(dev_priv, clear_pipes);
+	if (ret)
+		goto done;
+
+	for_each_intel_crtc_masked(dev, modeset_pipes, intel_crtc) {
+		struct intel_crtc_state *state = intel_crtc->new_config;
+		ret = dev_priv->display.crtc_compute_clock(intel_crtc,
+							   state);
+		if (ret) {
+			intel_shared_dpll_abort_config(dev_priv);
+			goto done;
+		}
+	}
+
+done:
+	return ret;
+}
+
 static int __intel_set_mode(struct drm_crtc *crtc,
 			    struct drm_display_mode *mode,
 			    int x, int y, struct drm_framebuffer *fb,
@@ -11058,23 +11088,9 @@ static int __intel_set_mode(struct drm_crtc *crtc,
 		prepare_pipes &= ~disable_pipes;
 	}
 
-	if (dev_priv->display.crtc_compute_clock) {
-		unsigned clear_pipes = modeset_pipes | disable_pipes;
-
-		ret = intel_shared_dpll_start_config(dev_priv, clear_pipes);
-		if (ret)
-			goto done;
-
-		for_each_intel_crtc_masked(dev, modeset_pipes, intel_crtc) {
-			struct intel_crtc_state *state = intel_crtc->new_config;
-			ret = dev_priv->display.crtc_compute_clock(intel_crtc,
-								   state);
-			if (ret) {
-				intel_shared_dpll_abort_config(dev_priv);
-				goto done;
-			}
-		}
-	}
+	ret = __intel_set_mode_setup_plls(dev, modeset_pipes, disable_pipes);
+	if (ret)
+		goto done;
 
 	for_each_intel_crtc_masked(dev, disable_pipes, intel_crtc)
 		intel_crtc_disable(&intel_crtc->base);
Signature · 6 lines
2.1.0

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx