drm/gma500: Convert to generic gamma funcs

[deliverable/linux.git] / drivers / gpu / drm / gma500 / oaktrail_hdmi.c

diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index f036f1fc161e435bf7841fd5b14118f78230f0b6..7d9a5ee52814e63e5153a8ced617fd6395c9f80b 100644 (file)
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -155,12 +155,6 @@ static void oaktrail_hdmi_audio_disable(struct drm_device *dev)
        HDMI_READ(HDMI_HCR);
 }
 
-static void wait_for_vblank(struct drm_device *dev)
-{
-       /* Wait for 20ms, i.e. one cycle at 50hz. */
-       mdelay(20);
-}
-
 static unsigned int htotal_calculate(struct drm_display_mode *mode)
 {
        u32 htotal, new_crtc_htotal;
@@ -372,10 +366,10 @@ int oaktrail_crtc_hdmi_mode_set(struct drm_crtc *crtc,
 
        REG_WRITE(PCH_PIPEBCONF, pipeconf);
        REG_READ(PCH_PIPEBCONF);
-       wait_for_vblank(dev);
+       gma_wait_for_vblank(dev);
 
        REG_WRITE(dspcntr_reg, dspcntr);
-       wait_for_vblank(dev);
+       gma_wait_for_vblank(dev);
 
        gma_power_end(dev);
 
@@ -459,7 +453,7 @@ void oaktrail_crtc_hdmi_dpms(struct drm_crtc *crtc, int mode)
                        REG_READ(PCH_PIPEBCONF);
                }
 
-               wait_for_vblank(dev);
+               gma_wait_for_vblank(dev);
 
                /* Enable plane */
                temp = REG_READ(DSPBCNTR);
@@ -470,7 +464,7 @@ void oaktrail_crtc_hdmi_dpms(struct drm_crtc *crtc, int mode)
                        REG_READ(DSPBSURF);
                }
 
-               psb_intel_crtc_load_lut(crtc);
+               gma_crtc_load_lut(crtc);
        }
 
        /* DSPARB */