vigs: use drm_legacy interface at now

Used drm legacy functions at now. VIGS should use new DRM architecture
soon. Some related APIs were changed.

Change-Id: Iecb406bfe47384fda810afd94b5c0bb05fbc228a
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/drivers/gpu/drm/vigs/vigs_device.c b/drivers/gpu/drm/vigs/vigs_device.c
index 1e97673..62e1594 100644 (file)
--- a/drivers/gpu/drm/vigs/vigs_device.c
+++ b/drivers/gpu/drm/vigs/vigs_device.c
@@ -137,7 +137,7 @@ int vigs_device_init(struct vigs_device *vigs_dev,
         goto fail1;
     }
 
-    ret = drm_addmap(vigs_dev->drm_dev,
+    ret = drm_legacy_addmap(vigs_dev->drm_dev,
                      vigs_dev->io_base,
                      vigs_dev->io_size,
                      _DRM_REGISTERS,
@@ -223,7 +223,7 @@ int vigs_device_init(struct vigs_device *vigs_dev,
      */
     drm_dev->vblank_disable_allowed = 1;
 
-    ret = drm_irq_install(drm_dev);
+    ret = drm_irq_install(drm_dev, drm_dev->pdev->irq);
 
     if (ret != 0) {
         goto fail8;
@@ -253,7 +253,7 @@ fail4:
 fail3:
     vigs_mman_destroy(vigs_dev->mman);
 fail2:
-    drm_rmmap(vigs_dev->drm_dev, vigs_dev->io_map);
+    drm_legacy_rmmap(vigs_dev->drm_dev, vigs_dev->io_map);
 fail1:
     idr_destroy(&vigs_dev->surface_idr);
     mutex_destroy(&vigs_dev->surface_idr_mutex);
@@ -274,7 +274,7 @@ void vigs_device_cleanup(struct vigs_device *vigs_dev)
     vigs_fenceman_destroy(vigs_dev->fenceman);
     ttm_object_device_release(&vigs_dev->obj_dev);
     vigs_mman_destroy(vigs_dev->mman);
-    drm_rmmap(vigs_dev->drm_dev, vigs_dev->io_map);
+    drm_legacy_rmmap(vigs_dev->drm_dev, vigs_dev->io_map);
     idr_destroy(&vigs_dev->surface_idr);
     mutex_destroy(&vigs_dev->surface_idr_mutex);
 }

diff --git a/drivers/gpu/drm/vigs/vigs_device.h b/drivers/gpu/drm/vigs/vigs_device.h
index d75f61c..c8c3b59 100644 (file)
--- a/drivers/gpu/drm/vigs/vigs_device.h
+++ b/drivers/gpu/drm/vigs/vigs_device.h
@@ -2,6 +2,7 @@
 #define _VIGS_DEVICE_H_
 
 #include "drmP.h"
+#include "drm_legacy.h"
 #include "vigs_protocol.h"
 
 struct vigs_mman;

diff --git a/drivers/gpu/drm/vigs/vigs_driver.c b/drivers/gpu/drm/vigs/vigs_driver.c
index 4b10f7c..51217a3 100644 (file)
--- a/drivers/gpu/drm/vigs/vigs_driver.c
+++ b/drivers/gpu/drm/vigs/vigs_driver.c
@@ -229,7 +229,7 @@ static struct drm_driver vigs_drm_driver =
     .dumb_map_offset = vigs_gem_dumb_map_offset,
     .dumb_destroy = vigs_gem_dumb_destroy,
     .ioctls = vigs_drm_ioctls,
-    .num_ioctls = DRM_ARRAY_SIZE(vigs_drm_ioctls),
+    .num_ioctls = ARRAY_SIZE(vigs_drm_ioctls),
     .fops = &vigs_drm_driver_fops,
     .name = DRIVER_NAME,
     .desc = DRIVER_DESC,

diff --git a/drivers/gpu/drm/vigs/vigs_fbdev.c b/drivers/gpu/drm/vigs/vigs_fbdev.c
index 20d1a8f..b7169d4 100644 (file)
--- a/drivers/gpu/drm/vigs/vigs_fbdev.c
+++ b/drivers/gpu/drm/vigs/vigs_fbdev.c
@@ -120,7 +120,7 @@ static int vigs_fbdev_setcmap(struct fb_cmap *cmap, struct fb_info *fbi)
 {
     struct drm_fb_helper *fb_helper = fbi->par;
     struct drm_device *dev = fb_helper->dev;
-    struct drm_crtc_helper_funcs *crtc_funcs;
+    const struct drm_crtc_helper_funcs *crtc_funcs;
     u16 *red, *green, *blue, *transp;
     struct drm_crtc *crtc;
     int i, j, ret = 0;

diff --git a/drivers/gpu/drm/vigs/vigs_gem.h b/drivers/gpu/drm/vigs/vigs_gem.h
index 7a8646d..92c87c9 100644 (file)
--- a/drivers/gpu/drm/vigs/vigs_gem.h
+++ b/drivers/gpu/drm/vigs/vigs_gem.h
@@ -2,6 +2,7 @@
 #define _VIGS_GEM_H_
 
 #include "drmP.h"
+#include "drm_gem.h"
 #include <ttm/ttm_bo_driver.h>
 #include <ttm/ttm_object.h>
 

diff --git a/drivers/gpu/drm/vigs/vigs_mman.c b/drivers/gpu/drm/vigs/vigs_mman.c
index b1790a1..4a3f7bc 100644 (file)
--- a/drivers/gpu/drm/vigs/vigs_mman.c
+++ b/drivers/gpu/drm/vigs/vigs_mman.c
@@ -635,7 +635,7 @@ int vigs_mman_mmap(struct vigs_mman *mman,
     struct ttm_buffer_object *bo;
 
     if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) {
-        return drm_mmap(filp, vma);
+        return drm_legacy_mmap(filp, vma);
     }
 
     vigs_vma = kmem_cache_alloc(mman->vma_cache, GFP_KERNEL);

diff --git a/drivers/gpu/drm/vigs/vigs_output.c b/drivers/gpu/drm/vigs/vigs_output.c
index 84f7890..15248ee 100644 (file)
--- a/drivers/gpu/drm/vigs/vigs_output.c
+++ b/drivers/gpu/drm/vigs/vigs_output.c
@@ -78,7 +78,7 @@ static void vigs_connector_destroy(struct drm_connector *connector)
 
     DRM_DEBUG_KMS("enter\n");
 
-    drm_sysfs_connector_remove(connector);
+    drm_connector_unregister(connector);
     drm_connector_cleanup(connector);
 
     kfree(vigs_output);
@@ -258,7 +258,7 @@ int vigs_output_init(struct vigs_device *vigs_dev)
 
     drm_connector_helper_add(&vigs_output->connector, &vigs_connector_helper_funcs);
 
-    ret = drm_sysfs_connector_add(&vigs_output->connector);
+    ret = drm_connector_register(&vigs_output->connector);
 
     if (ret != 0) {
         return ret;