Merge branch 'gma500-next' of git://github.com/patjak/drm-gma500 into drm-next

Here's some gma500 unifying and cleanups for drm-next. There is more stuff in
the pipe for 3.12 but I'd like to get these out of the way first.

* 'gma500-next' of git://github.com/patjak/drm-gma500: (35 commits)
  drm/gma500/cdv: Add and hook up chip op for disabling sr
  drm/gma500/cdv: Add and hook up chip op for watermarks
  drm/gma500: Rename psb_intel_encoder to gma_encoder
  drm/gma500: Rename psb_intel_connector to gma_connector
  drm/gma500: Rename psb_intel_crtc to gma_crtc
  drm/gma500/cdv: Convert to generic set_config()
  drm/gma500/psb: Convert to generic set_config()
  drm/gma500: Add generic set_config() function
  drm/gma500/cdv: Convert to generic save/restore
  drm/gma500/psb: Convert to generic save/restore
  drm/gma500: Add generic crtc save/restore funcs
  drm/gma500: Convert to generic encoder funcs
  drm/gma500: Add generic encoder functions
  drm/gma500/psb: Convert to generic cursor funcs
  drm/gma500/cdv: Convert to generic cursor funcs
  drm/gma500: Add generic cursor functions
  drm/gma500/psb: Convert to generic crtc->destroy
  drm/gma500/mdfld: Use identical generic crtc funcs
  drm/gma500/oak: Use identical generic crtc funcs
  drm/gma500/psb: Convert to gma_crtc_dpms()
  ...

1 files changed, 12 insertions, 13 deletions

diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index 362dd2ad286f..01dd7d225762 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -520,21 +520,21 @@ static struct drm_framebuffer *psb_user_framebuffer_create
 static void psbfb_gamma_set(struct drm_crtc *crtc, u16 red, u16 green,
                                                         u16 blue, int regno)
 {
-        struct psb_intel_crtc *intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
 
-        intel_crtc->lut_r[regno] = red >> 8;
-        intel_crtc->lut_g[regno] = green >> 8;
-        intel_crtc->lut_b[regno] = blue >> 8;
+        gma_crtc->lut_r[regno] = red >> 8;
+        gma_crtc->lut_g[regno] = green >> 8;
+        gma_crtc->lut_b[regno] = blue >> 8;
 }
 
 static void psbfb_gamma_get(struct drm_crtc *crtc, u16 *red,
                                         u16 *green, u16 *blue, int regno)
 {
-        struct psb_intel_crtc *intel_crtc = to_psb_intel_crtc(crtc);
+        struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
 
-        *red = intel_crtc->lut_r[regno] << 8;
-        *green = intel_crtc->lut_g[regno] << 8;
-        *blue = intel_crtc->lut_b[regno] << 8;
+        *red = gma_crtc->lut_r[regno] << 8;
+        *green = gma_crtc->lut_g[regno] << 8;
+        *blue = gma_crtc->lut_b[regno] << 8;
 }
 
 static int psbfb_probe(struct drm_fb_helper *helper,
@@ -703,13 +703,12 @@ static void psb_setup_outputs(struct drm_device *dev)
 
         list_for_each_entry(connector, &dev->mode_config.connector_list,
                             head) {
-                struct psb_intel_encoder *psb_intel_encoder =
-                        psb_intel_attached_encoder(connector);
-                struct drm_encoder *encoder = &psb_intel_encoder->base;
+                struct gma_encoder *gma_encoder = gma_attached_encoder(connector);
+                struct drm_encoder *encoder = &gma_encoder->base;
                 int crtc_mask = 0, clone_mask = 0;
 
                 /* valid crtcs */
-                switch (psb_intel_encoder->type) {
+                switch (gma_encoder->type) {
                 case INTEL_OUTPUT_ANALOG:
                         crtc_mask = (1 << 0);
                         clone_mask = (1 << INTEL_OUTPUT_ANALOG);
@@ -744,7 +743,7 @@ static void psb_setup_outputs(struct drm_device *dev)
                 }
                 encoder->possible_crtcs = crtc_mask;
                 encoder->possible_clones =
-                    psb_intel_connector_clones(dev, clone_mask);
+                    gma_connector_clones(dev, clone_mask);
         }
 }