rpms/kernel/F-10 drm-fix-master-enable.patch, NONE, 1.1 kernel.spec, 1.1202, 1.1203

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31628

Modified Files:
	kernel.spec 
Added Files:
	drm-fix-master-enable.patch 
Log Message:
* Tue Dec 23 2008 Dave Airlie <airlied at redhat.com> 2.6.27.10-167
- drm - fix issue with second driver opening DRI


drm-fix-master-enable.patch:

--- NEW FILE drm-fix-master-enable.patch ---
>From 5dadbc20df95f6ae99b01e076a9e7d5bdd852c1a Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at redhat.com>
Date: Fri, 19 Dec 2008 11:01:33 +1000
Subject: [PATCH] drm: fix problem with master enable

---
 drivers/gpu/drm/drm_drv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 64907a6..6cbfbd8 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -512,7 +512,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
 		retcode = -EINVAL;
 	} else if (((ioctl->flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)) ||
 		   ((ioctl->flags & DRM_AUTH) && !file_priv->authenticated) ||
-		   ((ioctl->flags & DRM_MASTER) && !file_priv->master)) {
+		   ((ioctl->flags & DRM_MASTER) && !file_priv->is_master)) {
 		retcode = -EACCES;
 	} else {
 		if (cmd & (IOC_IN | IOC_OUT)) {
-- 
1.6.0.3



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1202
retrieving revision 1.1203
diff -u -r1.1202 -r1.1203
--- kernel.spec	22 Dec 2008 20:10:57 -0000	1.1202
+++ kernel.spec	22 Dec 2008 20:48:33 -0000	1.1203
@@ -681,6 +681,7 @@
 Patch1813: drm-modesetting-radeon.patch
 Patch1815: drm-nouveau.patch
 Patch1816: drm-intel-8xx-pae-no-gem.patch
+Patch1817: drm-fix-master-enable.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1324,6 +1325,7 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.patch
 ApplyPatch drm-intel-8xx-pae-no-gem.patch
+ApplyPatch drm-fix-master-enable.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1932,6 +1934,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Dec 23 2008 Dave Airlie <airlied at redhat.com> 2.6.27.10-167
+- drm - fix issue with second driver opening DRI
+
 * Mon Dec 22 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.10-166
 - Hopefully fix broken headphone output on some Dell notebooks.