drm/i915: don't assert_pch_pll_enabled on lpt_enable_pch_transcoder
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Wed, 31 Oct 2012 20:12:46 +0000 (18:12 -0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Sun, 11 Nov 2012 22:51:23 +0000 (23:51 +0100)
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@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index 2de9a6e4b5fdebc15018a8528c14b99447331a5a..87f958908f8e28885551167b1b73b32eff7aa3cf 100644 (file)
@@ -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);
This page took 0.034429 seconds and 5 git commands to generate.