rpms/kernel/devel drm-modesetting-radeon.patch,1.15,1.16

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21930

Modified Files:
	drm-modesetting-radeon.patch 
Log Message:
* Thu Aug 28 2008 Dave Airlie <airlied at redhat.com>
- rebase modesetting patches - add DRI2 for intel patches from krh
- no intel modesetting yet didn't have time


drm-modesetting-radeon.patch:

Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- drm-modesetting-radeon.patch	28 Aug 2008 07:18:47 -0000	1.15
+++ drm-modesetting-radeon.patch	28 Aug 2008 08:34:19 -0000	1.16
@@ -1,3 +1,9 @@
+commit cc2073a2981b46aaf1265996e7680f064f0364ee
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 28 18:31:50 2008 +1000
+
+    drm: fix dev->master convert
+
 commit 031d3afcf12056f4e66e7ab57e84fea91f8e8ef9
 Author: Kristian Høgsberg <krh at redhat.com>
 Date:   Wed Aug 20 11:26:11 2008 -0400
@@ -11288,7 +11294,7 @@
  
  static int drm__vma_info(char *buf, char **start, off_t offset, int request,
 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index c2f584f..f21329c 100644
+index c2f584f..94bc8de 100644
 --- a/drivers/gpu/drm/drm_stub.c
 +++ b/drivers/gpu/drm/drm_stub.c
 @@ -57,6 +57,14 @@ static int drm_minor_get_id(struct drm_device *dev, int type)
@@ -11324,7 +11330,7 @@
 +	drm_ht_create(&master->magiclist, DRM_MAGIC_HASH_ORDER);
 +	INIT_LIST_HEAD(&master->magicfree);
 +	master->minor = minor;
-+	master->lock.hw_lock = &dev->default_lock;
++	master->lock.hw_lock = &minor->dev->default_lock;
 +
 +	list_add_tail(&master->head, &minor->master_list);
 +