4 files changed, 21 insertions, 16 deletions

diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c
index 495b5fd2787c..8a140a953754 100644
--- a/drivers/gpu/drm/drm_dma.c
+++ b/drivers/gpu/drm/drm_dma.c
@@ -44,10 +44,18 @@
  *
  * Allocate and initialize a drm_device_dma structure.
  */
-int drm_dma_setup(struct drm_device *dev)
+int drm_legacy_dma_setup(struct drm_device *dev)
 {
         int i;
 
+        if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA) ||
+            drm_core_check_feature(dev, DRIVER_MODESET)) {
+                return 0;
+        }
+
+        dev->buf_use = 0;
+        atomic_set(&dev->buf_alloc, 0);
+
         dev->dma = kzalloc(sizeof(*dev->dma), GFP_KERNEL);
         if (!dev->dma)
                 return -ENOMEM;
@@ -66,11 +74,16 @@ int drm_dma_setup(struct drm_device *dev)
  * Free all pages associated with DMA buffers, the buffers and pages lists, and
  * finally the drm_device::dma structure itself.
  */
-void drm_dma_takedown(struct drm_device *dev)
+void drm_legacy_dma_takedown(struct drm_device *dev)
 {
         struct drm_device_dma *dma = dev->dma;
         int i, j;
 
+        if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA) ||
+            drm_core_check_feature(dev, DRIVER_MODESET)) {
+                return;
+        }
+
         if (!dma)
                 return;
 
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 743b24d7918e..5b949a736712 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -205,9 +205,7 @@ int drm_lastclose(struct drm_device * dev)
                 kfree(vma);
         }
 
-        if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&
-            !drm_core_check_feature(dev, DRIVER_MODESET))
-                drm_dma_takedown(dev);
+        drm_legacy_dma_takedown(dev);
 
         dev->dev_mapping = NULL;
         mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 72acae908a7d..f343234bd831 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -60,15 +60,9 @@ static int drm_setup(struct drm_device * dev)
         atomic_set(&dev->ioctl_count, 0);
         atomic_set(&dev->vma_count, 0);
 
-        if (drm_core_check_feature(dev, DRIVER_HAVE_DMA) &&
-            !drm_core_check_feature(dev, DRIVER_MODESET)) {
-                dev->buf_use = 0;
-                atomic_set(&dev->buf_alloc, 0);
-
-                i = drm_dma_setup(dev);
-                if (i < 0)
-                        return i;
-        }
+        i = drm_legacy_dma_setup(dev);
+        if (i < 0)
+                return i;
 
         for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
                 atomic_set(&dev->counts[i], 0);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 10d9f83a9df0..1da25304c289 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1374,8 +1374,8 @@ extern int drm_mapbufs(struct drm_device *dev, void *data,
                        struct drm_file *file_priv);
 
                                 /* DMA support (drm_dma.h) */
-extern int drm_dma_setup(struct drm_device *dev);
-extern void drm_dma_takedown(struct drm_device *dev);
+extern int drm_legacy_dma_setup(struct drm_device *dev);
+extern void drm_legacy_dma_takedown(struct drm_device *dev);
 extern void drm_free_buffer(struct drm_device *dev, struct drm_buf * buf);
 extern void drm_core_reclaim_buffers(struct drm_device *dev,
                                      struct drm_file *filp);