Skip to contentSkip to conversation

drm/i915: Introduce intel_release_shared_dpll()

PATCH In review Ander Conselvan de Oliveira 3 participants 10 messages May 20, 2016 – May 23, 2016

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

PATCH 1/4 drm/i915: Introduce intel_release_shared_dpll()

While the details of getting a shared dpll are wrapped by intel_get_shared_dpll(), the release was still hand rolled into the modeset code. Fix that by creating an entry point for releasing the pll and move that code there.

---
 drivers/gpu/drm/i915/intel_display.c  | 13 ++--------
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 45 +++++++++++++++++------------------
 drivers/gpu/drm/i915/intel_dpll_mgr.h | 10 ++------
 3 files changed, 26 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -11
index a500f08..fe9b00c 100644
@@ -12419,7 +12419,6 @@ static void intel_modeset_clear_plls(struct drm_atomic_state *state)
 {
 	struct drm_device *dev = state->dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
-	struct intel_shared_dpll_config *shared_dpll = NULL;
 	struct drm_crtc *crtc;
 	struct drm_crtc_state *crtc_state;
 	int i;
@@ -12429,21 +12428,13 @@ static void intel_modeset_clear_plls(struct drm_atomic_state *state)
 
 	for_each_crtc_in_state(state, crtc, crtc_state, i) {
 		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-		struct intel_shared_dpll *old_dpll =
-			to_intel_crtc_state(crtc->state)->shared_dpll;
 
 		if (!needs_modeset(crtc_state))
 			continue;
 
+		intel_release_shared_dpll(intel_crtc,
+					  to_intel_crtc_state(crtc_state));
 		to_intel_crtc_state(crtc_state)->shared_dpll = NULL;
-
-		if (!old_dpll)
-			continue;
-
-		if (!shared_dpll)
-			shared_dpll = intel_atomic_get_shared_dpll_state(state);
-
-		intel_shared_dpll_config_put(shared_dpll, old_dpll, intel_crtc);
 	}
 }
 
drivers/gpu/drm/i915/intel_dpll_mgr.c +22 -23

60 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpll_mgr.h +2 -8
index 89c5ada..b93eed8 100644
@@ -138,14 +138,6 @@ intel_get_shared_dpll_by_id(struct drm_i915_private *dev_priv,
 enum intel_dpll_id
 intel_get_shared_dpll_id(struct drm_i915_private *dev_priv,
 			 struct intel_shared_dpll *pll);
-void
-intel_shared_dpll_config_get(struct intel_shared_dpll_config *config,
-			     struct intel_shared_dpll *pll,
-			     struct intel_crtc *crtc);
-void
-intel_shared_dpll_config_put(struct intel_shared_dpll_config *config,
-			     struct intel_shared_dpll *pll,
-			     struct intel_crtc *crtc);
 void assert_shared_dpll(struct drm_i915_private *dev_priv,
 			struct intel_shared_dpll *pll,
 			bool state);
@@ -154,6 +146,8 @@ void assert_shared_dpll(struct drm_i915_private *dev_priv,
 struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc,
 						struct intel_crtc_state *state,
 						struct intel_encoder *encoder);
+void intel_release_shared_dpll(struct intel_crtc *crtc,
+			       struct intel_crtc_state *crtc_state);
 void intel_prepare_shared_dpll(struct intel_crtc *crtc);
 void intel_enable_shared_dpll(struct intel_crtc *crtc);
 void intel_disable_shared_dpll(struct intel_crtc *crtc);
Signature · 6 lines
2.5.5

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

PATCH 2/4 drm/i915: Rename intel_shared_dpll_commit() to _swap_state()

The function intel_shared_dpll_commit() performs the equivalent of drm_atomic_helper_swap_state() for the shared dpll state, which id not handled by the helpers. So rename it for consistency.

---
 drivers/gpu/drm/i915/intel_display.c  | 2 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index fe9b00c..dbb982aa 100644
@@ -13006,7 +13006,7 @@ static int intel_atomic_commit(struct drm_device *dev,
 	drm_atomic_helper_swap_state(dev, state);
 	dev_priv->wm.distrust_bios_wm = false;
 	dev_priv->wm.skl_results = intel_state->wm_results;
-	intel_shared_dpll_commit(state);
+	intel_shared_dpll_swap_state(state);
 
 	if (intel_state->modeset) {
 		memcpy(dev_priv->min_pixclk, intel_state->min_pixclk,
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
index a3293cf..27bbc46 100644
@@ -228,7 +228,7 @@ intel_reference_shared_dpll(struct intel_shared_dpll *pll,
 	shared_dpll[pll->id].crtc_mask |= 1 << crtc->pipe;
 }
 
-void intel_shared_dpll_commit(struct drm_atomic_state *state)
+void intel_shared_dpll_swap_state(struct drm_atomic_state *state)
 {
 	struct drm_i915_private *dev_priv = to_i915(state->dev);
 	struct intel_shared_dpll_config *shared_dpll;
drivers/gpu/drm/i915/intel_dpll_mgr.h +1 -1
index b93eed8..929ff7d 100644
@@ -151,7 +151,7 @@ void intel_release_shared_dpll(struct intel_crtc *crtc,
 void intel_prepare_shared_dpll(struct intel_crtc *crtc);
 void intel_enable_shared_dpll(struct intel_crtc *crtc);
 void intel_disable_shared_dpll(struct intel_crtc *crtc);
-void intel_shared_dpll_commit(struct drm_atomic_state *state);
+void intel_shared_dpll_swap_state(struct drm_atomic_state *state);
 void intel_shared_dpll_init(struct drm_device *dev);
 
 
Signature · 6 lines
2.5.5

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

Re: [PATCH 2/4] drm/i915: Rename intel_shared_dpll_commit() to _swap_state()

Quoted 11 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ander Conselvan de Oliveira
Sent: Friday, May 20, 2016 8:24 PM
To: [email protected]
Cc: Conselvan De Oliveira, Ander <[email protected]>
Subject: [Intel-gfx] [PATCH 2/4] drm/i915: Rename intel_shared_dpll_commit() to _swap_state()

The function intel_shared_dpll_commit() performs the equivalent of drm_atomic_helper_swap_state() for the shared dpll state, which id not

s/id/is

Quoted 2 lines

handled by the helpers. So rename it for consistency.

Thanks,
Durga

Quoted 54 lines
---
 drivers/gpu/drm/i915/intel_display.c  | 2 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -1
index fe9b00c..dbb982aa 100644
@@ -13006,7 +13006,7 @@ static int intel_atomic_commit(struct drm_device
 *dev,
 	drm_atomic_helper_swap_state(dev, state);
 	dev_priv->wm.distrust_bios_wm = false;
 	dev_priv->wm.skl_results = intel_state->wm_results;
-	intel_shared_dpll_commit(state);
+	intel_shared_dpll_swap_state(state);
 
 	if (intel_state->modeset) {
drivers/gpu/drm/i915/intel_display.c +0 -0
 		memcpy(dev_priv->min_pixclk, intel_state->min_pixclk,
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
index a3293cf..27bbc46 100644
@@ -228,7 +228,7 @@ intel_reference_shared_dpll(struct intel_shared_dpll
 *pll,
 	shared_dpll[pll->id].crtc_mask |= 1 << crtc->pipe;
 }
 
-void intel_shared_dpll_commit(struct drm_atomic_state *state)
+void intel_shared_dpll_swap_state(struct drm_atomic_state *state)
 {
 	struct drm_i915_private *dev_priv = to_i915(state->dev);
drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -0
 	struct intel_shared_dpll_config *shared_dpll;
drivers/gpu/drm/i915/intel_dpll_mgr.h +1 -2
index b93eed8..929ff7d 100644
@@ -151,7 +151,7 @@ void intel_release_shared_dpll(struct intel_crtc *crtc,
 void intel_prepare_shared_dpll(struct intel_crtc *crtc);
 void intel_enable_shared_dpll(struct intel_crtc *crtc);
 void intel_disable_shared_dpll(struct intel_crtc *crtc);
-void intel_shared_dpll_commit(struct drm_atomic_state *state);
+void intel_shared_dpll_swap_state(struct drm_atomic_state *state);
 void intel_shared_dpll_init(struct drm_device *dev);
 
 
--

2.5.5

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

PATCH 3/4 drm/i915: Rename intel_shared_dpll->mode_set() to prepare()

In reply to Ander Conselvan de Oliveira

The hook is called from intel_prepare_shared_dpll(). The name doesn't make sense after all the changes to modeset code. So just call it prepare.

---
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 8 ++++----
 drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +4 -4
index 27bbc46..26c9955 100644
@@ -74,7 +74,7 @@ void intel_prepare_shared_dpll(struct intel_crtc *crtc)
 		WARN_ON(pll->on);
 		assert_shared_dpll_disabled(dev_priv, pll);
 
-		pll->funcs.mode_set(dev_priv, pll);
+		pll->funcs.prepare(dev_priv, pll);
 	}
 	mutex_unlock(&dev_priv->dpll_lock);
 }
@@ -264,8 +264,8 @@ static bool ibx_pch_dpll_get_hw_state(struct drm_i915_private *dev_priv,
 	return val & DPLL_VCO_ENABLE;
 }
 
-static void ibx_pch_dpll_mode_set(struct drm_i915_private *dev_priv,
-				  struct intel_shared_dpll *pll)
+static void ibx_pch_dpll_prepare(struct drm_i915_private *dev_priv,
+				 struct intel_shared_dpll *pll)
 {
 	I915_WRITE(PCH_FP0(pll->id), pll->config.hw_state.fp0);
 	I915_WRITE(PCH_FP1(pll->id), pll->config.hw_state.fp1);
@@ -354,7 +354,7 @@ ibx_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,
 }
 
 static const struct intel_shared_dpll_funcs ibx_pch_dpll_funcs = {
-	.mode_set = ibx_pch_dpll_mode_set,
+	.prepare = ibx_pch_dpll_prepare,
 	.enable = ibx_pch_dpll_enable,
 	.disable = ibx_pch_dpll_disable,
 	.get_hw_state = ibx_pch_dpll_get_hw_state,
drivers/gpu/drm/i915/intel_dpll_mgr.h +1 -1
index 929ff7d..087e6b1 100644
@@ -101,7 +101,7 @@ struct intel_shared_dpll_config {
 struct intel_shared_dpll_funcs {
 	/* The mode_set hook is optional and should be used together with the
 	 * intel_prepare_shared_dpll function. */
-	void (*mode_set)(struct drm_i915_private *dev_priv,
+	void (*prepare)(struct drm_i915_private *dev_priv,
 			 struct intel_shared_dpll *pll);
 	void (*enable)(struct drm_i915_private *dev_priv,
 		       struct intel_shared_dpll *pll);
Signature · 6 lines
2.5.5

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

Re: [PATCH 3/4] drm/i915: Rename intel_shared_dpll->mode_set() to prepare()

Quoted 9 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ander Conselvan de Oliveira
Sent: Friday, May 20, 2016 8:24 PM
To: [email protected]
Cc: Conselvan De Oliveira, Ander <[email protected]>
Subject: [Intel-gfx] [PATCH 3/4] drm/i915: Rename intel_shared_dpll-

Quoted 6 lines
Quoted 1 line

mode_set() to prepare()

The hook is called from intel_prepare_shared_dpll(). The name doesn't make sense after all the changes to modeset code. So just call it prepare.

Makes sense,

Thanks,
Durga

Quoted 60 lines
---
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 8 ++++----
 drivers/gpu/drm/i915/intel_dpll_mgr.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +3 -3
index 27bbc46..26c9955 100644
@@ -74,7 +74,7 @@ void intel_prepare_shared_dpll(struct intel_crtc *crtc)
 		WARN_ON(pll->on);
 		assert_shared_dpll_disabled(dev_priv, pll);
 
-		pll->funcs.mode_set(dev_priv, pll);
+		pll->funcs.prepare(dev_priv, pll);
 	}
 	mutex_unlock(&dev_priv->dpll_lock);
 }
@@ -264,8 +264,8 @@ static bool ibx_pch_dpll_get_hw_state(struct
 drm_i915_private *dev_priv,
 	return val & DPLL_VCO_ENABLE;
 }
 
-static void ibx_pch_dpll_mode_set(struct drm_i915_private *dev_priv,
-				  struct intel_shared_dpll *pll)
+static void ibx_pch_dpll_prepare(struct drm_i915_private *dev_priv,
+				 struct intel_shared_dpll *pll)
 {
 	I915_WRITE(PCH_FP0(pll->id), pll->config.hw_state.fp0);
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
 	I915_WRITE(PCH_FP1(pll->id), pll->config.hw_state.fp1);
@@ -354,7 +354,7 @@ ibx_get_dpll(struct intel_crtc *crtc, struct
 intel_crtc_state *crtc_state,
 }
 
 static const struct intel_shared_dpll_funcs ibx_pch_dpll_funcs = {
-	.mode_set = ibx_pch_dpll_mode_set,
+	.prepare = ibx_pch_dpll_prepare,
 	.enable = ibx_pch_dpll_enable,
 	.disable = ibx_pch_dpll_disable,
drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -0
 	.get_hw_state = ibx_pch_dpll_get_hw_state,
drivers/gpu/drm/i915/intel_dpll_mgr.h +0 -0
index 929ff7d..087e6b1 100644
@@ -101,7 +101,7 @@ struct intel_shared_dpll_config {
 struct intel_shared_dpll_funcs {
 	/* The mode_set hook is optional and should be used together with

the

drivers/gpu/drm/i915/intel_dpll_mgr.h +1 -2
 	 * intel_prepare_shared_dpll function. */
-	void (*mode_set)(struct drm_i915_private *dev_priv,
+	void (*prepare)(struct drm_i915_private *dev_priv,
 			 struct intel_shared_dpll *pll);
 	void (*enable)(struct drm_i915_private *dev_priv,
 		       struct intel_shared_dpll *pll);
--

2.5.5

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw

PATCH 4/4 drm/i915: Update kerneldoc for intel_dpll_mgr.c

In reply to Ander Conselvan de Oliveira

The documentation for most of the non-static members and structs were missing. Fix that.

---
 Documentation/DocBook/gpu.tmpl        |  7 +++
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 88 +++++++++++++++++++++++++++++++++--
 drivers/gpu/drm/i915/intel_dpll_mgr.h | 83 +++++++++++++++++++++++++++++----
 3 files changed, 163 insertions(+), 15 deletions(-)
Documentation/DocBook/gpu.tmpl +7 -0
index 7586bf75..b96875d 100644
@@ -3355,6 +3355,13 @@ int num_ioctls;</synopsis>
 !Idrivers/gpu/drm/i915/intel_bios.c
 !Idrivers/gpu/drm/i915/intel_vbt_defs.h
       </sect2>
+
+      <sect2>
+	<title>Display PLLs</title>
+!Pdrivers/gpu/drm/i915/intel_dpll_mgr.c Display PLLs
+!Idrivers/gpu/drm/i915/intel_dpll_mgr.c
+!Idrivers/gpu/drm/i915/intel_dpll_mgr.h
+      </sect2>
     </sect1>
 
     <sect1>
drivers/gpu/drm/i915/intel_dpll_mgr.c +83 -5

143 lines not on this page · raw message

drivers/gpu/drm/i915/intel_dpll_mgr.h +73 -10

124 lines not on this page · raw message

Signature · 6 lines
2.5.5

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

Re: [PATCH 4/4] drm/i915: Update kerneldoc for intel_dpll_mgr.c

Quoted 71 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ander Conselvan de Oliveira
Sent: Friday, May 20, 2016 8:24 PM
To: [email protected]
Cc: Conselvan De Oliveira, Ander <[email protected]>
Subject: [Intel-gfx] [PATCH 4/4] drm/i915: Update kerneldoc for intel_dpll_mgr.c

The documentation for most of the non-static members and structs were missing. Fix that.

Cc: Daniel Vetter <[email protected]>
Signed-off-by: Ander Conselvan de Oliveira
<[email protected]>

---
 Documentation/DocBook/gpu.tmpl        |  7 +++
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 88
+++++++++++++++++++++++++++++++++--
 drivers/gpu/drm/i915/intel_dpll_mgr.h | 83
+++++++++++++++++++++++++++++----
 3 files changed, 163 insertions(+), 15 deletions(-)
Documentation/DocBook/gpu.tmpl +7 -0
index 7586bf75..b96875d 100644
@@ -3355,6 +3355,13 @@ int num_ioctls;</synopsis>
 !Idrivers/gpu/drm/i915/intel_bios.c
 !Idrivers/gpu/drm/i915/intel_vbt_defs.h
       </sect2>
+
+      <sect2>
+	<title>Display PLLs</title>
+!Pdrivers/gpu/drm/i915/intel_dpll_mgr.c Display PLLs
+!Idrivers/gpu/drm/i915/intel_dpll_mgr.c
+!Idrivers/gpu/drm/i915/intel_dpll_mgr.h
+      </sect2>
     </sect1>
 
     <sect1>
drivers/gpu/drm/i915/intel_dpll_mgr.c +12 -0
index 26c9955..bcfe7a9 100644
@@ -23,6 +23,33 @@
 
 #include "intel_drv.h"
 
+/**
+ * DOC: Display PLLs
+ *
+ * Display PLLs used for driving outputs vary by platform. While some have
+ * per-pipe or per-encoder dedicated PLLs, others allow the use of any PLL
+ * from a pool. In the latter scenario, it is possible that multiple pipes
+ * share a PLL if their configurations match.
+ *
+ * This file provides an abstraction over display PLLs. The function
+ * intel_shared_dpll_init() initializes the PLLs for the given platform.  The
+ * users of a PLL are tracked and that tracking is integrated with the atomic
+ * modest interface. During an atomic operation, a PLL can be requested for

a
+ * given crtc and encoder configuration by calling intel_get_shared_dpll() and
+ * a previously used PLL can be released with intel_release_shared_dpll().
+ * Changes to the users are first staged in the atomic state, and then made
+ * effective by calling intel_shared_dpll_swap_state() during the atomic
+ * commit phase.
+ */

drivers/gpu/drm/i915/intel_dpll_mgr.c line 51

Quoted 8 lines
drivers/gpu/drm/i915/intel_dpll_mgr.c +8 -0
+
+/**
+ * intel_get_shared_dpll_by_id - get a DPLL given its id
+ * @dev_priv: i915 device instance
+ * @id: pll id
+ *
+ * Returns:
+ * A pointer the DPLL with @id

A pointer 'to' the DPLL...

Quoted 72 lines

+ */
struct intel_shared_dpll * intel_get_shared_dpll_by_id(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/intel_dpll_mgr.c +8 -0
 			    enum intel_dpll_id id)
@@ -30,6 +57,14 @@ intel_get_shared_dpll_by_id(struct drm_i915_private
 *dev_priv,
 	return &dev_priv->shared_dplls[id];
 }
 
+/**
+ * intel_get_shared_dpll_id - get the id of a DPLL
+ * @dev_priv: i915 device instance
+ * @pll: the DPLL
+ *
+ * Returns:
+ * The id of @pll
+ */
 enum intel_dpll_id
 intel_get_shared_dpll_id(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_dpll_mgr.c +7 -0
 			 struct intel_shared_dpll *pll)
@@ -58,6 +93,13 @@ void assert_shared_dpll(struct drm_i915_private
 *dev_priv,
 			pll->name, onoff(state), onoff(cur_state));
 }
 
+/**
+ * intel_prepare_shared_dpll - call a dpll's prepare hook
+ * @crtc: crtc which has a shared dpll
+ *
+ * This calls the PLL's prepare hook if it has one and if the PLL is not
+ * already enabled. The prepare hook is platform specific.
+ */
 void intel_prepare_shared_dpll(struct intel_crtc *crtc)
 {
drivers/gpu/drm/i915/intel_dpll_mgr.c +3 -5
 	struct drm_device *dev = crtc->base.dev;
@@ -80,12 +122,10 @@ void intel_prepare_shared_dpll(struct intel_crtc
 *crtc)
 }
 
 /**
- * intel_enable_shared_dpll - enable PCH PLL
- * @dev_priv: i915 private structure
- * @pipe: pipe PLL to enable
+ * intel_enable_shared_dpll - enable a crtc's shared DPLL
+ * @crtc: crtc which has a shared DPLL
  *
- * The PCH PLL needs to be enabled before the PCH transcoder, since it
- * drives the transcoder clock.
+ * Enable the shared DPLL used by @crtc.
  */
 void intel_enable_shared_dpll(struct intel_crtc *crtc)

{

drivers/gpu/drm/i915/intel_dpll_mgr.c +8 -0
@@ -126,6 +166,12 @@ out:
 	mutex_unlock(&dev_priv->dpll_lock);
 }
 
+/**
+ * intel_disable_shared_dpll - disable a crtc's shared DPLL
+ * @crtc: crtc which has a shared DPLL
+ *
+ * Disable the shared DPLL used by @crtc.
+ */
 void intel_disable_shared_dpll(struct intel_crtc *crtc)
 {
 	struct drm_device *dev = crtc->base.dev;
@@ -228,6 +274,16 @@ intel_reference_shared_dpll(struct
 intel_shared_dpll *pll,
 	shared_dpll[pll->id].crtc_mask |= 1 << crtc->pipe;
 }
 
+/**
+ * intel_shared_dpll_swap_state - make atomic DPLL configuration
Quoted 7 lines

effective
+ * @state: atomic state
+ *
+ * This is the dpll version of drm_atomic_helper_swap_state() since the
+ * helper does not handle driver-specific global state.
+ *
+ * Note thar this doesn't actually swap states, the dpll configutation in

s/thar/that

Thanks,
Durga

Quoted 189 lines

+ * @state is left unchanged.
+ */
void intel_shared_dpll_swap_state(struct drm_atomic_state *state) {

drivers/gpu/drm/i915/intel_dpll_mgr.c +8 -0
 	struct drm_i915_private *dev_priv = to_i915(state->dev);
@@ -1706,6 +1762,12 @@ static const struct intel_dpll_mgr bxt_pll_mgr = {
 	.get_dpll = bxt_get_dpll,
 };
 
+/**
+ * intel_shared_dpll_init - Initialize shared DPLLs
+ * @dev: drm device
+ *
+ * Initialize shared DPLLs for @dev.
+ */
 void intel_shared_dpll_init(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -1749,6 +1811,20 @@ void intel_shared_dpll_init(struct drm_device
 *dev)
 		intel_ddi_pll_init(dev);
 }
 
+/**
+ * intel_get_shared_dpll - get a shared DPLL for crtc and encoder

combination
+ * @crtc: crtc
+ * @crtc_state: atomic state for @crtc
+ * @encoder: encoder
+ *
+ * Find an appropriate DPLL for the given crtc and encoder combination. A
+ * reference from the @crtc to the returned pll is registered in the atomic
+ * state. That configuration is made effective by FIXME name. The reference
+ * should be released by calling intel_release_shared_dpll().
+ *
+ * Returns:
+ * A shared DPLL to be used by @crtc and @encoder with the given @crtc_state.
+ */
struct intel_shared_dpll *
intel_get_shared_dpll(struct intel_crtc *crtc,

drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -0
 		      struct intel_crtc_state *crtc_state,
@@ -1768,6 +1844,8 @@ intel_get_shared_dpll(struct intel_crtc *crtc,
  * @crtc: crtc
  * @crtc_state: atomic stat for @crtc
  *
+ * This function releases the reference from @crtc to its shared dpll from

the
+ * atomic state. The new configuration is made effective by FIXME name. */
void intel_release_shared_dpll(struct intel_crtc *crtc,

drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -0
 			       struct intel_crtc_state *crtc_state)
drivers/gpu/drm/i915/intel_dpll_mgr.h +6 -6
index 087e6b1..6032bda 100644
@@ -40,6 +40,9 @@ struct intel_encoder;
 struct intel_shared_dpll;
 struct intel_dpll_mgr;
 
+/**
+ * enum intel_dpll_id - possible DPLL ids
+ */
 enum intel_dpll_id {
 	DPLL_ID_PRIVATE = -1, /* non-shared dpll in use */
 	/* real shared dpll ids must be >= 0 */
@@ -61,11 +64,6 @@ enum intel_dpll_id {
 };
 #define I915_NUM_PLLS 6
 
-/** Inform the state checker that the DPLL is kept enabled even if not
- * in use by any crtc.
- */
-#define INTEL_DPLL_ALWAYS_ON	(1 << 0)
-
 struct intel_dpll_hw_state {
 	/* i9xx, pch plls */
 	uint32_t dpll;
@@ -98,34 +96,99 @@ struct intel_shared_dpll_config {
 	struct intel_dpll_hw_state hw_state;
 };
 
+/**
+ * intel_shared_dpll_funcs - platform specific hooks for managing DPLLs
+ */
 struct intel_shared_dpll_funcs {
-	/* The mode_set hook is optional and should be used together with

the

drivers/gpu/drm/i915/intel_dpll_mgr.h +67 -5
-	 * intel_prepare_shared_dpll function. */
+	/**
+	 * @prepare:
+	 *
+	 * Optional hook to perform operations prior to enabling the PLL.
+	 * Called from intel_prepare_shared_dpll() function.
+	 */
 	void (*prepare)(struct drm_i915_private *dev_priv,
 			 struct intel_shared_dpll *pll);
+
+	/**
+	 * @enable:
+	 *
+	 * Hook for enabling the pll, called from intel_enable_shared_dpll()
+	 * if the pll is not already enabled.
+	 */
 	void (*enable)(struct drm_i915_private *dev_priv,
 		       struct intel_shared_dpll *pll);
+
+	/**
+	 * @disable:
+	 *
+	 * Hook for disabling the pll, called from intel_disable_shared_dpll()
+	 * only when it is safe to disable the pll, i.e., there are no more
+	 * tracked users for it.
+	 */
 	void (*disable)(struct drm_i915_private *dev_priv,
 			struct intel_shared_dpll *pll);
+
+	/**
+	 * @get_hw_state
+	 *
+	 * Hook for reading the values currently programmed to the DPLL
+	 * registers. This is used for initial hw state readout and state
+	 * verification after a mode set.
+	 */
 	bool (*get_hw_state)(struct drm_i915_private *dev_priv,
 			     struct intel_shared_dpll *pll,
 			     struct intel_dpll_hw_state *hw_state);
 };
 
+/**
+ * struct intel_shared_dpll - display PLL with tracked state and users
+ */
 struct intel_shared_dpll {
 	struct intel_shared_dpll_config config;
 
-	unsigned active_mask; /* mask of active CRTCs (i.e. DPMS on) */
-	bool on; /* is the PLL actually active? Disabled during modeset */
+	/**
+	 * @active_mask: mask of active CRTCs (i.e. DPMS on)
+	 */
+	unsigned active_mask;
+
+	/**
+	 * @on: is the PLL actually active? Disabled during modeset
+	 */
+	bool on;
+
+	/**
+	 * @name: DPLL name; used for logging
+	 */
 	const char *name;
-	/* should match the index in the dev_priv->shared_dplls array */
+
+	/**
+	 * @id: unique indentifier for this DPLL; should match the index in the
+	 * dev_priv->shared_dplls array
+	 */
 	enum intel_dpll_id id;
 
+	/**
+	 * @funcs: platform specific hooks
+	 */
 	struct intel_shared_dpll_funcs funcs;
 
+	/**
+	 * @flags:
+	 *
+	 * accepted flags: INTEL_DPLL_ALWAYS_ON
+	 */
 	uint32_t flags;
 };
 
+/**
+ * INTEL_DPLL_ALWAYS_ON
+ *
+ * Inform the state checker that the DPLL is kept enabled even if not
+ * in use by any crtc.
+ */
+#define INTEL_DPLL_ALWAYS_ON	(1 << 0)
+
+
 #define SKL_DPLL0 0
 #define SKL_DPLL1 1
 #define SKL_DPLL2 2
--

2.5.5

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#7 lore raw

✗ Ro.CI.BAT: failure for series starting with [1/4] drm/i915: Introduce intel_release_shared_dpll()

In reply to Ander Conselvan de Oliveira
== Series Details ==

== Series Details ==

Series: series starting with [1/4] drm/i915: Introduce intel_release_shared_dpll()
URL : https://patchwork.freedesktop.org/series/7467/
State : failure

== Summary ==

Series 7467v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/7467/revisions/1/mbox

Test drv_module_reload_basic:

                pass       -> DMESG-WARN (ro-ilk1-i5-650)
Test gem_exec_flush:
        Subgroup basic-batch-kernel-default-cmd:
                pass       -> FAIL       (fi-byt-n2820)
Test kms_force_connector_basic:
        Subgroup force-load-detect:
                pass       -> DMESG-WARN (ro-ilk1-i5-650)
Test kms_frontbuffer_tracking:
        Subgroup basic:
                fail       -> PASS       (ro-bdw-i7-5600u)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-a:
                pass       -> INCOMPLETE (fi-hsw-i7-4770k)
fi-bdw-i7-5557u  total:217  pass:204  dwarn:0   dfail:0   fail:0   skip:13 
fi-byt-n2820     total:216  pass:172  dwarn:0   dfail:0   fail:3   skip:41 
fi-hsw-i7-4770k  total:192  pass:171  dwarn:0   dfail:0   fail:0   skip:20 
fi-hsw-i7-4770r  total:217  pass:191  dwarn:0   dfail:0   fail:0   skip:26 
fi-skl-i7-6700k  total:217  pass:189  dwarn:0   dfail:0   fail:0   skip:28 
ro-bdw-i5-5250u  total:209  pass:171  dwarn:0   dfail:0   fail:0   skip:38 
ro-bdw-i7-5557U  total:209  pass:196  dwarn:0   dfail:0   fail:0   skip:13 
ro-bdw-i7-5600u  total:209  pass:180  dwarn:0   dfail:0   fail:0   skip:29 
ro-bsw-n3050     total:209  pass:167  dwarn:0   dfail:0   fail:2   skip:40 
ro-byt-n2820     total:209  pass:168  dwarn:0   dfail:0   fail:3   skip:38 
ro-hsw-i3-4010u  total:209  pass:186  dwarn:0   dfail:0   fail:0   skip:23 
ro-hsw-i7-4770r  total:209  pass:185  dwarn:0   dfail:0   fail:0   skip:24 
ro-ilk-i7-620lm  total:209  pass:145  dwarn:0   dfail:0   fail:1   skip:63 
ro-ilk1-i5-650   total:204  pass:144  dwarn:2   dfail:0   fail:1   skip:57 
ro-ivb-i7-3770   total:209  pass:176  dwarn:0   dfail:0   fail:0   skip:33 
ro-ivb2-i7-3770  total:209  pass:180  dwarn:0   dfail:0   fail:0   skip:29 
ro-skl-i7-6700hq total:204  pass:182  dwarn:0   dfail:0   fail:0   skip:22 
ro-snb-i7-2620M  total:209  pass:170  dwarn:0   dfail:0   fail:1   skip:38 

fi-bsw-n3050 failed to connect after reboot

Results at /archive/results/CI_IGT_test/RO_Patchwork_952/

f1eaed1 drm-intel-nightly: 2016y-05m-20d-14h-35m-29s UTC integration manifest c1979b0 drm/i915: Update kerneldoc for intel_dpll_mgr.c
9898545 drm/i915: Rename intel_shared_dpll->mode_set() to prepare() ba5fc89 drm/i915: Rename intel_shared_dpll_commit() to _swap_state() 23c857c drm/i915: Introduce intel_release_shared_dpll()

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on v1 1/4
#8 lore raw
In reply to Ander Conselvan de Oliveira
Quoted 9 lines

-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Ander Conselvan de Oliveira
Sent: Friday, May 20, 2016 8:24 PM
To: [email protected]
Cc: Conselvan De Oliveira, Ander <[email protected]>
Subject: [Intel-gfx] [PATCH 1/4] drm/i915: Introduce intel_release_shared_dpll()

Quoted 5 lines

While the details of getting a shared dpll are wrapped by intel_get_shared_dpll(), the release was still hand rolled into the modeset code. Fix that by creating an entry point for releasing the pll and move that code there.

Thanks,
Durga

Quoted 156 lines
---
 drivers/gpu/drm/i915/intel_display.c  | 13 ++--------
 drivers/gpu/drm/i915/intel_dpll_mgr.c | 45 +++++++++++++++++------------
------
 drivers/gpu/drm/i915/intel_dpll_mgr.h | 10 ++------
 3 files changed, 26 insertions(+), 42 deletions(-)
drivers/gpu/drm/i915/intel_display.c +0 -1
index a500f08..fe9b00c 100644
@@ -12419,7 +12419,6 @@ static void intel_modeset_clear_plls(struct
 drm_atomic_state *state)
 {
 	struct drm_device *dev = state->dev;
 	struct drm_i915_private *dev_priv = to_i915(dev);
-	struct intel_shared_dpll_config *shared_dpll = NULL;
 	struct drm_crtc *crtc;
 	struct drm_crtc_state *crtc_state;
drivers/gpu/drm/i915/intel_display.c +2 -10
 	int i;
@@ -12429,21 +12428,13 @@ static void intel_modeset_clear_plls(struct
 drm_atomic_state *state)
 
 	for_each_crtc_in_state(state, crtc, crtc_state, i) {
 		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-		struct intel_shared_dpll *old_dpll =
-			to_intel_crtc_state(crtc->state)->shared_dpll;
 
 		if (!needs_modeset(crtc_state))
 			continue;
 
+		intel_release_shared_dpll(intel_crtc,
+					  to_intel_crtc_state(crtc_state));
 		to_intel_crtc_state(crtc_state)->shared_dpll = NULL;
-
-		if (!old_dpll)
-			continue;
-
-		if (!shared_dpll)
-			shared_dpll =
 intel_atomic_get_shared_dpll_state(state);
-
-		intel_shared_dpll_config_put(shared_dpll, old_dpll,
 intel_crtc);
drivers/gpu/drm/i915/intel_display.c +0 -0
 	}
 }
drivers/gpu/drm/i915/intel_dpll_mgr.c +0 -22
index 0aac3ec..a3293cf 100644
@@ -41,28 +41,6 @@ intel_get_shared_dpll_id(struct drm_i915_private
 *dev_priv,
 	return (enum intel_dpll_id) (pll - dev_priv->shared_dplls);
 }
 
-void
-intel_shared_dpll_config_get(struct intel_shared_dpll_config *config,
-			     struct intel_shared_dpll *pll,
-			     struct intel_crtc *crtc)
-{
-	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-	enum intel_dpll_id id = intel_get_shared_dpll_id(dev_priv, pll);
-
-	config[id].crtc_mask |= 1 << crtc->pipe;
-}
-
-void
-intel_shared_dpll_config_put(struct intel_shared_dpll_config *config,
-			     struct intel_shared_dpll *pll,
-			     struct intel_crtc *crtc)
-{
-	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-	enum intel_dpll_id id = intel_get_shared_dpll_id(dev_priv, pll);
-
-	config[id].crtc_mask &= ~(1 << crtc->pipe);
-}
-
 /* For ILK+ */
 void assert_shared_dpll(struct drm_i915_private *dev_priv,
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
 			struct intel_shared_dpll *pll,
@@ -247,7 +225,7 @@ intel_reference_shared_dpll(struct intel_shared_dpll
 *pll,
 	DRM_DEBUG_DRIVER("using %s for pipe %c\n", pll->name,
 			 pipe_name(crtc->pipe));
 
-	intel_shared_dpll_config_get(shared_dpll, pll, crtc);
+	shared_dpll[pll->id].crtc_mask |= 1 << crtc->pipe;
 }
 

void intel_shared_dpll_commit(struct drm_atomic_state *state)

drivers/gpu/drm/i915/intel_dpll_mgr.c +3 -0
@@ -1784,3 +1762,24 @@ intel_get_shared_dpll(struct intel_crtc *crtc,
 
 	return dpll_mgr->get_dpll(crtc, crtc_state, encoder);
 }
+
+/**
+ * intel_release_shared_dpll - releases a shared DPLL from a crtc atomic

state
+ * @crtc: crtc
+ * @crtc_state: atomic stat for @crtc
+ *
+ */

drivers/gpu/drm/i915/intel_dpll_mgr.c +11 -0
+void intel_release_shared_dpll(struct intel_crtc *crtc,
+			       struct intel_crtc_state *crtc_state)
+{
+	struct intel_shared_dpll_config *shared_dpll_config;
+	struct intel_shared_dpll *dpll = crtc_state->shared_dpll;
+
+	if (!dpll)
+		return;
+
+	shared_dpll_config =
+		intel_atomic_get_shared_dpll_state(crtc_state-
Quoted 1 line

base.state);

drivers/gpu/drm/i915/intel_dpll_mgr.c +3 -0
+
+	shared_dpll_config[dpll->id].crtc_mask &= ~(1 << crtc->pipe);
+}
drivers/gpu/drm/i915/intel_dpll_mgr.h +0 -8
index 89c5ada..b93eed8 100644
@@ -138,14 +138,6 @@ intel_get_shared_dpll_by_id(struct
 drm_i915_private *dev_priv,
 enum intel_dpll_id
 intel_get_shared_dpll_id(struct drm_i915_private *dev_priv,
 			 struct intel_shared_dpll *pll);
-void
-intel_shared_dpll_config_get(struct intel_shared_dpll_config *config,
-			     struct intel_shared_dpll *pll,
-			     struct intel_crtc *crtc);
-void
-intel_shared_dpll_config_put(struct intel_shared_dpll_config *config,
-			     struct intel_shared_dpll *pll,
-			     struct intel_crtc *crtc);
 void assert_shared_dpll(struct drm_i915_private *dev_priv,
 			struct intel_shared_dpll *pll,
drivers/gpu/drm/i915/intel_dpll_mgr.h +2 -0
 			bool state);
@@ -154,6 +146,8 @@ void assert_shared_dpll(struct drm_i915_private
 *dev_priv,
 struct intel_shared_dpll *intel_get_shared_dpll(struct intel_crtc *crtc,
 						struct intel_crtc_state *state,
 						struct intel_encoder
 *encoder);
+void intel_release_shared_dpll(struct intel_crtc *crtc,
+			       struct intel_crtc_state *crtc_state);
 void intel_prepare_shared_dpll(struct intel_crtc *crtc);

void intel_enable_shared_dpll(struct intel_crtc *crtc); void intel_disable_shared_dpll(struct intel_crtc *crtc);
--
2.5.5

Quoted 4 lines

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#9 lore raw

✗ Ro.CI.BAT: failure for series starting with [1/4] drm/i915: Introduce intel_release_shared_dpll()

In reply to Ander Conselvan de Oliveira
== Series Details ==

== Series Details ==

Series: series starting with [1/4] drm/i915: Introduce intel_release_shared_dpll()
URL : https://patchwork.freedesktop.org/series/7467/
State : failure

== Summary ==

Series 7467v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/7467/revisions/1/mbox

Test drv_module_reload_basic:

                pass       -> DMESG-WARN (ro-ilk1-i5-650)
Test kms_flip:
        Subgroup basic-flip-vs-wf_vblank:
                pass       -> FAIL       (ro-ivb-i7-3770)
Test kms_force_connector_basic:
        Subgroup force-load-detect:
                pass       -> DMESG-WARN (ro-ilk1-i5-650)
fi-bdw-i7-5557u  total:209  pass:197  dwarn:0   dfail:0   fail:0   skip:12 
fi-hsw-i7-4770r  total:209  pass:186  dwarn:0   dfail:0   fail:0   skip:23 
fi-skl-i7-6700k  total:209  pass:182  dwarn:2   dfail:0   fail:0   skip:25 
ro-bdw-i5-5250u  total:209  pass:172  dwarn:0   dfail:0   fail:0   skip:37 
ro-bdw-i7-5557U  total:209  pass:197  dwarn:0   dfail:0   fail:0   skip:12 
ro-bdw-i7-5600u  total:209  pass:180  dwarn:0   dfail:0   fail:1   skip:28 
ro-bsw-n3050     total:209  pass:168  dwarn:0   dfail:0   fail:2   skip:39 
ro-byt-n2820     total:209  pass:169  dwarn:0   dfail:0   fail:3   skip:37 
ro-hsw-i3-4010u  total:209  pass:186  dwarn:0   dfail:0   fail:0   skip:23 
ro-hsw-i7-4770r  total:209  pass:186  dwarn:0   dfail:0   fail:0   skip:23 
ro-ilk-i7-620lm  total:209  pass:146  dwarn:0   dfail:0   fail:1   skip:62 
ro-ilk1-i5-650   total:204  pass:144  dwarn:2   dfail:0   fail:1   skip:57 
ro-ivb-i7-3770   total:209  pass:176  dwarn:0   dfail:0   fail:1   skip:32 
ro-ivb2-i7-3770  total:209  pass:181  dwarn:0   dfail:0   fail:0   skip:28 
ro-skl-i7-6700hq total:204  pass:181  dwarn:2   dfail:0   fail:0   skip:21 
ro-snb-i7-2620M  total:209  pass:170  dwarn:0   dfail:0   fail:1   skip:38 

fi-bsw-n3050 failed to connect after reboot
fi-byt-n2820 failed to connect after reboot
fi-hsw-i7-4770k failed to connect after reboot
fi-skl-i5-6260u failed to connect after reboot
fi-snb-i7-2600 failed to connect after reboot

Results at /archive/results/CI_IGT_test/RO_Patchwork_980/

facf329 drm-intel-nightly: 2016y-05m-23d-15h-31m-43s UTC integration manifest 44e119e drm/i915: Update kerneldoc for intel_dpll_mgr.c
8d57ff3 drm/i915: Rename intel_shared_dpll->mode_set() to prepare() 0c0c2bb drm/i915: Rename intel_shared_dpll_commit() to _swap_state() 2730a6a drm/i915: Introduce intel_release_shared_dpll()

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx