rpms/kernel/F-10 drm-intel-8xx-pae-no-gem.patch, NONE, 1.1 kernel.spec, 1.1140, 1.1141
Dave Airlie
airlied at fedoraproject.org
Thu Nov 13 08:59:48 UTC 2008
- Previous message (by thread): rpms/xmlrpc-c/F-8 xmlrpc-c.spec, 1.20, 1.21 0001-make-cmake-transition.txt, 1.11, 1.12
- Next message (by thread): rpms/man-pages/devel .cvsignore, 1.54, 1.55 man-pages.spec, 1.105, 1.106 sources, 1.53, 1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26245
Modified Files:
kernel.spec
Added Files:
drm-intel-8xx-pae-no-gem.patch
Log Message:
- drm-intel-8xx-pae-no-gem.patch - initial disable GEM on 8xx and PAE (#461205)
drm-intel-8xx-pae-no-gem.patch:
--- NEW FILE drm-intel-8xx-pae-no-gem.patch ---
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 1ce3296..e3b4ee2 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -717,7 +717,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
value = dev->pci_device;
break;
case I915_PARAM_HAS_GEM:
- value = 1;
+ value = dev_priv->has_gem;
break;
default:
DRM_ERROR("Unknown parameter %d\n", param->param);
@@ -830,6 +830,17 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
dev_priv->regs = ioremap(base, size);
+ /* don't enable GEM on PAE or 8xx */
+#ifdef CONFIG_HIGHMEM64G
+ has_gem = 0;
+#else
+ if (IS_I830(dev) || IS_I845G(dev) || IS_I85X(dev) ||
+ IS_I855(dev) || IS_I865G(dev))
+ dev-priv->has_gem = 0;
+ else
+ dev_priv->has_gem = 1;
+#endif
+
i915_gem_load(dev);
/* Init HWS */
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index c829f24..fd4f467 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -111,6 +111,8 @@ typedef struct drm_i915_private {
void __iomem *regs;
+ int has_gem;
+
drm_i915_ring_buffer_t ring;
drm_dma_handle_t *status_page_dmah;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1140
retrieving revision 1.1141
diff -u -r1.1140 -r1.1141
--- kernel.spec 13 Nov 2008 06:51:06 -0000 1.1140
+++ kernel.spec 13 Nov 2008 08:59:17 -0000 1.1141
@@ -662,6 +662,7 @@
Patch1813: drm-modesetting-radeon.patch
Patch1814: drm-modesetting-i915.patch
Patch1815: drm-nouveau.patch
+Patch1816: drm-intel-8xx-pae-no-gem.patch
# kludge to make ich9 e1000 work
Patch2000: linux-2.6-e1000-ich9.patch
@@ -1308,6 +1309,7 @@
ApplyPatch drm-modesetting-radeon.patch
#ApplyPatch drm-modesetting-i915.patch
ApplyPatch drm-nouveau.patch
+ApplyPatch drm-intel-8xx-pae-no-gem.patch
# linux1394 git patches
ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1919,6 +1921,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Wed Nov 12 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-105
+- drm-intel-8xx-pae-no-gem.patch - initial disable GEM on 8xx and PAE (#461205)
+
* Wed Nov 12 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-104
- radeon - fix issues with nomodeset + newest intel irq patches
- Previous message (by thread): rpms/xmlrpc-c/F-8 xmlrpc-c.spec, 1.20, 1.21 0001-make-cmake-transition.txt, 1.11, 1.12
- Next message (by thread): rpms/man-pages/devel .cvsignore, 1.54, 1.55 man-pages.spec, 1.105, 1.106 sources, 1.53, 1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list