drm: don't call ->firstopen for KMS drivers

Commit Message

Daniel Vetter July 10, 2013, 6:17 p.m. UTC

It has way too much potential for driver writers to do stupid things
like delayed hw setup because the load sequence is somehow racy (e.g.
the imx driver in staging). So don't call it for modesetting drivers,
which reduces the complexity of the drm core -> driver interface a
notch.

v2: Don't forget to update DocBook.

Cc: Laurent Pinchart <[e-mail]>
Signed-off-by: Daniel Vetter <[e-mail]>
---
 Documentation/DocBook/drm.tmpl | 2 ++
 drivers/gpu/drm/drm_fops.c     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 4d54ac8..0e8a5a3 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -2423,6 +2423,8 @@  void (*postclose) (struct drm_device *, struct drm_file *);</synopsis>
       <para>
         The <methodname>firstopen</methodname> method is called by the DRM core
 	when an application opens a device that has no other opened file handle.
+	Not that this callback is only called for legacy ums drm drivers, not
+	for drm drivers that implement modesetting in the kernel.
 	Similarly the <methodname>lastclose</methodname> method is called when
 	the last application holding a file handle opened on the device closes
 	it. Both methods are mostly used for UMS (User Mode Setting) drivers to
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 57e3014..fcde7d4 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -51,7 +51,8 @@  static int drm_setup(struct drm_device * dev)
 	int i;
 	int ret;
 
-	if (dev->driver->firstopen) {
+	if (dev->driver->firstopen &&
+	    !drm_core_check_feature(dev, DRIVER_MODESET)) {
 		ret = dev->driver->firstopen(dev);
 		if (ret != 0)
 			return ret;