Skip to contentSkip to conversation

drm/i915: Fix bug while calculating the clock value using do_div in ironlake_crtc_clock_get

PATCH In review Furquan Shaikh 3 participants 4 messages Aug 20, 2013

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

PATCH 1/2 drm/i915: Fix bug while calculating the clock value using do_div in ironlake_crtc_clock_get

We need to round up the values since the comparison in drm_mode_equal might fail if division results in fractional part

---
 drivers/gpu/drm/i915/intel_display.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_display.c +5 -1
index 0f40f8e..e0069f4 100644
@@ -7190,7 +7190,11 @@ static void ironlake_crtc_clock_get(struct intel_crtc *crtc,
 		return;
 
 	clock = ((u64)link_m * (u64)link_freq * (u64)repeat);
-	do_div(clock, link_n);
+	/* This is required because the value comes out to be in fraction
+	   (eg. 70699.54). Need to round it up since values are compared in
+	   drm_mode_equal
+	*/
+	clock = DIV_ROUND_UP_ULL(clock, link_n);
 
 	pipe_config->adjusted_mode.clock = clock;
 }
Signature · 1 line
1.8.3
#1 lore raw

PATCH 2/2 drm/i915: add fast boot support for Haswell

Enables getting correct mode clock when reading pipe config This patch has been tested successfully on top of drm-intel-nightly tree

---
 drivers/gpu/drm/i915/i915_reg.h      |  6 ++++
 drivers/gpu/drm/i915/intel_ddi.c     | 70 ++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_display.c |  1 +
 3 files changed, 77 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +6 -0
index 2b96d6b..9511129 100644
@@ -4970,6 +4970,7 @@
 #define  SPLL_PLL_NON_SSC		(2<<28)
 #define  SPLL_PLL_FREQ_810MHz		(0<<26)
 #define  SPLL_PLL_FREQ_1350MHz		(1<<26)
+#define  SPLL_PLL_FREQ_MASK             (3<<26)
 
 /* WRPLL */
 #define WRPLL_CTL1			0x46040
@@ -4983,6 +4984,10 @@
 #define  WRPLL_DIVIDER_POST(x)		((x)<<8)
 #define  WRPLL_DIVIDER_FEEDBACK(x)	((x)<<16)
 
+#define WRPLL_DIVIDER_REFERENCE_BITS(reg)    (reg & 0xff)
+#define WRPLL_DIVIDER_POST_BITS(reg)         ((reg >> 8) & 0x3f)
+#define WRPLL_DIVIDER_FEEDBACK_BITS(reg)     ((reg >> 16) & 0xff)
+
 /* Port clock selection */
 #define PORT_CLK_SEL_A			0x46100
 #define PORT_CLK_SEL_B			0x46104
@@ -4994,6 +4999,7 @@
 #define  PORT_CLK_SEL_WRPLL1		(4<<29)
 #define  PORT_CLK_SEL_WRPLL2		(5<<29)
 #define  PORT_CLK_SEL_NONE		(7<<29)
+#define  PORT_CLK_SEL_MASK              (7<<29)
 
 /* Transcoder clock selection */
 #define TRANS_CLK_SEL_A			0x46140
drivers/gpu/drm/i915/intel_ddi.c +70 -0

82 lines not on this page · raw message

drivers/gpu/drm/i915/intel_display.c +1 -0
index e0069f4..1c6a3d2 100644
@@ -9579,6 +9579,7 @@ static void intel_init_display(struct drm_device *dev)
 
 	if (HAS_DDI(dev)) {
 		dev_priv->display.get_pipe_config = haswell_get_pipe_config;
+		dev_priv->display.get_clock = ironlake_crtc_clock_get;
 		dev_priv->display.crtc_mode_set = haswell_crtc_mode_set;
 		dev_priv->display.crtc_enable = haswell_crtc_enable;
 		dev_priv->display.crtc_disable = haswell_crtc_disable;
Signature · 1 line
1.8.3
#2 lore raw

Re: [PATCH 2/2] drm/i915: add fast boot support for Haswell

Quoted 4 lines · Furquan Shaikh

Enables getting correct mode clock when reading pipe config This patch has been tested successfully on top of drm-intel-nightly tree

This is missing a hunk to enable the pipe_config consistency checks:

(quoted diff) +0 -0

b/drivers/gpu/drm/i915/intel_display.c
index 7a40427..e8b73ac 100644

drivers/gpu/drm/i915/intel_display.c +5 -7
@@ -8416,13 +8416,11 @@ intel_pipe_config_compare(struct drm_device *dev,
 #undef PIPE_CONF_CHECK_FLAGS
 #undef PIPE_CONF_QUIRK
 
-       if (!IS_HASWELL(dev)) {
-               if (!intel_fuzzy_clock_check(current_config, pipe_config)) {
-                       DRM_ERROR("mismatch in clock (expected %d, found %d)\n",
-                                 current_config->adjusted_mode.clock,
-                                 pipe_config->adjusted_mode.clock);
-                       return false;
-               }
+       if (!intel_fuzzy_clock_check(current_config, pipe_config)) {
+               DRM_ERROR("mismatch in clock (expected %d, found %d)\n",
+                         current_config->adjusted_mode.clock,
+                         pipe_config->adjusted_mode.clock);
+               return false;
        }
 
        return true;

Cheers, Daniel

Quoted 144 lines
---
 drivers/gpu/drm/i915/i915_reg.h      |  6 ++++
 drivers/gpu/drm/i915/intel_ddi.c     | 70 ++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_display.c |  1 +
 3 files changed, 77 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +6 -0
index 2b96d6b..9511129 100644
@@ -4970,6 +4970,7 @@
 #define  SPLL_PLL_NON_SSC              (2<<28)
 #define  SPLL_PLL_FREQ_810MHz          (0<<26)
 #define  SPLL_PLL_FREQ_1350MHz         (1<<26)
+#define  SPLL_PLL_FREQ_MASK             (3<<26)
 
 /* WRPLL */
 #define WRPLL_CTL1                     0x46040
@@ -4983,6 +4984,10 @@
 #define  WRPLL_DIVIDER_POST(x)         ((x)<<8)
 #define  WRPLL_DIVIDER_FEEDBACK(x)     ((x)<<16)
 
+#define WRPLL_DIVIDER_REFERENCE_BITS(reg)    (reg & 0xff)
+#define WRPLL_DIVIDER_POST_BITS(reg)         ((reg >> 8) & 0x3f)
+#define WRPLL_DIVIDER_FEEDBACK_BITS(reg)     ((reg >> 16) & 0xff)
+
 /* Port clock selection */
 #define PORT_CLK_SEL_A                 0x46100
 #define PORT_CLK_SEL_B                 0x46104
@@ -4994,6 +4999,7 @@
 #define  PORT_CLK_SEL_WRPLL1           (4<<29)
 #define  PORT_CLK_SEL_WRPLL2           (5<<29)
 #define  PORT_CLK_SEL_NONE             (7<<29)
+#define  PORT_CLK_SEL_MASK              (7<<29)
 
 /* Transcoder clock selection */
 #define TRANS_CLK_SEL_A                        0x46140
drivers/gpu/drm/i915/intel_ddi.c +70 -0
index b8c096b..a24a375 100644
@@ -1246,6 +1246,74 @@ static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder)
                intel_dp_check_link_status(intel_dp);
 }
 
+static void intel_ddi_get_clock(struct intel_encoder *encoder,
+                               struct intel_crtc_config *pipe_config)
+{
+       struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+       int port = intel_ddi_get_encoder_port(encoder);
+       u32 temp = I915_READ(PORT_CLK_SEL(port)) & PORT_CLK_SEL_MASK;
+       u8 link_bw;
+
+       if ((temp == PORT_CLK_SEL_LCPLL_810) ||
+           (temp == PORT_CLK_SEL_LCPLL_1350) ||
+           (temp == PORT_CLK_SEL_LCPLL_2700)) {
+
+               switch (temp) {
+               case PORT_CLK_SEL_LCPLL_810:
+                       link_bw = DP_LINK_BW_1_62;
+                       break;
+               case PORT_CLK_SEL_LCPLL_1350:
+                       link_bw = DP_LINK_BW_2_7;
+                       break;
+               case PORT_CLK_SEL_LCPLL_2700:
+                       link_bw = DP_LINK_BW_5_4;
+                       break;
+               }
+               pipe_config->port_clock = drm_dp_bw_code_to_link_rate(link_bw);
+       } else if ((temp == PORT_CLK_SEL_WRPLL1) ||
+                  (temp == PORT_CLK_SEL_WRPLL2)) {
+               uint64_t p, n2, r2;
+               u32 val, reg;
+               uint64_t freq2k;
+
+               switch (temp) {
+               case PORT_CLK_SEL_WRPLL1:
+                       reg = WRPLL_CTL1;
+                       break;
+               case PORT_CLK_SEL_WRPLL2:
+                       reg = WRPLL_CTL2;
+                       break;
+               }
+               val = I915_READ(reg);
+               r2 = WRPLL_DIVIDER_REFERENCE_BITS(val);
+               p = WRPLL_DIVIDER_POST_BITS(val);
+               n2 = WRPLL_DIVIDER_FEEDBACK_BITS(val);
+
+               freq2k = DIV_ROUND_UP_ULL(LC_FREQ * n2, r2 * p);
+               pipe_config->port_clock = freq2k / 10;
+       } else if (temp == PORT_CLK_SEL_SPLL) {
+               u32 val;
+
+               val = I915_READ(PORT_CLK_SEL_SPLL);
+
+               switch (val & SPLL_PLL_FREQ_MASK) {
+               case SPLL_PLL_FREQ_810MHz:
+                       pipe_config->port_clock = 810000;
+                       break;
+               case SPLL_PLL_FREQ_1350MHz:
+                       pipe_config->port_clock = 1350000;
+                       break;
+               default:
+                       WARN(1, "Invalid pll freq %d\n",
+                            val & SPLL_PLL_FREQ_MASK);
+                       return;
+               }
+       } else {
+               WARN(1, "Invalid clock selection %d\n", temp);
+               return;
+       }
+}
+
 static void intel_ddi_get_config(struct intel_encoder *encoder,
                                 struct intel_crtc_config *pipe_config)
 {
@@ -1265,6 +1333,8 @@ static void intel_ddi_get_config(struct intel_encoder *encoder,
                flags |= DRM_MODE_FLAG_NVSYNC;
 
        pipe_config->adjusted_mode.flags |= flags;
+
+       intel_ddi_get_clock(encoder, pipe_config);
 }
 
 static void intel_ddi_destroy(struct drm_encoder *encoder)
drivers/gpu/drm/i915/intel_display.c +1 -1
index e0069f4..1c6a3d2 100644
@@ -9579,6 +9579,7 @@ static void intel_init_display(struct drm_device *dev)
 
        if (HAS_DDI(dev)) {
                dev_priv->display.get_pipe_config = haswell_get_pipe_config;
+               dev_priv->display.get_clock = ironlake_crtc_clock_get;
                dev_priv->display.crtc_mode_set = haswell_crtc_mode_set;
                dev_priv->display.crtc_enable = haswell_crtc_enable;
                dev_priv->display.crtc_disable = haswell_crtc_disable;
--

1.8.3

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Signature · 3 lines
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
#3 lore raw

Re: [PATCH 2/2] drm/i915: add fast boot support for Haswell

In reply to Furquan Shaikh

Hi

2013/8/19 Furquan Shaikh <[email protected]>:

Quoted 63 lines

Enables getting correct mode clock when reading pipe config This patch has been tested successfully on top of drm-intel-nightly tree

---
 drivers/gpu/drm/i915/i915_reg.h      |  6 ++++
 drivers/gpu/drm/i915/intel_ddi.c     | 70 ++++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_display.c |  1 +
 3 files changed, 77 insertions(+)
drivers/gpu/drm/i915/i915_reg.h +6 -0
index 2b96d6b..9511129 100644
@@ -4970,6 +4970,7 @@
 #define  SPLL_PLL_NON_SSC              (2<<28)
 #define  SPLL_PLL_FREQ_810MHz          (0<<26)
 #define  SPLL_PLL_FREQ_1350MHz         (1<<26)
+#define  SPLL_PLL_FREQ_MASK             (3<<26)
 
 /* WRPLL */
 #define WRPLL_CTL1                     0x46040
@@ -4983,6 +4984,10 @@
 #define  WRPLL_DIVIDER_POST(x)         ((x)<<8)
 #define  WRPLL_DIVIDER_FEEDBACK(x)     ((x)<<16)
 
+#define WRPLL_DIVIDER_REFERENCE_BITS(reg)    (reg & 0xff)
+#define WRPLL_DIVIDER_POST_BITS(reg)         ((reg >> 8) & 0x3f)
+#define WRPLL_DIVIDER_FEEDBACK_BITS(reg)     ((reg >> 16) & 0xff)
+
 /* Port clock selection */
 #define PORT_CLK_SEL_A                 0x46100
 #define PORT_CLK_SEL_B                 0x46104
@@ -4994,6 +4999,7 @@
 #define  PORT_CLK_SEL_WRPLL1           (4<<29)
 #define  PORT_CLK_SEL_WRPLL2           (5<<29)
 #define  PORT_CLK_SEL_NONE             (7<<29)
+#define  PORT_CLK_SEL_MASK              (7<<29)
 
 /* Transcoder clock selection */
 #define TRANS_CLK_SEL_A                        0x46140
drivers/gpu/drm/i915/intel_ddi.c +14 -0
index b8c096b..a24a375 100644
@@ -1246,6 +1246,74 @@ static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder)
                intel_dp_check_link_status(intel_dp);
 }
 
+static void intel_ddi_get_clock(struct intel_encoder *encoder,
+                               struct intel_crtc_config *pipe_config)
+{
+       struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+       int port = intel_ddi_get_encoder_port(encoder);
+       u32 temp = I915_READ(PORT_CLK_SEL(port)) & PORT_CLK_SEL_MASK;
+       u8 link_bw;
+
+       if ((temp == PORT_CLK_SEL_LCPLL_810) ||
+           (temp == PORT_CLK_SEL_LCPLL_1350) ||
+           (temp == PORT_CLK_SEL_LCPLL_2700)) {
+
+               switch (temp) {
+               case PORT_CLK_SEL_LCPLL_810:

drivers/gpu/drm/i915/intel_ddi.c static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder) · line 1272

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10 -0
+                       link_bw = DP_LINK_BW_1_62;
+                       break;
+               case PORT_CLK_SEL_LCPLL_1350:
+                       link_bw = DP_LINK_BW_2_7;
+                       break;
+               case PORT_CLK_SEL_LCPLL_2700:
+                       link_bw = DP_LINK_BW_5_4;
+                       break;
+               }
+               pipe_config->port_clock = drm_dp_bw_code_to_link_rate(link_bw);

drivers/gpu/drm/i915/intel_ddi.c:1275:56: aviso: ‘link_bw’ may be used uninitialized in this function [-Wmaybe-uninitialized]

Looks like gcc 4.7.3 isn't that smart :( You should probably add a "default" case with a WARN_ON(1) inside it.

Quoted 5 lines
drivers/gpu/drm/i915/intel_ddi.c +5 -0
+       } else if ((temp == PORT_CLK_SEL_WRPLL1) ||
+                  (temp == PORT_CLK_SEL_WRPLL2)) {
+               uint64_t p, n2, r2;
+               u32 val, reg;
+               uint64_t freq2k;

drivers/gpu/drm/i915/intel_ddi.c static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder) · line 1287

Quoted 10 lines
drivers/gpu/drm/i915/intel_ddi.c +10 -0
+
+               switch (temp) {
+               case PORT_CLK_SEL_WRPLL1:
+                       reg = WRPLL_CTL1;
+                       break;
+               case PORT_CLK_SEL_WRPLL2:
+                       reg = WRPLL_CTL2;
+                       break;
+               }
+               val = I915_READ(reg);

drivers/gpu/drm/i915/intel_ddi.c:1290:7: aviso: ‘reg’ may be used uninitialized in this function [-Wmaybe-uninitialized]

Same thing here.

drivers/gpu/drm/i915/intel_ddi.c static void intel_ddi_hot_plug(struct intel_encoder *intel_encoder) · line 1293

Quoted 6 lines
drivers/gpu/drm/i915/intel_ddi.c +6 -0
+               r2 = WRPLL_DIVIDER_REFERENCE_BITS(val);
+               p = WRPLL_DIVIDER_POST_BITS(val);
+               n2 = WRPLL_DIVIDER_FEEDBACK_BITS(val);
+
+               freq2k = DIV_ROUND_UP_ULL(LC_FREQ * n2, r2 * p);
+               pipe_config->port_clock = freq2k / 10;

If you put the "/ 10" on the line above so it becomes DIV_ROUND_UP_ULL(LC_FREQ * n2, r2 * p * 10) you'll avoid the rounding errors of 1 division.

By the way, I applied your patch + Daniel's suggestion on -nightly and now I see "unclaimed register" errors when booting with HDMI + eDP. The problem is that we try to read disabled LINK_M/LINK_N registers due to the power well disabled, so we get the error messages. I also once saw a "pipe state mismatch" error, but I can't find a way to reproduce it now. I'm also not sure whether VGA will really work since we don't touch intel_crt.c (I can't test it for now). When testing the patches, please always check dmesg for errors or warns, we should have none. It looks to me that enabling fastboot on Haswell won't be so simple due to these error messages I'm seeing. You should probably convince Jesse to fix these problems :)

Thanks for the patches,
Paulo

Quoted 54 lines
drivers/gpu/drm/i915/intel_ddi.c +25 -0
+       } else if (temp == PORT_CLK_SEL_SPLL) {
+               u32 val;
+
+               val = I915_READ(PORT_CLK_SEL_SPLL);
+
+               switch (val & SPLL_PLL_FREQ_MASK) {
+               case SPLL_PLL_FREQ_810MHz:
+                       pipe_config->port_clock = 810000;
+                       break;
+               case SPLL_PLL_FREQ_1350MHz:
+                       pipe_config->port_clock = 1350000;
+                       break;
+               default:
+                       WARN(1, "Invalid pll freq %d\n",
+                            val & SPLL_PLL_FREQ_MASK);
+                       return;
+               }
+       } else {
+               WARN(1, "Invalid clock selection %d\n", temp);
+               return;
+       }
+}
+
 static void intel_ddi_get_config(struct intel_encoder *encoder,
                                 struct intel_crtc_config *pipe_config)
 {
@@ -1265,6 +1333,8 @@ static void intel_ddi_get_config(struct intel_encoder *encoder,
                flags |= DRM_MODE_FLAG_NVSYNC;
 
        pipe_config->adjusted_mode.flags |= flags;
+
+       intel_ddi_get_clock(encoder, pipe_config);
 }
 
 static void intel_ddi_destroy(struct drm_encoder *encoder)
drivers/gpu/drm/i915/intel_display.c +1 -1
index e0069f4..1c6a3d2 100644
@@ -9579,6 +9579,7 @@ static void intel_init_display(struct drm_device *dev)
 
        if (HAS_DDI(dev)) {
                dev_priv->display.get_pipe_config = haswell_get_pipe_config;
+               dev_priv->display.get_clock = ironlake_crtc_clock_get;
                dev_priv->display.crtc_mode_set = haswell_crtc_mode_set;
                dev_priv->display.crtc_enable = haswell_crtc_enable;
                dev_priv->display.crtc_disable = haswell_crtc_disable;
--

1.8.3

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Signature · 1 line
Paulo Zanoni