On Wed, Oct 31, 2012 at 06:12:46PM -0200, Paulo Zanoni wrote:
> From: Paulo Zanoni <paulo.r.zanoni at intel.com>
>
> These asserts are specific to IBX/CPT/PPT. Inside the assert_pch_pll
> function we even "return" in case we detect LPT, but I prefer to just
> not call it. In the future we might rename to something like
> ibx_assert_pch_pll.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni at intel.com>
Can't we now remove the HAS_LPT check from assert_pch_pll? Afaics we only
call it from ilk_pch_transcoder_enable and from the pch_pll handling
functions, both of which should no longer be called from haswell code.
For renaming them, I think that particular problem will solve itself once
we move all the ilk-ivb crtc/pch code into it's own file. With all these
splits you've done here for vga, I don't see much common code between
older pch and new-style ddi pch any more ...
-Daniel
> ---
> drivers/gpu/drm/i915/intel_display.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 7e8f4ed..0884137 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -1722,16 +1722,10 @@ static void lpt_enable_pch_transcoder(struct drm_i915_private *dev_priv,
> {
> int reg;
> u32 val, pipeconf_val;
> - struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
>
> /* PCH only available on ILK+ */
> BUG_ON(dev_priv->info->gen < 5);
>
> - /* Make sure PCH DPLL is enabled */
> - assert_pch_pll_enabled(dev_priv,
> - to_intel_crtc(crtc)->pch_pll,
> - to_intel_crtc(crtc));
> -
> /* FDI must be feeding us bits for PCH ports */
> assert_fdi_tx_enabled(dev_priv, pipe);
> assert_fdi_rx_enabled(dev_priv, pipe);
> --
> 1.7.11.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
