From: Dave Airlie <airlied@linux.ie>
Date: Wed, 5 Mar 2008 19:26:23 +0000 (+1000)
Subject: Merge branch 'master' of ../../drm into modesetting-101
X-Git-Tag: submit/1.0/20121108.012404~642^2~234^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e00dea812ddb9b483de9f58f7a7aa7105427512d;p=profile%2Fivi%2Flibdrm.git

Merge branch 'master' of ../../drm into modesetting-101

Conflicts:

	linux-core/drmP.h
	linux-core/drm_drv.c
	linux-core/drm_proc.c
	linux-core/drm_stub.c
	linux-core/drm_sysfs.c
---

e00dea812ddb9b483de9f58f7a7aa7105427512d
diff --cc linux-core/drmP.h
index 1a0a565,1fea807..4797485
--- a/linux-core/drmP.h
+++ b/linux-core/drmP.h
@@@ -761,9 -721,8 +761,10 @@@ struct drm_driver 
  };
  
  #define DRM_MINOR_UNASSIGNED 0
- #define DRM_MINOR_CONTROL 1
- #define DRM_MINOR_LEGACY 2
+ #define DRM_MINOR_LEGACY 1
++#define DRM_MINOR_CONTROL 2
 +#define DRM_MINOR_RENDER 3
+ 
  /**
   * DRM minor structure. This structure represents a drm minor number.
   */
diff --cc linux-core/drm_stub.c
index 6856075,6584f51..ba13e5e
--- a/linux-core/drm_stub.c
+++ b/linux-core/drm_stub.c
@@@ -344,17 -285,13 +344,21 @@@ int drm_get_dev(struct pci_dev *pdev, c
  	}
  
  	/* only add the control node on a modesetting platform */
 +	if (drm_core_check_feature(dev, DRIVER_MODESET))
 +		if ((ret = drm_get_minor(dev, &dev->control, DRM_MINOR_CONTROL)))
 +			goto err_g3;
 +
  	if ((ret = drm_get_minor(dev, &dev->primary, DRM_MINOR_LEGACY)))
 -		goto err_g3;
 +		goto err_g4;
 +
 +	if (dev->driver->load)
 +		if ((ret = dev->driver->load(dev, ent->driver_data)))
 +			goto err_g5;
  
+ 	if (dev->driver->load)
+ 		if ((ret = dev->driver->load(dev, ent->driver_data)))
+ 			goto err_g4;
+ 
  	DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
  		 driver->name, driver->major, driver->minor, driver->patchlevel,
  		 driver->date, dev->primary->index);