From 8dd6a77972c49730f861c26e9fbffe48d1c5fa29 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Oct 26 2009 14:59:27 +0000 Subject: - intel 2.9.1 --- diff --git a/.cvsignore b/.cvsignore index d1b046b..e4d04c8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ xf86-video-intel-2.9.0.tar.bz2 intel-gpu-tools-20090908.tar.bz2 +xf86-video-intel-2.9.1.tar.bz2 diff --git a/copy-fb.patch b/copy-fb.patch index b20a122..2936cd7 100644 --- a/copy-fb.patch +++ b/copy-fb.patch @@ -1,6 +1,6 @@ -diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-intel-20090909/src/drmmode_display.c ---- xf86-video-intel-20090909/src/drmmode_display.c.copy-fb 2009-09-24 09:30:40.000000000 +1000 -+++ xf86-video-intel-20090909/src/drmmode_display.c 2009-09-24 09:30:56.000000000 +1000 +diff -up xf86-video-intel-2.9.1/src/drmmode_display.c.jx xf86-video-intel-2.9.1/src/drmmode_display.c +--- xf86-video-intel-2.9.1/src/drmmode_display.c.jx 2009-10-26 10:52:16.000000000 -0400 ++++ xf86-video-intel-2.9.1/src/drmmode_display.c 2009-10-26 10:52:34.000000000 -0400 @@ -35,6 +35,8 @@ #include #include @@ -10,7 +10,7 @@ diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-inte #include "xorgVersion.h" #include "i830.h" -@@ -314,7 +316,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, +@@ -315,7 +317,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, unsigned int pitch = pScrn->displayWidth * pI830->cpp; if (drmmode->fb_id == 0) { @@ -19,7 +19,7 @@ diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-inte pScrn->virtualX, pScrn->virtualY, pScrn->depth, pScrn->bitsPerPixel, pitch, pI830->front_buffer->bo->handle, -@@ -912,6 +914,13 @@ drmmode_output_dpms(xf86OutputPtr output +@@ -922,6 +924,13 @@ drmmode_output_dpms(xf86OutputPtr output drmmode_ptr drmmode = drmmode_output->drmmode; int i; drmModePropertyPtr props; @@ -33,7 +33,7 @@ diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-inte for (i = 0; i < koutput->count_props; i++) { props = drmModeGetProperty(drmmode->fd, koutput->props[i]); -@@ -1363,6 +1372,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr +@@ -1373,6 +1382,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr if (old_front) i830_free_memory(scrn, old_front); @@ -42,7 +42,7 @@ diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-inte return TRUE; fail: -@@ -1402,6 +1413,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, +@@ -1412,6 +1423,7 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, return FALSE; } @@ -50,9 +50,9 @@ diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-inte xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width, drmmode->mode_res->max_height); for (i = 0; i < drmmode->mode_res->count_crtcs; i++) -@@ -1422,3 +1434,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_ - - return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id); +@@ -1447,3 +1459,98 @@ void drmmode_closefb(ScrnInfoPtr scrn) + drmModeRmFB(drmmode->fd, drmmode->fb_id); + drmmode->fb_id = 0; } + +static PixmapPtr @@ -149,10 +149,10 @@ diff -up xf86-video-intel-20090909/src/drmmode_display.c.copy-fb xf86-video-inte + (*pScreen->DestroyPixmap)(dst); +} + -diff -up xf86-video-intel-20090909/src/i830_driver.c.copy-fb xf86-video-intel-20090909/src/i830_driver.c ---- xf86-video-intel-20090909/src/i830_driver.c.copy-fb 2009-09-09 21:40:15.000000000 +1000 -+++ xf86-video-intel-20090909/src/i830_driver.c 2009-09-24 09:30:40.000000000 +1000 -@@ -3054,6 +3054,8 @@ I830EnterVT(int scrnIndex, int flags) +diff -up xf86-video-intel-2.9.1/src/i830_driver.c.jx xf86-video-intel-2.9.1/src/i830_driver.c +--- xf86-video-intel-2.9.1/src/i830_driver.c.jx 2009-10-26 07:48:05.000000000 -0400 ++++ xf86-video-intel-2.9.1/src/i830_driver.c 2009-10-26 10:52:34.000000000 -0400 +@@ -3014,6 +3014,8 @@ I830EnterVT(int scrnIndex, int flags) /* Clear the framebuffer */ memset(pI830->FbBase + pScrn->fbOffset, 0, pScrn->virtualY * pScrn->displayWidth * pI830->cpp); @@ -161,12 +161,12 @@ diff -up xf86-video-intel-20090909/src/i830_driver.c.copy-fb xf86-video-intel-20 } if (!xf86SetDesiredModes (pScrn)) -diff -up xf86-video-intel-20090909/src/i830.h.copy-fb xf86-video-intel-20090909/src/i830.h ---- xf86-video-intel-20090909/src/i830.h.copy-fb 2009-09-09 21:40:15.000000000 +1000 -+++ xf86-video-intel-20090909/src/i830.h 2009-09-24 09:30:40.000000000 +1000 -@@ -694,6 +694,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre - extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp); +diff -up xf86-video-intel-2.9.1/src/i830.h.jx xf86-video-intel-2.9.1/src/i830.h +--- xf86-video-intel-2.9.1/src/i830.h.jx 2009-10-26 07:48:05.000000000 -0400 ++++ xf86-video-intel-2.9.1/src/i830.h 2009-10-26 10:52:34.000000000 -0400 +@@ -694,6 +694,7 @@ extern Bool drmmode_pre_init(ScrnInfoPtr extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc); + extern void drmmode_closefb(ScrnInfoPtr scrn); extern int drmmode_output_dpms_status(xf86OutputPtr output); +extern void drmmode_copy_fb(ScrnInfoPtr pScrn); void diff --git a/intel-2.8.0-build-fix.patch b/intel-2.8.0-build-fix.patch deleted file mode 100644 index 6d923d1..0000000 --- a/intel-2.8.0-build-fix.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up xf86-video-intel-2.8.0/uxa/uxa-priv.h.jx xf86-video-intel-2.8.0/uxa/uxa-priv.h ---- xf86-video-intel-2.8.0/uxa/uxa-priv.h.jx 2009-07-21 02:00:14.000000000 -0400 -+++ xf86-video-intel-2.8.0/uxa/uxa-priv.h 2009-07-21 11:39:10.000000000 -0400 -@@ -1,5 +1,4 @@ - /* -- * - * Copyright © 2000,2008 Keith Packard - * 2005 Zack Rusin, Trolltech - * -@@ -42,8 +41,7 @@ - #define NEED_EVENTS - #include - #ifdef MITSHM --#define _XSHM_SERVER_ --#include -+#include "shmint.h" - #endif - #include "scrnintstr.h" - #include "pixmapstr.h" -diff -up xf86-video-intel-2.8.0/src/ch7017/ch7017.c.jx xf86-video-intel-2.8.0/src/ch7017/ch7017.c ---- xf86-video-intel-2.8.0/src/ch7017/ch7017.c.jx 2009-07-21 02:00:14.000000000 -0400 -+++ xf86-video-intel-2.8.0/src/ch7017/ch7017.c 2009-07-21 12:34:56.000000000 -0400 -@@ -40,7 +40,7 @@ - #include "xf86i2c.h" - #include "xf86Crtc.h" - #define DPMS_SERVER --#include -+#include - - #include "../i2c_vid.h" - #include "ch7017_reg.h" -diff -up xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c.jx xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c ---- xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c.jx 2009-07-21 02:00:14.000000000 -0400 -+++ xf86-video-intel-2.8.0/src/ch7xxx/ch7xxx.c 2009-07-21 12:35:38.000000000 -0400 -@@ -40,7 +40,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include "xf86i2c.h" - #include "xf86Crtc.h" - #define DPMS_SERVER --#include -+#include - - #include "../i2c_vid.h" - #include "ch7xxx.h" -diff -up xf86-video-intel-2.8.0/src/ivch/ivch.c.jx xf86-video-intel-2.8.0/src/ivch/ivch.c ---- xf86-video-intel-2.8.0/src/ivch/ivch.c.jx 2009-07-21 02:00:14.000000000 -0400 -+++ xf86-video-intel-2.8.0/src/ivch/ivch.c 2009-07-21 12:36:00.000000000 -0400 -@@ -37,7 +37,7 @@ - #include "xf86i2c.h" - #include "xf86Crtc.h" - #define DPMS_SERVER --#include -+#include - #include - - #include "../i2c_vid.h" -diff -up xf86-video-intel-2.8.0/src/sil164/sil164.c.jx xf86-video-intel-2.8.0/src/sil164/sil164.c ---- xf86-video-intel-2.8.0/src/sil164/sil164.c.jx 2009-07-21 02:00:14.000000000 -0400 -+++ xf86-video-intel-2.8.0/src/sil164/sil164.c 2009-07-21 12:36:00.000000000 -0400 -@@ -41,7 +41,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN - #include "xf86i2c.h" - #include "xf86Crtc.h" - #define DPMS_SERVER --#include -+#include - - #include "../i2c_vid.h" - #include "sil164.h" -diff -up xf86-video-intel-2.8.0/src/tfp410/tfp410.c.jx xf86-video-intel-2.8.0/src/tfp410/tfp410.c ---- xf86-video-intel-2.8.0/src/tfp410/tfp410.c.jx 2009-07-21 02:00:14.000000000 -0400 -+++ xf86-video-intel-2.8.0/src/tfp410/tfp410.c 2009-07-21 12:36:00.000000000 -0400 -@@ -40,7 +40,7 @@ - #include "xf86i2c.h" - #include "xf86Crtc.h" - #define DPMS_SERVER --#include -+#include - - #include "../i2c_vid.h" - #include "tfp410.h" diff --git a/intel-2.8.0-shadow-no-offset.patch b/intel-2.8.0-shadow-no-offset.patch deleted file mode 100644 index 8403acf..0000000 --- a/intel-2.8.0-shadow-no-offset.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a28d5a18bc5805de201e61ba912f4c35e9e2339b Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= -Date: Thu, 20 Aug 2009 16:48:58 -0400 -Subject: [PATCH] kms: Don't use fb offset when using shadow buffer - ---- - src/drmmode_display.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 4fb20d9..af5e56b 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -366,8 +366,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - - - fb_id = drmmode->fb_id; -- if (drmmode_crtc->rotate_fb_id) -+ if (drmmode_crtc->rotate_fb_id) { - fb_id = drmmode_crtc->rotate_fb_id; -+ x = 0; -+ y = 0; -+ } - ret = drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, - fb_id, x, y, output_ids, output_count, &kmode); - if (ret) --- -1.6.2.2 - diff --git a/intel-abi-fix.patch b/intel-abi-fix.patch deleted file mode 100644 index bd634db..0000000 --- a/intel-abi-fix.patch +++ /dev/null @@ -1,191 +0,0 @@ -diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c -index 01e414f..6b27d05 100644 ---- a/src/ch7017/ch7017.c -+++ b/src/ch7017/ch7017.c -@@ -34,7 +34,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" -diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c -index 13ba102..cad507d 100644 ---- a/src/ch7xxx/ch7xxx.c -+++ b/src/ch7xxx/ch7xxx.c -@@ -34,7 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" -diff --git a/src/i810_driver.c b/src/i810_driver.c -index 4b8c459..f158f5d 100644 ---- a/src/i810_driver.c -+++ b/src/i810_driver.c -@@ -55,8 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" --#include "xf86RAC.h" - #include "xf86cmap.h" - #include "compiler.h" - #include "mibstore.h" -@@ -549,10 +547,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags) - - pI810->PciInfo = xf86GetPciInfoForEntity(pI810->pEnt->index); - -- if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone)) -- return FALSE; -- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; -- - /* Set pScrn->monitor */ - pScrn->monitor = pScrn->confScreen->monitor; - -@@ -937,9 +931,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags) - - /* We won't be using the VGA access after the probe */ - I810SetMMIOAccess(pI810); -- xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr); -- xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr); -- - return TRUE; - } - -diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c -index 12ffdd9..1c3ffc9 100644 ---- a/src/i810_hwmc.c -+++ b/src/i810_hwmc.c -@@ -41,7 +41,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "xf86PciInfo.h" - #include "xf86Pci.h" -diff --git a/src/i810_video.c b/src/i810_video.c -index 9528bc7..c82fcc9 100644 ---- a/src/i810_video.c -+++ b/src/i810_video.c -@@ -41,7 +41,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "xf86PciInfo.h" - #include "xf86Pci.h" -diff --git a/src/i830_driver.c b/src/i830_driver.c -index 33079fe..f701231 100644 ---- a/src/i830_driver.c -+++ b/src/i830_driver.c -@@ -51,8 +51,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" --#include "xf86RAC.h" - #include "xf86Priv.h" - #include "xf86cmap.h" - #include "compiler.h" -@@ -1540,13 +1538,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) - if (!i830_open_drm_master(pScrn)) - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to become DRM master.\n"); - -- -- if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) { -- PreInitCleanup(pScrn); -- return FALSE; -- } -- -- pScrn->racMemFlags = RAC_FB | RAC_COLORMAP; - pScrn->monitor = pScrn->confScreen->monitor; - pScrn->progClock = TRUE; - pScrn->rgbBits = 8; -@@ -1632,8 +1623,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) - - /* We won't be using the VGA access after the probe. */ - I830SetMMIOAccess(pI830); -- xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr); -- xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr); - } - - /* Load the dri2 module if requested. */ -diff --git a/src/i830_i2c.c b/src/i830_i2c.c -index 8392d0a..4ba073d 100644 ---- a/src/i830_i2c.c -+++ b/src/i830_i2c.c -@@ -31,8 +31,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" --#include "xf86RAC.h" - #include "xf86cmap.h" - #include "compiler.h" - #include "mibstore.h" -diff --git a/src/i830_video.c b/src/i830_video.c -index 92b6324..9fb0b56 100644 ---- a/src/i830_video.c -+++ b/src/i830_video.c -@@ -56,7 +56,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "xf86PciInfo.h" - #include "xf86Pci.h" -diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c -index 6712caa..7e0f145 100644 ---- a/src/i915_hwmc.c -+++ b/src/i915_hwmc.c -@@ -32,7 +32,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "xf86PciInfo.h" - #include "xf86Pci.h" -diff --git a/src/ivch/ivch.c b/src/ivch/ivch.c -index dffe334..79da11a 100644 ---- a/src/ivch/ivch.c -+++ b/src/ivch/ivch.c -@@ -31,7 +31,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" -diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c -index c90bed3..e43107a 100644 ---- a/src/sil164/sil164.c -+++ b/src/sil164/sil164.c -@@ -35,7 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" -diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c -index 4d3bb8a..a8985f7 100644 ---- a/src/tfp410/tfp410.c -+++ b/src/tfp410/tfp410.c -@@ -34,7 +34,6 @@ - - #include "xf86.h" - #include "xf86_OSproc.h" --#include "xf86Resources.h" - #include "compiler.h" - #include "miscstruct.h" - #include "xf86i2c.h" diff --git a/intel-chip-names.patch b/intel-chip-names.patch deleted file mode 100644 index bb02532..0000000 --- a/intel-chip-names.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -up xf86-video-intel-2.8.0/src/i810_driver.c.names xf86-video-intel-2.8.0/src/i810_driver.c ---- xf86-video-intel-2.8.0/src/i810_driver.c.names 2009-06-12 20:05:25.000000000 -0400 -+++ xf86-video-intel-2.8.0/src/i810_driver.c 2009-07-21 13:12:59.000000000 -0400 -@@ -175,8 +175,8 @@ static SymTabRec I810Chipsets[] = { - {PCI_CHIP_I945_G, "945G"}, - {PCI_CHIP_I945_GM, "945GM"}, - {PCI_CHIP_I945_GME, "945GME"}, -- {PCI_CHIP_IGD_GM, "IGD_GM"}, -- {PCI_CHIP_IGD_G, "IGD_G"}, -+ {PCI_CHIP_IGD_GM, "Pineview GM"}, -+ {PCI_CHIP_IGD_G, "Pineview G"}, - {PCI_CHIP_I965_G, "965G"}, - {PCI_CHIP_G35_G, "G35"}, - {PCI_CHIP_I965_Q, "965Q"}, -@@ -186,13 +186,13 @@ static SymTabRec I810Chipsets[] = { - {PCI_CHIP_G33_G, "G33"}, - {PCI_CHIP_Q35_G, "Q35"}, - {PCI_CHIP_Q33_G, "Q33"}, -- {PCI_CHIP_GM45_GM, "Mobile Intel® GM45 Express Chipset"}, -- {PCI_CHIP_IGD_E_G, "Intel Integrated Graphics Device"}, -+ {PCI_CHIP_GM45_GM, "GM45"}, -+ {PCI_CHIP_IGD_E_G, "4 Series"}, - {PCI_CHIP_G45_G, "G45/G43"}, - {PCI_CHIP_Q45_G, "Q45/Q43"}, - {PCI_CHIP_G41_G, "G41"}, -- {PCI_CHIP_IGDNG_D_G, "IGDNG_D"}, -- {PCI_CHIP_IGDNG_M_G, "IGDNG_M"}, -+ {PCI_CHIP_IGDNG_D_G, "Clarkdale"}, -+ {PCI_CHIP_IGDNG_M_G, "Arrandale"}, - {-1, NULL} - }; - -diff -up xf86-video-intel-2.8.0/src/i830_driver.c.names xf86-video-intel-2.8.0/src/i830_driver.c ---- xf86-video-intel-2.8.0/src/i830_driver.c.names 2009-07-21 12:37:18.000000000 -0400 -+++ xf86-video-intel-2.8.0/src/i830_driver.c 2009-07-21 13:12:57.000000000 -0400 -@@ -102,8 +102,8 @@ static SymTabRec I830Chipsets[] = { - {PCI_CHIP_I945_G, "945G"}, - {PCI_CHIP_I945_GM, "945GM"}, - {PCI_CHIP_I945_GME, "945GME"}, -- {PCI_CHIP_IGD_GM, "IGD"}, -- {PCI_CHIP_IGD_G, "IGD"}, -+ {PCI_CHIP_IGD_GM, "Pineview GM"}, -+ {PCI_CHIP_IGD_G, "Pineview G"}, - {PCI_CHIP_I965_G, "965G"}, - {PCI_CHIP_G35_G, "G35"}, - {PCI_CHIP_I965_Q, "965Q"}, -@@ -113,13 +113,13 @@ static SymTabRec I830Chipsets[] = { - {PCI_CHIP_G33_G, "G33"}, - {PCI_CHIP_Q35_G, "Q35"}, - {PCI_CHIP_Q33_G, "Q33"}, -- {PCI_CHIP_GM45_GM, "Mobile Intel® GM45 Express Chipset"}, -- {PCI_CHIP_IGD_E_G, "Intel Integrated Graphics Device"}, -+ {PCI_CHIP_GM45_GM, "GM45"}, -+ {PCI_CHIP_IGD_E_G, "4 Series"}, - {PCI_CHIP_G45_G, "G45/G43"}, - {PCI_CHIP_Q45_G, "Q45/Q43"}, - {PCI_CHIP_G41_G, "G41"}, -- {PCI_CHIP_IGDNG_D_G, "IGDNG_D"}, -- {PCI_CHIP_IGDNG_M_G, "IGDNG_M"}, -+ {PCI_CHIP_IGDNG_D_G, "Clarkdale"}, -+ {PCI_CHIP_IGDNG_M_G, "Arrandale"}, - {-1, NULL} - }; - -@@ -1051,10 +1051,10 @@ i830_detect_chipset(ScrnInfoPtr pScrn) - chipname = "945GME"; - break; - case PCI_CHIP_IGD_GM: -- chipname = "IGD"; -+ chipname = "Pineview GM"; - break; - case PCI_CHIP_IGD_G: -- chipname = "IGD"; -+ chipname = "Pineview G"; - break; - case PCI_CHIP_I965_G: - chipname = "965G"; -@@ -1084,10 +1084,10 @@ i830_detect_chipset(ScrnInfoPtr pScrn) - chipname = "Q33"; - break; - case PCI_CHIP_GM45_GM: -- chipname = "Mobile Intel® GM45 Express Chipset"; -+ chipname = "GM45"; - break; - case PCI_CHIP_IGD_E_G: -- chipname = "Intel Integrated Graphics Device"; -+ chipname = "4 Series"; - break; - case PCI_CHIP_G45_G: - chipname = "G45/G43"; -@@ -1099,10 +1099,10 @@ i830_detect_chipset(ScrnInfoPtr pScrn) - chipname = "G41"; - break; - case PCI_CHIP_IGDNG_D_G: -- chipname = "IGDNG_D"; -+ chipname = "Clarkdale"; - break; - case PCI_CHIP_IGDNG_M_G: -- chipname = "IGDNG_M"; -+ chipname = "Arrandale"; - break; - default: - chipname = "unknown chipset"; diff --git a/intel-gamma-fix.patch b/intel-gamma-fix.patch deleted file mode 100644 index 4c5f78e..0000000 --- a/intel-gamma-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index e8a6c01..110db40 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -363,6 +363,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - goto done; - #endif - -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,0,0,0) -+ crtc->funcs->gamma_set(crtc, crtc->gamma_red, crtc->gamma_green, -+ crtc->gamma_blue, crtc->gamma_size); -+#endif -+ - drmmode_ConvertToKMode(crtc->scrn, &kmode, mode); - - diff --git a/sources b/sources index b02d9c3..9adbfdb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -34ff2582993d64dddd62d0cb7b30d759 xf86-video-intel-2.9.0.tar.bz2 d64507d329cff1228f8a88ec2e9f58cb intel-gpu-tools-20090908.tar.bz2 +8951d0366c16991badb7f9050556f4f3 xf86-video-intel-2.9.1.tar.bz2 diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec index ab0eb9e..bf1cd26 100644 --- a/xorg-x11-drv-intel.spec +++ b/xorg-x11-drv-intel.spec @@ -6,15 +6,14 @@ Summary: Xorg X11 Intel video driver Name: xorg-x11-drv-intel -Version: 2.9.0 -Release: 3%{?dist} +Version: 2.9.1 +Release: 1%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 -Source0: xf86-video-intel-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 Source1: make-intel-gpu-tools-snapshot.sh Source2: intel.xinf Source3: intel-gpu-tools-%{gputoolsdate}.tar.bz2 @@ -22,7 +21,6 @@ Source4: make-git-snapshot.sh Patch1: kill-svideo.patch Patch2: copy-fb.patch -Patch3: intel-gamma-fix.patch # needs to be upstreamed Patch20: intel-2.8.0-kms-get-crtc.patch @@ -79,7 +77,6 @@ Debugging tools for Intel graphics chips %setup -q -n xf86-video-intel-%{dirsuffix} -b3 %patch1 -p1 -b .svideo %patch2 -p1 -b .copy-fb -%patch3 -p1 -b .gamma-fix %patch20 -p1 -b .get-crtc %patch21 -p1 -b .lvds-first %patch60 -p1 -b .uevent @@ -139,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/intel_*.1* %changelog +* Mon Oct 26 2009 Adam Jackson 2.9.1-1 +- intel 2.9.1 + * Fri Oct 09 2009 Dave Airlie 2.9.0-3 - set gamma on mode set major for kms