rpms/kernel/F-11 drm-intel-include-965gme-pci-id.patch, NONE, 1.1 kernel.spec, 1.1612, 1.1613
Kyle McMartin
kyle at fedoraproject.org
Mon May 18 20:27:14 UTC 2009
- Previous message (by thread): rpms/kmplayer/F-11 .cvsignore, 1.4, 1.5 kmplayer.spec, 1.12, 1.13 sources, 1.4, 1.5
- Next message (by thread): rpms/python-cheetah/devel .cvsignore, 1.7, 1.8 python-cheetah.spec, 1.18, 1.19 sources, 1.7, 1.8 python-cheetah-import.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18864
Modified Files:
kernel.spec
Added Files:
drm-intel-include-965gme-pci-id.patch
Log Message:
* Mon May 18 2009 Kyle McMartin <kyle at redhat.com>
- drm-intel-include-965gme-pci-id.patch: add patch patch from git head to
treat 965GME like 965GM.
drm-intel-include-965gme-pci-id.patch:
--- NEW FILE drm-intel-include-965gme-pci-id.patch ---
From: Ma Ling <ling.ma at intel.com>
Date: Wed, 13 May 2009 07:08:27 +0000 (+0800)
Subject: drm/i915: Include 965GME pci ID in IS_I965GM(dev) to match UMS.
X-Git-Tag: v2.6.30-rc6~3^2~2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c9ed4486bdee3b54cb544fc181057bc6bf1ae45c
drm/i915: Include 965GME pci ID in IS_I965GM(dev) to match UMS.
It fixed bug #21659
Signed-off-by: Ma Ling <ling.ma at intel.com>
[anholt: hand-applied because git-am is too picky]
Signed-off-by: Eric Anholt <eric at anholt.net>
---
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b47af07..9b149fe 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -786,7 +786,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
(dev)->pci_device == 0x2E22 || \
(dev)->pci_device == 0x2E32)
-#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
+#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02 || \
+ (dev)->pci_device == 0x2A12)
#define IS_GM45(dev) ((dev)->pci_device == 0x2A42)
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1612
retrieving revision 1.1613
diff -u -p -r1.1612 -r1.1613
--- kernel.spec 18 May 2009 17:43:45 -0000 1.1612
+++ kernel.spec 18 May 2009 20:26:44 -0000 1.1613
@@ -700,6 +700,7 @@ Patch1826: drm-intel-next.patch
Patch1828: drm-intel-debugfs-ringbuffer.patch
Patch1829: drm-edid-ignore-tiny-modes.patch
Patch1830: linux-2.6.29.3-boot-vga.patch
+Patch1831: drm-intel-include-965gme-pci-id.patch
# kludge to make ich9 e1000 work
Patch2000: linux-2.6-e1000-ich9.patch
@@ -1366,6 +1367,7 @@ ApplyPatch drm-intel-tiling-transition.p
ApplyPatch drm-intel-next.patch
ApplyPatch drm-intel-debugfs-ringbuffer.patch
ApplyPatch drm-edid-ignore-tiny-modes.patch
+ApplyPatch drm-intel-include-965gme-pci-id.patch
ApplyPatch linux-2.6.29.3-boot-vga.patch
# linux1394 git patches
@@ -1991,6 +1993,10 @@ fi
# and build.
%changelog
+* Mon May 18 2009 Kyle McMartin <kyle at redhat.com>
+- drm-intel-include-965gme-pci-id.patch: add patch patch from git head to
+ treat 965GME like 965GM.
+
* Mon May 18 2009 Adam Jackson <ajax at redhat.com>
- Expose whether VGA devices were active at boot or not in sysfs.
- Previous message (by thread): rpms/kmplayer/F-11 .cvsignore, 1.4, 1.5 kmplayer.spec, 1.12, 1.13 sources, 1.4, 1.5
- Next message (by thread): rpms/python-cheetah/devel .cvsignore, 1.7, 1.8 python-cheetah.spec, 1.18, 1.19 sources, 1.7, 1.8 python-cheetah-import.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list