Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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

diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index 325013a9c48c451938fe45235f78721c62bcfdb4..e77d7214fca4fb0167b2305d25a36043d068d2ff 100644 (file)
--- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
@@ -43,7 +43,7 @@
  * Sets the power state for the panel.
  */
 static void oaktrail_lvds_set_power(struct drm_device *dev,
-                               struct psb_intel_encoder *psb_intel_encoder,
+                               struct gma_encoder *gma_encoder,
                                bool on)
 {
        u32 pp_status;
@@ -78,13 +78,12 @@ static void oaktrail_lvds_set_power(struct drm_device *dev,
 static void oaktrail_lvds_dpms(struct drm_encoder *encoder, int mode)
 {
        struct drm_device *dev = encoder->dev;
-       struct psb_intel_encoder *psb_intel_encoder =
-                                               to_psb_intel_encoder(encoder);
+       struct gma_encoder *gma_encoder = to_gma_encoder(encoder);
 
        if (mode == DRM_MODE_DPMS_ON)
-               oaktrail_lvds_set_power(dev, psb_intel_encoder, true);
+               oaktrail_lvds_set_power(dev, gma_encoder, true);
        else
-               oaktrail_lvds_set_power(dev, psb_intel_encoder, false);
+               oaktrail_lvds_set_power(dev, gma_encoder, false);
 
        /* XXX: We never power down the LVDS pairs. */
 }
@@ -166,8 +165,7 @@ static void oaktrail_lvds_prepare(struct drm_encoder *encoder)
 {
        struct drm_device *dev = encoder->dev;
        struct drm_psb_private *dev_priv = dev->dev_private;
-       struct psb_intel_encoder *psb_intel_encoder =
-                                               to_psb_intel_encoder(encoder);
+       struct gma_encoder *gma_encoder = to_gma_encoder(encoder);
        struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;
 
        if (!gma_power_begin(dev, true))
@@ -176,7 +174,7 @@ static void oaktrail_lvds_prepare(struct drm_encoder *encoder)
        mode_dev->saveBLC_PWM_CTL = REG_READ(BLC_PWM_CTL);
        mode_dev->backlight_duty_cycle = (mode_dev->saveBLC_PWM_CTL &
                                          BACKLIGHT_DUTY_CYCLE_MASK);
-       oaktrail_lvds_set_power(dev, psb_intel_encoder, false);
+       oaktrail_lvds_set_power(dev, gma_encoder, false);
        gma_power_end(dev);
 }
 
@@ -203,14 +201,13 @@ static void oaktrail_lvds_commit(struct drm_encoder *encoder)
 {
        struct drm_device *dev = encoder->dev;
        struct drm_psb_private *dev_priv = dev->dev_private;
-       struct psb_intel_encoder *psb_intel_encoder =
-                                               to_psb_intel_encoder(encoder);
+       struct gma_encoder *gma_encoder = to_gma_encoder(encoder);
        struct psb_intel_mode_device *mode_dev = &dev_priv->mode_dev;
 
        if (mode_dev->backlight_duty_cycle == 0)
                mode_dev->backlight_duty_cycle =
                                        oaktrail_lvds_get_max_backlight(dev);
-       oaktrail_lvds_set_power(dev, psb_intel_encoder, true);
+       oaktrail_lvds_set_power(dev, gma_encoder, true);
 }
 
 static const struct drm_encoder_helper_funcs oaktrail_lvds_helper_funcs = {
@@ -325,8 +322,8 @@ static void oaktrail_lvds_get_configuration_mode(struct drm_device *dev,
 void oaktrail_lvds_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;
        struct drm_psb_private *dev_priv = dev->dev_private;
@@ -334,16 +331,16 @@ void oaktrail_lvds_init(struct drm_device *dev,
        struct i2c_adapter *i2c_adap;
        struct drm_display_mode *scan;  /* *modes, *bios_mode; */
 
-       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;
        dev_priv->is_lvds_on = true;
        drm_connector_init(dev, connector,
                           &psb_intel_lvds_connector_funcs,
@@ -352,9 +349,8 @@ void oaktrail_lvds_init(struct drm_device *dev,
        drm_encoder_init(dev, encoder, &psb_intel_lvds_enc_funcs,
                         DRM_MODE_ENCODER_LVDS);
 
-       psb_intel_connector_attach_encoder(psb_intel_connector,
-                                          psb_intel_encoder);
-       psb_intel_encoder->type = INTEL_OUTPUT_LVDS;
+       gma_connector_attach_encoder(gma_connector, gma_encoder);
+       gma_encoder->type = INTEL_OUTPUT_LVDS;
 
        drm_encoder_helper_add(encoder, &oaktrail_lvds_helper_funcs);
        drm_connector_helper_add(connector,
@@ -434,15 +430,15 @@ out:
 
 failed_find:
        dev_dbg(dev->dev, "No LVDS modes found, disabling.\n");
-       if (psb_intel_encoder->ddc_bus)
-               psb_intel_i2c_destroy(psb_intel_encoder->ddc_bus);
+       if (gma_encoder->ddc_bus)
+               psb_intel_i2c_destroy(gma_encoder->ddc_bus);
 
 /* failed_ddc: */
 
        drm_encoder_cleanup(encoder);
        drm_connector_cleanup(connector);
-       kfree(psb_intel_connector);
+       kfree(gma_connector);
 failed_connector:
-       kfree(psb_intel_encoder);
+       kfree(gma_encoder);
 }