Merge branch 'asoc-5.3' into asoc-5.4

[J-linux.git] / drivers / gpu / drm / drm_legacy_misc.c

diff --git a/drivers/gpu/drm/drm_legacy_misc.c b/drivers/gpu/drm/drm_legacy_misc.c
index 2fe786839ca854ef3c60b6254f79da8a8a511bf9..4d3a11cfd97917243bed1eecbbe5dc10d75c13bf 100644 (file)
--- a/drivers/gpu/drm/drm_legacy_misc.c
+++ b/drivers/gpu/drm/drm_legacy_misc.c
@@ -33,7 +33,12 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <drm/drmP.h>
+#include <drm/drm_agpsupport.h>
+#include <drm/drm_device.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_irq.h>
+#include <drm/drm_print.h>
+
 #include "drm_internal.h"
 #include "drm_legacy.h"
 
@@ -51,6 +56,26 @@ void drm_legacy_destroy_members(struct drm_device *dev)
        mutex_destroy(&dev->ctxlist_mutex);
 }
 
+int drm_legacy_setup(struct drm_device * dev)
+{
+       int ret;
+
+       if (dev->driver->firstopen &&
+           drm_core_check_feature(dev, DRIVER_LEGACY)) {
+               ret = dev->driver->firstopen(dev);
+               if (ret != 0)
+                       return ret;
+       }
+
+       ret = drm_legacy_dma_setup(dev);
+       if (ret < 0)
+               return ret;
+
+
+       DRM_DEBUG("\n");
+       return 0;
+}
+
 void drm_legacy_dev_reinit(struct drm_device *dev)
 {
        if (dev->irq_enabled)