xserver-xorg-video-intel: Changes to 'upstream-experimental'
NEWS | 23 +++++++++++++++++++++++
configure.ac | 2 +-
src/drmmode_display.c | 20 ++++++++++++++++++++
src/i830.h | 1 +
src/i830_driver.c | 2 ++
src/i830_sdvo.c | 3 ---
uxa/uxa-render.c | 3 ++-
7 files changed, 49 insertions(+), 5 deletions(-)
New commits:
commit 9acf10762b5f3d3b1b33ea07792a936a25e45010
Author: Carl Worth <cworth@cworth.org>
Date: Mon Oct 26 04:53:13 2009 -0700
Update version to 2.9.1
diff --git a/configure.ac b/configure.ac
index 7d80c35..7390701 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-intel],
- 2.9.0,
+ 2.9.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-intel)
commit 61c89e56f361fa860f18985137d6bf53f48c16ac
Author: Carl Worth <cworth@cworth.org>
Date: Mon Oct 26 04:51:58 2009 -0700
NEWS: Add notes for the 2.9.1 release.
Thanks to everyone for providing nice descriptions of the bug fixe at:
http://wiki.x.org/wiki/Intel29Branch
diff --git a/NEWS b/NEWS
index e0033e2..062d6c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+Release 2.9.1 (2009-10-26)
+==========================
+We are pleased to announce a maintenance release (2.9.1) of the
+xf86-video-intel driver. This release comes one month after 2.9.0 and
+consists only of a few, hand-picked bug fixes since that release.
+
+Complete list of fixes in 2.9.1 compared to 2.9.0
+-------------------------------------------------
+ * Fix corruption and artifacts due to wrong colors in the colormap
+ with X server 1.7
+
+ * Fix incorrect rendering, such as missing scrollbar arrows in some
+ themes (http://bugs.freedesktop.org/show_bug.cgi?id=24459)
+
+ * Fix black screen when X server is reset
+ (https://bugs.freedesktop.org/show_bug.cgi?id=24383)
+
+ * Fix regressions detecting DVI monitors
+
+ http://bugs.freedesktop.org/show_bug.cgi?id=24255
+ http://bugs.freedesktop.org/show_bug.cgi?id=24282
+ http://bugs.freedesktop.org/show_bug.cgi?id=24458
+
Release 2.9.0 (2009-09-28)
==========================
We are pleased to announce the 2.9.0 release of the xf86-video-intel
commit 8e4fc7d3ba0baa6b680c685429060cb62a08f89f
Author: Carl Worth <cworth@cworth.org>
Date: Mon Oct 26 04:40:51 2009 -0700
Revert "Check whether the DVI-I/D is connected or disconnected based on EDID"
This reverts commit 02fe9be695f7e209944bd0f7b67950f93619feee as it
was causing regressions detecting DVI monitors for several people.
See:
http://bugs.freedesktop.org/show_bug.cgi?id=24458
http://bugs.freedesktop.org/show_bug.cgi?id=24458
http://bugs.freedesktop.org/show_bug.cgi?id=24458)
diff --git a/src/i830_sdvo.c b/src/i830_sdvo.c
index 5ffe0e8..8f3193b 100644
--- a/src/i830_sdvo.c
+++ b/src/i830_sdvo.c
@@ -1824,9 +1824,6 @@ i830_sdvo_detect(xf86OutputPtr output)
xf86MonPtr edid_mon;
/* Check EDID in DVI-I case */
edid_mon = xf86OutputGetEDID (output, intel_output->pDDCBus);
- /* when there is no EDID, it should be detected as disconnected */
- if (!edid_mon)
- return XF86OutputStatusDisconnected;
if (edid_mon && !DIGITAL(edid_mon->features.input_type)) {
xfree(edid_mon);
return XF86OutputStatusDisconnected;
commit 22b85d0198508a13273ab58fd5fa3a127880a0be
Author: Albert Damen <albrt@gmx.net>
Date: Wed Oct 7 21:55:42 2009 +0200
Drop frontbuffer from crtc in I830CloseScreen
By dropping the frontbuffer from the crtc, the new frontbuffer
can be properly added to the crtc when the xserver is reset.
Signed-off-by: Albert Damen <albrt@gmx.net>
(cherry picked from commit fcc2ee48b866b81c79315ff10189b56fc201539d)
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=24383
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 7845fc5..8ab8a4b 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1420,3 +1420,18 @@ drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc)
return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
}
+
+void drmmode_closefb(ScrnInfoPtr scrn)
+{
+ xf86CrtcConfigPtr xf86_config;
+ drmmode_crtc_private_ptr drmmode_crtc;
+ drmmode_ptr drmmode;
+
+ xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+ drmmode_crtc = xf86_config->crtc[0]->driver_private;
+ drmmode = drmmode_crtc->drmmode;
+
+ drmModeRmFB(drmmode->fd, drmmode->fb_id);
+ drmmode->fb_id = 0;
+}
diff --git a/src/i830.h b/src/i830.h
index 009641a..9d9335b 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -692,6 +692,7 @@ void I830DRI2CloseScreen(ScreenPtr pScreen);
extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
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);
void
drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor);
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 316a1fa..b2b1cb1 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -3079,6 +3079,8 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
}
if (pI830->front_buffer) {
i830_set_pixmap_bo(pScreen->GetScreenPixmap(pScreen), NULL);
+ if (pI830->use_drm_mode)
+ drmmode_closefb(pScrn);
i830_free_memory(pScrn, pI830->front_buffer);
pI830->front_buffer = NULL;
}
commit 7ccf084b7a281d8aa877f91401d3df7192da408c
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Oct 12 14:33:08 2009 +0100
uxa: Free the ScratchPixmapHeader after its associated Picture
Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24459
Intel Driver > 2.8: Cairo rendering bug, triggered in QtCurve GTK engine
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 7e8f32d0a7279dce1976f87612833d9092554cfe)
diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 4850185..bf1460f 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -360,8 +360,8 @@ uxa_picture_from_a1_pixman_image (ScreenPtr pScreen,
pSrc = CreatePicture (0, &pPixmap->drawable,
PictureMatchFormat (pScreen, 1, PICT_a1),
0, 0, serverClient, &error);
- FreeScratchPixmapHeader (pPixmap);
if (!pSrc) {
+ FreeScratchPixmapHeader (pPixmap);
FreePicture (pPicture, 0);
return 0;
}
@@ -373,6 +373,7 @@ uxa_picture_from_a1_pixman_image (ScreenPtr pScreen,
width, height);
FreePicture (pSrc, 0);
+ FreeScratchPixmapHeader (pPixmap);
return pPicture;
}
commit f858cbe246c5d3a788ae25551b49142c5cc91f1a
Author: Dave Airlie <airlied@redhat.com>
Date: Fri Oct 9 14:16:06 2009 +1000
drmmode: with 1.7 server, set mode major doesn't get gamma setup.
Noticed this on Fedora, where 1.7 server does gamma via the randr
codepaths however kms doesn't have this call which happens in the
non set_mode_major path.
probably should be backported to released drivers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 8a77877f9c2c6a8a1308bc1a3be9e7ad88bc7f49)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index e8a6c01..7845fc5 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);
Reply to: