* [PATCH] drm/i915: pixel multiplier readout support for pch ports
@ 2013-06-27 17:47 Daniel Vetter
2013-06-28 17:20 ` Jesse Barnes
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2013-06-27 17:47 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Now that we painstakingly track the shared pch dplls we can finally
implement pixel mutliplier readout support for pch ports, too.
v2: Undo the temporary hack to disable the sdvo pixel multiplier
cross-checking.
Cc: Imre Deak <imre.deak@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
drivers/gpu/drm/i915/intel_sdvo.c | 3 ---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 04c2cab..16aacfa 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -5778,10 +5778,6 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
ironlake_get_fdi_m_n_config(crtc, pipe_config);
- /* XXX: Can't properly read out the pch dpll pixel multiplier
- * since we don't have state tracking for pch clocks yet. */
- pipe_config->pixel_multiplier = 1;
-
if (HAS_PCH_IBX(dev_priv->dev)) {
pipe_config->shared_dpll = crtc->pipe;
} else {
@@ -5796,6 +5792,11 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
WARN_ON(!pll->get_hw_state(dev_priv, pll,
&pipe_config->dpll_hw_state));
+
+ tmp = pipe_config->dpll_hw_state.dpll;
+ pipe_config->pixel_multiplier =
+ ((tmp & PLL_REF_SDVO_HDMI_MULTIPLIER_MASK)
+ >> PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT) + 1;
} else {
pipe_config->pixel_multiplier = 1;
}
@@ -8046,8 +8047,7 @@ intel_pipe_config_compare(struct drm_device *dev,
PIPE_CONF_CHECK_I(adjusted_mode.crtc_vsync_start);
PIPE_CONF_CHECK_I(adjusted_mode.crtc_vsync_end);
- if (!HAS_PCH_SPLIT(dev))
- PIPE_CONF_CHECK_I(pixel_multiplier);
+ PIPE_CONF_CHECK_I(pixel_multiplier);
PIPE_CONF_CHECK_FLAGS(adjusted_mode.flags,
DRM_MODE_FLAG_INTERLACE);
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 2628d56..8415d6a 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1370,9 +1370,6 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
break;
}
- if(HAS_PCH_SPLIT(dev))
- return; /* no pixel multiplier readout support yet */
-
WARN(encoder_pixel_multiplier != pipe_config->pixel_multiplier,
"SDVO pixel multiplier mismatch, port: %i, encoder: %i\n",
pipe_config->pixel_multiplier, encoder_pixel_multiplier);
--
1.7.11.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: pixel multiplier readout support for pch ports
2013-06-27 17:47 [PATCH] drm/i915: pixel multiplier readout support for pch ports Daniel Vetter
@ 2013-06-28 17:20 ` Jesse Barnes
2013-06-30 19:25 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Jesse Barnes @ 2013-06-28 17:20 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development
On Thu, 27 Jun 2013 19:47:19 +0200
Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Now that we painstakingly track the shared pch dplls we can finally
> implement pixel mutliplier readout support for pch ports, too.
>
> v2: Undo the temporary hack to disable the sdvo pixel multiplier
> cross-checking.
>
> Cc: Imre Deak <imre.deak@intel.com>
> Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
> drivers/gpu/drm/i915/intel_sdvo.c | 3 ---
> 2 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 04c2cab..16aacfa 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -5778,10 +5778,6 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>
> ironlake_get_fdi_m_n_config(crtc, pipe_config);
>
> - /* XXX: Can't properly read out the pch dpll pixel multiplier
> - * since we don't have state tracking for pch clocks yet. */
> - pipe_config->pixel_multiplier = 1;
> -
> if (HAS_PCH_IBX(dev_priv->dev)) {
> pipe_config->shared_dpll = crtc->pipe;
> } else {
> @@ -5796,6 +5792,11 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
>
> WARN_ON(!pll->get_hw_state(dev_priv, pll,
> &pipe_config->dpll_hw_state));
> +
> + tmp = pipe_config->dpll_hw_state.dpll;
> + pipe_config->pixel_multiplier =
> + ((tmp & PLL_REF_SDVO_HDMI_MULTIPLIER_MASK)
> + >> PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT) + 1;
> } else {
> pipe_config->pixel_multiplier = 1;
> }
> @@ -8046,8 +8047,7 @@ intel_pipe_config_compare(struct drm_device *dev,
> PIPE_CONF_CHECK_I(adjusted_mode.crtc_vsync_start);
> PIPE_CONF_CHECK_I(adjusted_mode.crtc_vsync_end);
>
> - if (!HAS_PCH_SPLIT(dev))
> - PIPE_CONF_CHECK_I(pixel_multiplier);
> + PIPE_CONF_CHECK_I(pixel_multiplier);
>
> PIPE_CONF_CHECK_FLAGS(adjusted_mode.flags,
> DRM_MODE_FLAG_INTERLACE);
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 2628d56..8415d6a 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1370,9 +1370,6 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
> break;
> }
>
> - if(HAS_PCH_SPLIT(dev))
> - return; /* no pixel multiplier readout support yet */
> -
> WARN(encoder_pixel_multiplier != pipe_config->pixel_multiplier,
> "SDVO pixel multiplier mismatch, port: %i, encoder: %i\n",
> pipe_config->pixel_multiplier, encoder_pixel_multiplier);
Yay
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: pixel multiplier readout support for pch ports
2013-06-28 17:20 ` Jesse Barnes
@ 2013-06-30 19:25 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2013-06-30 19:25 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Daniel Vetter, Intel Graphics Development
On Fri, Jun 28, 2013 at 10:20:35AM -0700, Jesse Barnes wrote:
> On Thu, 27 Jun 2013 19:47:19 +0200
> Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>
> > Now that we painstakingly track the shared pch dplls we can finally
> > implement pixel mutliplier readout support for pch ports, too.
> >
> > v2: Undo the temporary hack to disable the sdvo pixel multiplier
> > cross-checking.
> >
> > Cc: Imre Deak <imre.deak@intel.com>
> > Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> > drivers/gpu/drm/i915/intel_display.c | 12 ++++++------
> > drivers/gpu/drm/i915/intel_sdvo.c | 3 ---
> > 2 files changed, 6 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> > index 04c2cab..16aacfa 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -5778,10 +5778,6 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
> >
> > ironlake_get_fdi_m_n_config(crtc, pipe_config);
> >
> > - /* XXX: Can't properly read out the pch dpll pixel multiplier
> > - * since we don't have state tracking for pch clocks yet. */
> > - pipe_config->pixel_multiplier = 1;
> > -
> > if (HAS_PCH_IBX(dev_priv->dev)) {
> > pipe_config->shared_dpll = crtc->pipe;
> > } else {
> > @@ -5796,6 +5792,11 @@ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
> >
> > WARN_ON(!pll->get_hw_state(dev_priv, pll,
> > &pipe_config->dpll_hw_state));
> > +
> > + tmp = pipe_config->dpll_hw_state.dpll;
> > + pipe_config->pixel_multiplier =
> > + ((tmp & PLL_REF_SDVO_HDMI_MULTIPLIER_MASK)
> > + >> PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT) + 1;
> > } else {
> > pipe_config->pixel_multiplier = 1;
> > }
> > @@ -8046,8 +8047,7 @@ intel_pipe_config_compare(struct drm_device *dev,
> > PIPE_CONF_CHECK_I(adjusted_mode.crtc_vsync_start);
> > PIPE_CONF_CHECK_I(adjusted_mode.crtc_vsync_end);
> >
> > - if (!HAS_PCH_SPLIT(dev))
> > - PIPE_CONF_CHECK_I(pixel_multiplier);
> > + PIPE_CONF_CHECK_I(pixel_multiplier);
> >
> > PIPE_CONF_CHECK_FLAGS(adjusted_mode.flags,
> > DRM_MODE_FLAG_INTERLACE);
> > diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> > index 2628d56..8415d6a 100644
> > --- a/drivers/gpu/drm/i915/intel_sdvo.c
> > +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> > @@ -1370,9 +1370,6 @@ static void intel_sdvo_get_config(struct intel_encoder *encoder,
> > break;
> > }
> >
> > - if(HAS_PCH_SPLIT(dev))
> > - return; /* no pixel multiplier readout support yet */
> > -
> > WARN(encoder_pixel_multiplier != pipe_config->pixel_multiplier,
> > "SDVO pixel multiplier mismatch, port: %i, encoder: %i\n",
> > pipe_config->pixel_multiplier, encoder_pixel_multiplier);
>
> Yay
>
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Queued for -next, thanks for the review.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-30 19:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-27 17:47 [PATCH] drm/i915: pixel multiplier readout support for pch ports Daniel Vetter
2013-06-28 17:20 ` Jesse Barnes
2013-06-30 19:25 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).