rpms/xorg-x11-drv-intel/devel intel-2.8.0-kms-get-crtc.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 copy-fb.patch, 1.4, 1.5 sources, 1.5, 1.6 xorg-x11-drv-intel.spec, 1.14, 1.15 intel-2.6.99.902-kms-get-crtc.patch, 1.2, NONE intel-2.7-dont-vsync-xv.patch, 1.1, NONE intel-2.7.0-lvds-default-modes.patch, 1.1, NONE
Adam Jackson
ajax at fedoraproject.org
Tue Jul 14 14:15:12 UTC 2009
- Previous message (by thread): rpms/chmsee/F-11 chmsee-1.0.1-desktop-icon.patch, 1.2, 1.3 chmsee-1.0.1-xulrunner-1.9.patch, 1.3, 1.4 chmsee.spec, 1.33, 1.34 sources, 1.6, 1.7
- Next message (by thread): rpms/python-setuptools/devel svn_versioning_4.patch, NONE, 1.1 python-setuptools.spec, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12015
Modified Files:
.cvsignore copy-fb.patch sources xorg-x11-drv-intel.spec
Added Files:
intel-2.8.0-kms-get-crtc.patch
Removed Files:
intel-2.6.99.902-kms-get-crtc.patch
intel-2.7-dont-vsync-xv.patch
intel-2.7.0-lvds-default-modes.patch
Log Message:
* Tue Jul 14 2009 Adam Jackson <ajax at redhat.com> 2.8.0-0.2
- Today's git snapshots (driver and gpu tools)
- intel-2.7-dont-vsync-xv.patch: Drop, should be working now.
intel-2.8.0-kms-get-crtc.patch:
--- NEW FILE intel-2.8.0-kms-get-crtc.patch ---
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
return TRUE;
}
+#ifdef RANDR_GET_CRTC_INTERFACE
+static xf86CrtcPtr
+drmmode_get_crtc(xf86OutputPtr output)
+{
+ return output->crtc;
+}
+#endif
+
static const xf86OutputFuncsRec drmmode_output_funcs = {
.create_resources = drmmode_output_create_resources,
+#ifdef RANDR_GET_CRTC_INTERFACE
+ .get_crtc = drmmode_get_crtc,
+#endif
#ifdef RANDR_12_INTERFACE
.set_property = drmmode_output_set_property,
#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 24 Jun 2009 18:31:04 -0000 1.4
+++ .cvsignore 14 Jul 2009 14:15:12 -0000 1.5
@@ -1,3 +1,5 @@
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
copy-fb.patch:
Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- copy-fb.patch 24 Jun 2009 18:31:04 -0000 1.4
+++ copy-fb.patch 14 Jul 2009 14:15:12 -0000 1.5
@@ -1,16 +1,16 @@
-diff -up xf86-video-intel-20090624/src/drmmode_display.c.jx xf86-video-intel-20090624/src/drmmode_display.c
---- xf86-video-intel-20090624/src/drmmode_display.c.jx 2009-06-24 13:57:46.000000000 -0400
-+++ xf86-video-intel-20090624/src/drmmode_display.c 2009-06-24 13:59:20.000000000 -0400
-@@ -29,6 +29,8 @@
- #include "config.h"
- #endif
+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 @@
+
+ #include <errno.h>
+#include <sys/ioctl.h>
+
#include "xorgVersion.h"
#include "i830.h"
-@@ -163,7 +165,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
+@@ -165,7 +167,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-20090624/src/d
pScrn->virtualX, pScrn->virtualY,
pScrn->depth, pScrn->bitsPerPixel,
pitch, pI830->front_buffer->bo->handle,
-@@ -728,6 +730,13 @@ drmmode_output_dpms(xf86OutputPtr output
+@@ -736,6 +738,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-20090624/src/d
for (i = 0; i < koutput->count_props; i++) {
props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-@@ -1073,6 +1082,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
+@@ -1087,6 +1096,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
if (old_front)
i830_free_memory(scrn, old_front);
@@ -42,7 +42,7 @@ diff -up xf86-video-intel-20090624/src/d
return TRUE;
fail:
-@@ -1129,3 +1140,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
+@@ -1146,3 +1157,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-20090624/src/d
+ (*pScreen->DestroyPixmap)(dst);
+}
+
-diff -up xf86-video-intel-20090624/src/i830_driver.c.jx xf86-video-intel-20090624/src/i830_driver.c
---- xf86-video-intel-20090624/src/i830_driver.c.jx 2009-06-23 18:35:41.000000000 -0400
-+++ xf86-video-intel-20090624/src/i830_driver.c 2009-06-24 13:57:58.000000000 -0400
-@@ -3097,6 +3097,8 @@ I830EnterVT(int scrnIndex, int flags)
+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)
/* Clear the framebuffer */
memset(pI830->FbBase + pScrn->fbOffset, 0,
pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -153,14 +153,14 @@ diff -up xf86-video-intel-20090624/src/i
}
if (!xf86SetDesiredModes (pScrn))
-diff -up xf86-video-intel-20090624/src/i830.h.jx xf86-video-intel-20090624/src/i830.h
---- xf86-video-intel-20090624/src/i830.h.jx 2009-06-23 18:35:41.000000000 -0400
-+++ xf86-video-intel-20090624/src/i830.h 2009-06-24 13:59:49.000000000 -0400
-@@ -691,6 +691,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
-
+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
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);
- extern Bool I830AccelInit(ScreenPtr pScreen);
- extern void I830SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir,
+ extern Bool i830_crtc_on(xf86CrtcPtr crtc);
+ extern int i830_crtc_to_pipe(xf86CrtcPtr crtc);
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 24 Jun 2009 18:31:04 -0000 1.5
+++ sources 14 Jul 2009 14:15:12 -0000 1.6
@@ -1,2 +1,2 @@
-df3d898b00c84228c37ecb454a6e63e7 intel-gpu-tools-20090624.tar.bz2
-2892648278871dad4d2d151534d4c596 xf86-video-intel-20090624.tar.bz2
+9a71381224168221894ec723bf6a98e0 intel-gpu-tools-20090714.tar.bz2
+113887c4aed49f05647e351055051d8b xf86-video-intel-20090714.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.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xorg-x11-drv-intel.spec 24 Jun 2009 18:31:04 -0000 1.14
+++ xorg-x11-drv-intel.spec 14 Jul 2009 14:15:12 -0000 1.15
@@ -2,13 +2,13 @@
%define legacyver 2.6.0-8
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
-%define gputoolsdate 20090624
-%define gitdate 20090624
+%define gputoolsdate 20090714
+%define gitdate 20090714
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
Version: 2.8.0
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -25,11 +25,7 @@ Patch1: kill-svideo.patch
Patch2: copy-fb.patch
# needs to be upstreamed
-Patch20: intel-2.6.99.902-kms-get-crtc.patch
-Patch21: intel-2.7.0-lvds-default-modes.patch
-
-# Disable xv vsync, it locks up the GPU
-Patch22: intel-2.7-dont-vsync-xv.patch
+Patch20: intel-2.8.0-kms-get-crtc.patch
ExclusiveArch: %{ix86} x86_64 ia64
@@ -74,13 +70,6 @@ Debugging tools for Intel graphics chips
%patch2 -p1 -b .copy-fb
%patch20 -p1 -b .get-crtc
-# notyet. we don't handle switching in and out of tiled front buffer
-# correctly yet, so let's not have people stumble into it more than
-# they have to.
-#patch21 -p1 -b .jx
-
-%patch22 -p1 -b .xv-vsync
-
%build
%if 0%{?gitdate}
@@ -135,6 +124,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/intel_*.1*
%changelog
+* Tue Jul 14 2009 Adam Jackson <ajax at redhat.com> 2.8.0-0.2
+- Today's git snapshots (driver and gpu tools)
+- intel-2.7-dont-vsync-xv.patch: Drop, should be working now.
+
* Wed Jun 24 2009 Adam Jackson <ajax at redhat.com> 2.8.0-0.1
- Today's git snapshots (driver and gpu tools)
--- intel-2.6.99.902-kms-get-crtc.patch DELETED ---
--- intel-2.7-dont-vsync-xv.patch DELETED ---
--- intel-2.7.0-lvds-default-modes.patch DELETED ---
- Previous message (by thread): rpms/chmsee/F-11 chmsee-1.0.1-desktop-icon.patch, 1.2, 1.3 chmsee-1.0.1-xulrunner-1.9.patch, 1.3, 1.4 chmsee.spec, 1.33, 1.34 sources, 1.6, 1.7
- Next message (by thread): rpms/python-setuptools/devel svn_versioning_4.patch, NONE, 1.1 python-setuptools.spec, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list