1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index bddea5807442..fcb4e9ff1f20 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -131,7 +131,7 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data,
 static int psb_dpst_bl_ioctl(struct drm_device *dev, void *data,
                              struct drm_file *file_priv);
 
-static struct drm_ioctl_desc psb_ioctls[] = {
+static const struct drm_ioctl_desc psb_ioctls[] = {
         DRM_IOCTL_DEF_DRV(GMA_ADB, psb_adb_ioctl, DRM_AUTH),
         DRM_IOCTL_DEF_DRV(GMA_MODE_OPERATION, psb_mode_operation_ioctl,
                       DRM_AUTH),
@@ -270,7 +270,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
         unsigned long irqflags;
         int ret = -ENOMEM;
         struct drm_connector *connector;
-        struct psb_intel_encoder *psb_intel_encoder;
+        struct gma_encoder *gma_encoder;
 
         dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
         if (dev_priv == NULL)
@@ -372,9 +372,9 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset)
         /* Only add backlight support if we have LVDS output */
         list_for_each_entry(connector, &dev->mode_config.connector_list,
                             head) {
-                psb_intel_encoder = psb_intel_attached_encoder(connector);
+                gma_encoder = gma_attached_encoder(connector);
 
-                switch (psb_intel_encoder->type) {
+                switch (gma_encoder->type) {
                 case INTEL_OUTPUT_LVDS:
                 case INTEL_OUTPUT_MIPI:
                         ret = gma_backlight_init(dev);
@@ -441,7 +441,7 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data,
         struct drm_mode_object *obj;
         struct drm_crtc *crtc;
         struct drm_connector *connector;
-        struct psb_intel_crtc *psb_intel_crtc;
+        struct gma_crtc *gma_crtc;
         int i = 0;
         int32_t obj_id;
 
@@ -454,12 +454,12 @@ static int psb_gamma_ioctl(struct drm_device *dev, void *data,
 
         connector = obj_to_connector(obj);
         crtc = connector->encoder->crtc;
-        psb_intel_crtc = to_psb_intel_crtc(crtc);
+        gma_crtc = to_gma_crtc(crtc);
 
         for (i = 0; i < 256; i++)
-                psb_intel_crtc->lut_adj[i] = lut_arg->lut[i];
+                gma_crtc->lut_adj[i] = lut_arg->lut[i];
 
-        psb_intel_crtc_load_lut(crtc);
+        gma_crtc_load_lut(crtc);
 
         return 0;
 }
@@ -622,13 +622,12 @@ static const struct file_operations psb_gem_fops = {
         .unlocked_ioctl = psb_unlocked_ioctl,
         .mmap = drm_gem_mmap,
         .poll = drm_poll,
-        .fasync = drm_fasync,
         .read = drm_read,
 };
 
 static struct drm_driver driver = {
         .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | \
-                           DRIVER_IRQ_VBL | DRIVER_MODESET | DRIVER_GEM ,
+                           DRIVER_MODESET | DRIVER_GEM ,
         .load = psb_driver_load,
         .unload = psb_driver_unload,
 
@@ -652,7 +651,7 @@ static struct drm_driver driver = {
         .gem_vm_ops = &psb_gem_vm_ops,
         .dumb_create = psb_gem_dumb_create,
         .dumb_map_offset = psb_gem_dumb_map_gtt,
-        .dumb_destroy = psb_gem_dumb_destroy,
+        .dumb_destroy = drm_gem_dumb_destroy,
         .fops = &psb_gem_fops,
         .name = DRIVER_NAME,
         .desc = DRIVER_DESC,