Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm...

[karo-tx-linux.git] / drivers / gpu / drm / gma500 / psb_intel_sdvo.c

diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 3bc8414533c9bfa235024bef3458bbcf3e119605..6f01cdf5e1250a7dfbefe7f00e8b213ba1c63833 100644 (file)
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -65,7 +65,7 @@ static const char *tv_format_names[] = {
 #define TV_FORMAT_NUM  (sizeof(tv_format_names) / sizeof(*tv_format_names))
 
 struct psb_intel_sdvo {
-       struct psb_intel_encoder base;
+       struct gma_encoder base;
 
        struct i2c_adapter *i2c;
        u8 slave_addr;
@@ -140,7 +140,7 @@ struct psb_intel_sdvo {
 };
 
 struct psb_intel_sdvo_connector {
-       struct psb_intel_connector base;
+       struct gma_connector base;
 
        /* Mark the type of connector */
        uint16_t output_flag;
@@ -200,13 +200,13 @@ static struct psb_intel_sdvo *to_psb_intel_sdvo(struct drm_encoder *encoder)
 
 static struct psb_intel_sdvo *intel_attached_sdvo(struct drm_connector *connector)
 {
-       return container_of(psb_intel_attached_encoder(connector),
+       return container_of(gma_attached_encoder(connector),
                            struct psb_intel_sdvo, base);
 }
 
 static struct psb_intel_sdvo_connector *to_psb_intel_sdvo_connector(struct drm_connector *connector)
 {
-       return container_of(to_psb_intel_connector(connector), struct psb_intel_sdvo_connector, base);
+       return container_of(to_gma_connector(connector), struct psb_intel_sdvo_connector, base);
 }
 
 static bool
@@ -988,7 +988,7 @@ static void psb_intel_sdvo_mode_set(struct drm_encoder *encoder,
 {
        struct drm_device *dev = encoder->dev;
        struct drm_crtc *crtc = encoder->crtc;
-       struct psb_intel_crtc *psb_intel_crtc = to_psb_intel_crtc(crtc);
+       struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
        struct psb_intel_sdvo *psb_intel_sdvo = to_psb_intel_sdvo(encoder);
        u32 sdvox;
        struct psb_intel_sdvo_in_out_map in_out;
@@ -1071,7 +1071,7 @@ static void psb_intel_sdvo_mode_set(struct drm_encoder *encoder,
        }
        sdvox |= (9 << 19) | SDVO_BORDER_ENABLE;
 
-       if (psb_intel_crtc->pipe == 1)
+       if (gma_crtc->pipe == 1)
                sdvox |= SDVO_PIPE_B_SELECT;
        if (psb_intel_sdvo->has_hdmi_audio)
                sdvox |= SDVO_AUDIO_ENABLE;
@@ -1122,7 +1122,7 @@ static void psb_intel_sdvo_dpms(struct drm_encoder *encoder, int mode)
                if ((temp & SDVO_ENABLE) == 0)
                        psb_intel_sdvo_write_sdvox(psb_intel_sdvo, temp | SDVO_ENABLE);
                for (i = 0; i < 2; i++)
-                       psb_intel_wait_for_vblank(dev);
+                       gma_wait_for_vblank(dev);
 
                status = psb_intel_sdvo_get_trained_inputs(psb_intel_sdvo, &input1, &input2);
                /* Warn if the device reported failure to sync.
@@ -1837,10 +1837,8 @@ done:
 static void psb_intel_sdvo_save(struct drm_connector *connector)
 {
        struct drm_device *dev = connector->dev;
-       struct psb_intel_encoder *psb_intel_encoder =
-                                       psb_intel_attached_encoder(connector);
-       struct psb_intel_sdvo *sdvo =
-                               to_psb_intel_sdvo(&psb_intel_encoder->base);
+       struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+       struct psb_intel_sdvo *sdvo = to_psb_intel_sdvo(&gma_encoder->base);
 
        sdvo->saveSDVO = REG_READ(sdvo->sdvo_reg);
 }
@@ -1848,8 +1846,7 @@ static void psb_intel_sdvo_save(struct drm_connector *connector)
 static void psb_intel_sdvo_restore(struct drm_connector *connector)
 {
        struct drm_device *dev = connector->dev;
-       struct drm_encoder *encoder =
-                               &psb_intel_attached_encoder(connector)->base;
+       struct drm_encoder *encoder = &gma_attached_encoder(connector)->base;
        struct psb_intel_sdvo *sdvo = to_psb_intel_sdvo(encoder);
        struct drm_crtc *crtc = encoder->crtc;
 
@@ -1865,9 +1862,9 @@ static void psb_intel_sdvo_restore(struct drm_connector *connector)
 static const struct drm_encoder_helper_funcs psb_intel_sdvo_helper_funcs = {
        .dpms = psb_intel_sdvo_dpms,
        .mode_fixup = psb_intel_sdvo_mode_fixup,
-       .prepare = psb_intel_encoder_prepare,
+       .prepare = gma_encoder_prepare,
        .mode_set = psb_intel_sdvo_mode_set,
-       .commit = psb_intel_encoder_commit,
+       .commit = gma_encoder_commit,
 };
 
 static const struct drm_connector_funcs psb_intel_sdvo_connector_funcs = {
@@ -1883,7 +1880,7 @@ static const struct drm_connector_funcs psb_intel_sdvo_connector_funcs = {
 static const struct drm_connector_helper_funcs psb_intel_sdvo_connector_helper_funcs = {
        .get_modes = psb_intel_sdvo_get_modes,
        .mode_valid = psb_intel_sdvo_mode_valid,
-       .best_encoder = psb_intel_best_encoder,
+       .best_encoder = gma_best_encoder,
 };
 
 static void psb_intel_sdvo_enc_destroy(struct drm_encoder *encoder)
@@ -1895,7 +1892,7 @@ static void psb_intel_sdvo_enc_destroy(struct drm_encoder *encoder)
                                 psb_intel_sdvo->sdvo_lvds_fixed_mode);
 
        i2c_del_adapter(&psb_intel_sdvo->ddc);
-       psb_intel_encoder_destroy(encoder);
+       gma_encoder_destroy(encoder);
 }
 
 static const struct drm_encoder_funcs psb_intel_sdvo_enc_funcs = {
@@ -2056,7 +2053,7 @@ psb_intel_sdvo_connector_init(struct psb_intel_sdvo_connector *connector,
        connector->base.base.doublescan_allowed = 0;
        connector->base.base.display_info.subpixel_order = SubPixelHorizontalRGB;
 
-       psb_intel_connector_attach_encoder(&connector->base, &encoder->base);
+       gma_connector_attach_encoder(&connector->base, &encoder->base);
        drm_sysfs_connector_add(&connector->base.base);
 }
 
@@ -2076,7 +2073,7 @@ psb_intel_sdvo_dvi_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
 {
        struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
        struct drm_connector *connector;
-       struct psb_intel_connector *intel_connector;
+       struct gma_connector *intel_connector;
        struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
 
        psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
@@ -2116,7 +2113,7 @@ psb_intel_sdvo_tv_init(struct psb_intel_sdvo *psb_intel_sdvo, int type)
 {
        struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
        struct drm_connector *connector;
-       struct psb_intel_connector *intel_connector;
+       struct gma_connector *intel_connector;
        struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
 
        psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
@@ -2155,7 +2152,7 @@ psb_intel_sdvo_analog_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
 {
        struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
        struct drm_connector *connector;
-       struct psb_intel_connector *intel_connector;
+       struct gma_connector *intel_connector;
        struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
 
        psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
@@ -2189,7 +2186,7 @@ psb_intel_sdvo_lvds_init(struct psb_intel_sdvo *psb_intel_sdvo, int device)
 {
        struct drm_encoder *encoder = &psb_intel_sdvo->base.base;
        struct drm_connector *connector;
-       struct psb_intel_connector *intel_connector;
+       struct gma_connector *intel_connector;
        struct psb_intel_sdvo_connector *psb_intel_sdvo_connector;
 
        psb_intel_sdvo_connector = kzalloc(sizeof(struct psb_intel_sdvo_connector), GFP_KERNEL);
@@ -2541,7 +2538,7 @@ psb_intel_sdvo_init_ddc_proxy(struct psb_intel_sdvo *sdvo,
 bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
 {
        struct drm_psb_private *dev_priv = dev->dev_private;
-       struct psb_intel_encoder *psb_intel_encoder;
+       struct gma_encoder *gma_encoder;
        struct psb_intel_sdvo *psb_intel_sdvo;
        int i;
 
@@ -2558,9 +2555,9 @@ bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
        }
 
        /* encoder type will be decided later */
-       psb_intel_encoder = &psb_intel_sdvo->base;
-       psb_intel_encoder->type = INTEL_OUTPUT_SDVO;
-       drm_encoder_init(dev, &psb_intel_encoder->base, &psb_intel_sdvo_enc_funcs, 0);
+       gma_encoder = &psb_intel_sdvo->base;
+       gma_encoder->type = INTEL_OUTPUT_SDVO;
+       drm_encoder_init(dev, &gma_encoder->base, &psb_intel_sdvo_enc_funcs, 0);
 
        /* Read the regs to test if we can talk to the device */
        for (i = 0; i < 0x40; i++) {
@@ -2578,7 +2575,7 @@ bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
        else
                dev_priv->hotplug_supported_mask |= SDVOC_HOTPLUG_INT_STATUS;
 
-       drm_encoder_helper_add(&psb_intel_encoder->base, &psb_intel_sdvo_helper_funcs);
+       drm_encoder_helper_add(&gma_encoder->base, &psb_intel_sdvo_helper_funcs);
 
        /* In default case sdvo lvds is false */
        if (!psb_intel_sdvo_get_capabilities(psb_intel_sdvo, &psb_intel_sdvo->caps))
@@ -2621,7 +2618,7 @@ bool psb_intel_sdvo_init(struct drm_device *dev, int sdvo_reg)
        return true;
 
 err:
-       drm_encoder_cleanup(&psb_intel_encoder->base);
+       drm_encoder_cleanup(&gma_encoder->base);
        i2c_del_adapter(&psb_intel_sdvo->ddc);
        kfree(psb_intel_sdvo);