drm/i915: refactor PCH_DPLL_SEL #defines

The bits are evenly space, so we can cut down on two big switch
blocks. This also greatly simplifies the hw state readout which
follows in the next patch.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 3 insertions, 29 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index a5ccce07386b..d5932ef76cde 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2986,21 +2986,8 @@ static void ironlake_pch_enable(struct drm_crtc *crtc)
                 u32 sel;
 
                 temp = I915_READ(PCH_DPLL_SEL);
-                switch (pipe) {
-                default:
-                case 0:
-                        temp |= TRANSA_DPLL_ENABLE;
-                        sel = TRANSA_DPLLB_SEL;
-                        break;
-                case 1:
-                        temp |= TRANSB_DPLL_ENABLE;
-                        sel = TRANSB_DPLLB_SEL;
-                        break;
-                case 2:
-                        temp |= TRANSC_DPLL_ENABLE;
-                        sel = TRANSC_DPLLB_SEL;
-                        break;
-                }
+                temp |= TRANS_DPLL_ENABLE(pipe);
+                sel = TRANS_DPLLB_SEL(pipe);
                 if (intel_crtc->config.shared_dpll == DPLL_ID_PCH_PLL_B)
                         temp |= sel;
                 else
@@ -3480,20 +3467,7 @@ static void ironlake_crtc_disable(struct drm_crtc *crtc)
 
                         /* disable DPLL_SEL */
                         temp = I915_READ(PCH_DPLL_SEL);
-                        switch (pipe) {
-                        case 0:
-                                temp &= ~(TRANSA_DPLL_ENABLE | TRANSA_DPLLB_SEL);
-                                break;
-                        case 1:
-                                temp &= ~(TRANSB_DPLL_ENABLE | TRANSB_DPLLB_SEL);
-                                break;
-                        case 2:
-                                /* C shares PLL A or B */
-                                temp &= ~(TRANSC_DPLL_ENABLE | TRANSC_DPLLB_SEL);
-                                break;
-                        default:
-                                BUG(); /* wtf */
-                        }
+                        temp &= ~(TRANS_DPLL_ENABLE(pipe) | TRANS_DPLLB_SEL(pipe));
                         I915_WRITE(PCH_DPLL_SEL, temp);
                 }