rpms/xorg-x11-drv-intel/devel .cvsignore, 1.7, 1.8 copy-fb.patch, 1.5, 1.6 dri2-page-flip.patch, 1.2, 1.3 intel-2.8.0-kms-get-crtc.patch, 1.1, 1.2 sources, 1.8, 1.9 xorg-x11-drv-intel.spec, 1.27, 1.28
Adam Jackson
ajax at fedoraproject.org
Tue Sep 8 18:38:53 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30032
Modified Files:
.cvsignore copy-fb.patch dri2-page-flip.patch
intel-2.8.0-kms-get-crtc.patch sources xorg-x11-drv-intel.spec
Log Message:
* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-11.20090908
- Today's git snap (driver and tools)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 12 Aug 2009 17:59:30 -0000 1.7
+++ .cvsignore 8 Sep 2009 18:38:52 -0000 1.8
@@ -1,7 +1,2 @@
-xf86-video-intel-2.6.99.902.tar.bz2
-intel-gpu-tools-20090624.tar.bz2
-xf86-video-intel-20090624.tar.bz2
-intel-gpu-tools-20090714.tar.bz2
-xf86-video-intel-20090714.tar.bz2
-xf86-video-intel-2.8.0.tar.bz2
-xf86-video-intel-20090812.tar.bz2
+intel-gpu-tools-20090908.tar.bz2
+xf86-video-intel-20090908.tar.bz2
copy-fb.patch:
drmmode_display.c | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
i830.h | 1
i830_driver.c | 2 +
3 files changed, 110 insertions(+), 1 deletion(-)
Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- copy-fb.patch 14 Jul 2009 14:15:12 -0000 1.5
+++ copy-fb.patch 8 Sep 2009 18:38:52 -0000 1.6
@@ -1,8 +1,8 @@
-diff -up xf86-video-intel-20090714/src/drmmode_display.c.jx xf86-video-intel-20090714/src/drmmode_display.c
---- xf86-video-intel-20090714/src/drmmode_display.c.jx 2009-07-14 10:10:48.000000000 -0400
-+++ xf86-video-intel-20090714/src/drmmode_display.c 2009-07-14 10:10:58.000000000 -0400
-@@ -31,6 +31,8 @@
-
+diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
+--- xf86-video-intel-20090908/src/drmmode_display.c.jx 2009-09-08 14:29:35.000000000 -0400
++++ xf86-video-intel-20090908/src/drmmode_display.c 2009-09-08 14:29:52.000000000 -0400
+@@ -35,6 +35,8 @@
+ #include <unistd.h>
#include <errno.h>
+#include <sys/ioctl.h>
@@ -10,7 +10,7 @@ diff -up xf86-video-intel-20090714/src/d
#include "xorgVersion.h"
#include "i830.h"
-@@ -165,7 +167,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
+@@ -314,7 +316,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-20090714/src/d
pScrn->virtualX, pScrn->virtualY,
pScrn->depth, pScrn->bitsPerPixel,
pitch, pI830->front_buffer->bo->handle,
-@@ -736,6 +738,13 @@ drmmode_output_dpms(xf86OutputPtr output
+@@ -912,6 +914,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-20090714/src/d
for (i = 0; i < koutput->count_props; i++) {
props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-@@ -1087,6 +1096,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
+@@ -1363,6 +1372,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
if (old_front)
i830_free_memory(scrn, old_front);
@@ -42,7 +42,7 @@ diff -up xf86-video-intel-20090714/src/d
return TRUE;
fail:
-@@ -1146,3 +1157,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
+@@ -1422,3 +1433,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
}
@@ -141,10 +141,10 @@ diff -up xf86-video-intel-20090714/src/d
+ (*pScreen->DestroyPixmap)(dst);
+}
+
-diff -up xf86-video-intel-20090714/src/i830_driver.c.jx xf86-video-intel-20090714/src/i830_driver.c
---- xf86-video-intel-20090714/src/i830_driver.c.jx 2009-07-13 19:38:34.000000000 -0400
-+++ xf86-video-intel-20090714/src/i830_driver.c 2009-07-14 10:10:58.000000000 -0400
-@@ -3057,6 +3057,8 @@ I830EnterVT(int scrnIndex, int flags)
+diff -up xf86-video-intel-20090908/src/i830_driver.c.jx xf86-video-intel-20090908/src/i830_driver.c
+--- xf86-video-intel-20090908/src/i830_driver.c.jx 2009-09-05 06:06:44.000000000 -0400
++++ xf86-video-intel-20090908/src/i830_driver.c 2009-09-08 14:29:52.000000000 -0400
+@@ -3049,6 +3049,8 @@ I830EnterVT(int scrnIndex, int flags)
/* Clear the framebuffer */
memset(pI830->FbBase + pScrn->fbOffset, 0,
pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -153,14 +153,14 @@ diff -up xf86-video-intel-20090714/src/i
}
if (!xf86SetDesiredModes (pScrn))
-diff -up xf86-video-intel-20090714/src/i830.h.jx xf86-video-intel-20090714/src/i830.h
---- xf86-video-intel-20090714/src/i830.h.jx 2009-07-13 19:38:34.000000000 -0400
-+++ xf86-video-intel-20090714/src/i830.h 2009-07-14 10:11:17.000000000 -0400
-@@ -685,6 +685,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
+diff -up xf86-video-intel-20090908/src/i830.h.jx xf86-video-intel-20090908/src/i830.h
+--- xf86-video-intel-20090908/src/i830.h.jx 2009-09-05 06:06:44.000000000 -0400
++++ xf86-video-intel-20090908/src/i830.h 2009-09-08 14:30:14.000000000 -0400
+@@ -693,6 +693,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
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 int drmmode_output_dpms_status(xf86OutputPtr output);
+extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
+ void
+ drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor);
- extern Bool i830_crtc_on(xf86CrtcPtr crtc);
- extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
dri2-page-flip.patch:
drmmode_display.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
i830.h | 6 ++
i830_dri.c | 62 ++++++++++++++++++++++++--
i830_dri.h | 6 ++
4 files changed, 194 insertions(+), 6 deletions(-)
Index: dri2-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/dri2-page-flip.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dri2-page-flip.patch 12 Aug 2009 17:59:30 -0000 1.2
+++ dri2-page-flip.patch 8 Sep 2009 18:38:52 -0000 1.3
@@ -1,15 +1,15 @@
-diff -up xf86-video-intel-20090812/src/drmmode_display.c.flip xf86-video-intel-20090812/src/drmmode_display.c
---- xf86-video-intel-20090812/src/drmmode_display.c.flip 2009-08-12 10:24:52.000000000 -0400
-+++ xf86-video-intel-20090812/src/drmmode_display.c 2009-08-12 10:30:42.000000000 -0400
-@@ -30,6 +30,7 @@
- #endif
-
+diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
+--- xf86-video-intel-20090908/src/drmmode_display.c.jx 2009-09-08 14:32:21.000000000 -0400
++++ xf86-video-intel-20090908/src/drmmode_display.c 2009-09-08 14:32:29.000000000 -0400
+@@ -34,6 +34,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
#include <errno.h>
+#include <poll.h>
#include <sys/ioctl.h>
-@@ -45,6 +46,11 @@ typedef struct {
+@@ -49,6 +50,11 @@ typedef struct {
uint32_t fb_id;
drmModeResPtr mode_res;
int cpp;
@@ -21,7 +21,7 @@ diff -up xf86-video-intel-20090812/src/d
} drmmode_rec, *drmmode_ptr;
typedef struct {
-@@ -345,6 +351,7 @@ static PixmapPtr
+@@ -496,6 +502,7 @@ static PixmapPtr
drmmode_crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
{
ScrnInfoPtr pScrn = crtc->scrn;
@@ -29,7 +29,7 @@ diff -up xf86-video-intel-20090812/src/d
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
unsigned long rotate_pitch;
-@@ -377,12 +384,16 @@ drmmode_crtc_shadow_create(xf86CrtcPtr c
+@@ -528,12 +535,16 @@ drmmode_crtc_shadow_create(xf86CrtcPtr c
if (drmmode_crtc->rotate_bo)
i830_set_pixmap_bo(rotate_pixmap, drmmode_crtc->rotate_bo);
@@ -46,7 +46,7 @@ diff -up xf86-video-intel-20090812/src/d
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
-@@ -400,6 +411,7 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr
+@@ -551,6 +562,7 @@ drmmode_crtc_shadow_destroy(xf86CrtcPtr
dri_bo_unreference(drmmode_crtc->rotate_bo);
drmmode_crtc->rotate_bo = NULL;
}
@@ -54,7 +54,7 @@ diff -up xf86-video-intel-20090812/src/d
}
static void
-@@ -1119,15 +1131,111 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
+@@ -1399,15 +1411,111 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
return FALSE;
}
@@ -167,7 +167,7 @@ diff -up xf86-video-intel-20090812/src/d
drmmode = xnfalloc(sizeof *drmmode);
drmmode->fd = fd;
-@@ -1167,6 +1275,22 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
+@@ -1447,6 +1555,22 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn,
xf86InitialConfiguration(pScrn, TRUE);
@@ -190,9 +190,9 @@ diff -up xf86-video-intel-20090812/src/d
return TRUE;
}
-diff -up xf86-video-intel-20090812/src/i830_dri.c.flip xf86-video-intel-20090812/src/i830_dri.c
---- xf86-video-intel-20090812/src/i830_dri.c.flip 2009-08-11 14:50:03.000000000 -0400
-+++ xf86-video-intel-20090812/src/i830_dri.c 2009-08-12 10:24:52.000000000 -0400
+diff -up xf86-video-intel-20090908/src/i830_dri.c.jx xf86-video-intel-20090908/src/i830_dri.c
+--- xf86-video-intel-20090908/src/i830_dri.c.jx 2009-09-05 06:06:44.000000000 -0400
++++ xf86-video-intel-20090908/src/i830_dri.c 2009-09-08 14:32:29.000000000 -0400
@@ -45,6 +45,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <errno.h>
#include <unistd.h>
@@ -283,9 +283,9 @@ diff -up xf86-video-intel-20090812/src/i
info.CopyRegion = I830DRI2CopyRegion;
return DRI2ScreenInit(pScreen, &info);
-diff -up xf86-video-intel-20090812/src/i830_dri.h.flip xf86-video-intel-20090812/src/i830_dri.h
---- xf86-video-intel-20090812/src/i830_dri.h.flip 2009-08-11 14:50:03.000000000 -0400
-+++ xf86-video-intel-20090812/src/i830_dri.h 2009-08-12 10:24:52.000000000 -0400
+diff -up xf86-video-intel-20090908/src/i830_dri.h.jx xf86-video-intel-20090908/src/i830_dri.h
+--- xf86-video-intel-20090908/src/i830_dri.h.jx 2009-09-05 06:06:44.000000000 -0400
++++ xf86-video-intel-20090908/src/i830_dri.h 2009-09-08 14:32:29.000000000 -0400
@@ -2,6 +2,7 @@
#ifndef _I830_DRI_H
#define _I830_DRI_H
@@ -304,9 +304,9 @@ diff -up xf86-video-intel-20090812/src/i
+} I830DRI2BufferPrivateRec, *I830DRI2BufferPrivatePtr;
+
#endif
-diff -up xf86-video-intel-20090812/src/i830.h.flip xf86-video-intel-20090812/src/i830.h
---- xf86-video-intel-20090812/src/i830.h.flip 2009-08-12 10:24:52.000000000 -0400
-+++ xf86-video-intel-20090812/src/i830.h 2009-08-12 10:24:52.000000000 -0400
+diff -up xf86-video-intel-20090908/src/i830.h.jx xf86-video-intel-20090908/src/i830.h
+--- xf86-video-intel-20090908/src/i830.h.jx 2009-09-08 14:32:21.000000000 -0400
++++ xf86-video-intel-20090908/src/i830.h 2009-09-08 14:32:29.000000000 -0400
@@ -65,6 +65,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#include "sarea.h"
#define _XF86DRI_SERVER_
@@ -339,5 +339,5 @@ diff -up xf86-video-intel-20090812/src/i
+extern Bool drmmode_do_pageflip(DrawablePtr pDraw, dri_bo *new_front,
+ dri_bo *old_front, void *data);
extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
-
- extern Bool i830_crtc_on(xf86CrtcPtr crtc);
+ void
+ drmmode_crtc_set_cursor_bo(xf86CrtcPtr crtc, dri_bo *cursor);
intel-2.8.0-kms-get-crtc.patch:
drmmode_display.c | 11 +++++++++++
1 file changed, 11 insertions(+)
Index: intel-2.8.0-kms-get-crtc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/intel-2.8.0-kms-get-crtc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- intel-2.8.0-kms-get-crtc.patch 14 Jul 2009 14:15:12 -0000 1.1
+++ intel-2.8.0-kms-get-crtc.patch 8 Sep 2009 18:38:52 -0000 1.2
@@ -1,7 +1,7 @@
-diff -up xf86-video-intel-20090714/src/drmmode_display.c.jx xf86-video-intel-20090714/src/drmmode_display.c
---- xf86-video-intel-20090714/src/drmmode_display.c.jx 2009-07-14 10:13:10.000000000 -0400
-+++ xf86-video-intel-20090714/src/drmmode_display.c 2009-07-14 10:13:28.000000000 -0400
-@@ -923,8 +923,19 @@ drmmode_output_set_property(xf86OutputPt
+diff -up xf86-video-intel-20090908/src/drmmode_display.c.jx xf86-video-intel-20090908/src/drmmode_display.c
+--- xf86-video-intel-20090908/src/drmmode_display.c.jx 2009-09-08 14:30:55.000000000 -0400
++++ xf86-video-intel-20090908/src/drmmode_display.c 2009-09-08 14:31:09.000000000 -0400
+@@ -1195,8 +1195,19 @@ drmmode_output_get_property(xf86OutputPt
return TRUE;
}
@@ -20,4 +20,4 @@ diff -up xf86-video-intel-20090714/src/d
+#endif
#ifdef RANDR_12_INTERFACE
.set_property = drmmode_output_set_property,
- #endif
+ .get_property = drmmode_output_get_property,
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 12 Aug 2009 17:59:30 -0000 1.8
+++ sources 8 Sep 2009 18:38:52 -0000 1.9
@@ -1,2 +1,2 @@
-9a71381224168221894ec723bf6a98e0 intel-gpu-tools-20090714.tar.bz2
-ddb8d64e005e8ce2f9f2071ccabba86b xf86-video-intel-20090812.tar.bz2
+d64507d329cff1228f8a88ec2e9f58cb intel-gpu-tools-20090908.tar.bz2
+c400809c9288d9b973849f4f284b799c xf86-video-intel-20090908.tar.bz2
Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- xorg-x11-drv-intel.spec 8 Sep 2009 18:14:22 -0000 1.27
+++ xorg-x11-drv-intel.spec 8 Sep 2009 18:38:52 -0000 1.28
@@ -2,13 +2,13 @@
%define legacyver 2.6.0-8
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
-%define gputoolsdate 20090714
-%define gitdate 20090812
+%define gputoolsdate 20090908
+%define gitdate 20090908
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
Version: 2.8.0
-Release: 10%{?dist}
+Release: 11.%{gitdate}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -30,7 +30,6 @@ Patch21: intel-2.8.0-lvds-first.patch
Patch40: dri2-page-flip.patch
-Patch50: intel-2.8.0-shadow-no-offset.patch
Patch60: uevent.patch
ExclusiveArch: %{ix86} x86_64 ia64
@@ -84,7 +83,6 @@ Debugging tools for Intel graphics chips
%patch20 -p1 -b .get-crtc
%patch21 -p1 -b .lvds-first
%patch40 -p1 -b .flip
-%patch50 -p1 -b .shadow-no-offset
%patch60 -p1 -b .uevent
%build
@@ -141,6 +139,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/intel_*.1*
%changelog
+* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-11.20090908
+- Today's git snap (driver and tools)
+
* Tue Sep 08 2009 Adam Jackson <ajax at redhat.com> 2.8.0-10
- kill-svideo.patch: Treat svideo as unknown instead of disconnected.
More information about the fedora-extras-commits
mailing list