Merge tag 'renesas-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-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..38153143ed8ca222cd9d169ebaa885a7a57d4bfe 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 */
@@ -615,16 +609,16 @@ static void oaktrail_hdmi_destroy(struct drm_connector *connector)
 static const struct drm_encoder_helper_funcs oaktrail_hdmi_helper_funcs = {
        .dpms = oaktrail_hdmi_dpms,
        .mode_fixup = oaktrail_hdmi_mode_fixup,
-       .prepare = psb_intel_encoder_prepare,
+       .prepare = gma_encoder_prepare,
        .mode_set = oaktrail_hdmi_mode_set,
-       .commit = psb_intel_encoder_commit,
+       .commit = gma_encoder_commit,
 };
 
 static const struct drm_connector_helper_funcs
                                        oaktrail_hdmi_connector_helper_funcs = {
        .get_modes = oaktrail_hdmi_get_modes,
        .mode_valid = oaktrail_hdmi_mode_valid,
-       .best_encoder = psb_intel_best_encoder,
+       .best_encoder = gma_best_encoder,
 };
 
 static const struct drm_connector_funcs oaktrail_hdmi_connector_funcs = {
@@ -646,21 +640,21 @@ static const struct drm_encoder_funcs oaktrail_hdmi_enc_funcs = {
 void oaktrail_hdmi_init(struct drm_device *dev,
                                        struct psb_intel_mode_device *mode_dev)
 {
-       struct psb_intel_encoder *psb_intel_encoder;
-       struct psb_intel_connector *psb_intel_connector;
+       struct gma_encoder *gma_encoder;
+       struct gma_connector *gma_connector;
        struct drm_connector *connector;
        struct drm_encoder *encoder;
 
-       psb_intel_encoder = kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
-       if (!psb_intel_encoder)
+       gma_encoder = kzalloc(sizeof(struct gma_encoder), GFP_KERNEL);
+       if (!gma_encoder)
                return;
 
-       psb_intel_connector = kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
-       if (!psb_intel_connector)
+       gma_connector = kzalloc(sizeof(struct gma_connector), GFP_KERNEL);
+       if (!gma_connector)
                goto failed_connector;
 
-       connector = &psb_intel_connector->base;
-       encoder = &psb_intel_encoder->base;
+       connector = &gma_connector->base;
+       encoder = &gma_encoder->base;
        drm_connector_init(dev, connector,
                           &oaktrail_hdmi_connector_funcs,
                           DRM_MODE_CONNECTOR_DVID);
@@ -669,10 +663,9 @@ void oaktrail_hdmi_init(struct drm_device *dev,
                         &oaktrail_hdmi_enc_funcs,
                         DRM_MODE_ENCODER_TMDS);
 
-       psb_intel_connector_attach_encoder(psb_intel_connector,
-                                          psb_intel_encoder);
+       gma_connector_attach_encoder(gma_connector, gma_encoder);
 
-       psb_intel_encoder->type = INTEL_OUTPUT_HDMI;
+       gma_encoder->type = INTEL_OUTPUT_HDMI;
        drm_encoder_helper_add(encoder, &oaktrail_hdmi_helper_funcs);
        drm_connector_helper_add(connector, &oaktrail_hdmi_connector_helper_funcs);
 
@@ -685,7 +678,7 @@ void oaktrail_hdmi_init(struct drm_device *dev,
        return;
 
 failed_connector:
-       kfree(psb_intel_encoder);
+       kfree(gma_encoder);
 }
 
 static DEFINE_PCI_DEVICE_TABLE(hdmi_ids) = {