rpms/xorg-x11-drv-intel/F-13 .cvsignore, 1.16, 1.17 sources, 1.17, 1.18 uevent.patch, 1.2, 1.3 xorg-x11-drv-intel.spec, 1.51, 1.52 intel-2.11.0-fix-rotate-flushing-965.patch, 1.1, NONE
Adam Jackson
ajax at fedoraproject.org
Fri Jun 25 15:44:12 UTC 2010
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9452
Modified Files:
.cvsignore sources uevent.patch xorg-x11-drv-intel.spec
Removed Files:
intel-2.11.0-fix-rotate-flushing-965.patch
Log Message:
* Fri Jun 25 2010 Adam Jackson <ajax at redhat.com> 2.12.0-1
- intel 2.12.0
- new gpu-tools snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-13/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore 16 Apr 2010 14:36:04 -0000 1.16
+++ .cvsignore 25 Jun 2010 15:44:11 -0000 1.17
@@ -6,3 +6,5 @@ intel-gpu-tools-20100326.tar.bz2
xf86-video-intel-20100326.tar.bz2
xf86-video-intel-2.11.0.tar.bz2
intel-gpu-tools-20100416.tar.bz2
+xf86-video-intel-2.12.0.tar.bz2
+intel-gpu-tools-20100625.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-13/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources 16 Apr 2010 14:36:05 -0000 1.17
+++ sources 25 Jun 2010 15:44:11 -0000 1.18
@@ -1,2 +1,2 @@
-91a8baa97c4c8c85d35291fea547dd15 xf86-video-intel-2.11.0.tar.bz2
-a0e559667d9f44029c9282c1c8083a67 intel-gpu-tools-20100416.tar.bz2
+8314def847dcdc4f2970e2d193054f96 xf86-video-intel-2.12.0.tar.bz2
+29d469beab04ee3ca8da86362b44a418 intel-gpu-tools-20100625.tar.bz2
uevent.patch:
Makefile.am | 2 -
i830.h | 5 +++
i830_driver.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 86 insertions(+), 2 deletions(-)
Index: uevent.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-13/uevent.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- uevent.patch 13 Jan 2010 10:15:51 -0000 1.2
+++ uevent.patch 25 Jun 2010 15:44:12 -0000 1.3
@@ -1,7 +1,7 @@
-diff -up xf86-video-intel-2.10.0/src/i830_driver.c.dave xf86-video-intel-2.10.0/src/i830_driver.c
---- xf86-video-intel-2.10.0/src/i830_driver.c.dave 2010-01-13 18:48:49.000000000 +1000
-+++ xf86-video-intel-2.10.0/src/i830_driver.c 2010-01-13 18:51:09.000000000 +1000
-@@ -83,6 +83,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
+diff -up xf86-video-intel-2.12.0/src/i830_driver.c.uevent xf86-video-intel-2.12.0/src/i830_driver.c
+--- xf86-video-intel-2.12.0/src/i830_driver.c.uevent 2010-06-24 16:29:49.000000000 -0400
++++ xf86-video-intel-2.12.0/src/i830_driver.c 2010-06-25 11:40:01.335975581 -0400
+@@ -81,6 +81,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "i915_drm.h"
#include <xf86drmMode.h>
@@ -10,7 +10,7 @@ diff -up xf86-video-intel-2.10.0/src/i83
#define BIT(x) (1 << (x))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#define NB_OF(x) (sizeof (x) / sizeof (*x))
-@@ -1167,6 +1169,80 @@ int i830_crtc_to_pipe(xf86CrtcPtr crtc)
+@@ -996,6 +998,80 @@ int i830_crtc_to_pipe(xf86CrtcPtr crtc)
return drmmode_get_pipe_from_crtc_id(intel->bufmgr, crtc);
}
@@ -91,16 +91,16 @@ diff -up xf86-video-intel-2.10.0/src/i83
static Bool
I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
{
-@@ -1425,6 +1501,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr
+@@ -1233,6 +1309,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr
intel->suspended = FALSE;
+ I830UeventInit(scrn);
+
- return TRUE;
+ return uxa_resources_init(screen);
}
-@@ -1529,7 +1607,8 @@ static Bool I830CloseScreen(int scrnInde
+@@ -1306,7 +1384,8 @@ static Bool I830CloseScreen(int scrnInde
{
ScrnInfoPtr scrn = xf86Screens[scrnIndex];
intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -110,9 +110,9 @@ diff -up xf86-video-intel-2.10.0/src/i83
if (scrn->vtSema == TRUE) {
I830LeaveVT(scrnIndex, 0);
}
-diff -up xf86-video-intel-2.10.0/src/i830.h.dave xf86-video-intel-2.10.0/src/i830.h
---- xf86-video-intel-2.10.0/src/i830.h.dave 2010-01-13 18:48:50.000000000 +1000
-+++ xf86-video-intel-2.10.0/src/i830.h 2010-01-13 18:50:01.000000000 +1000
+diff -up xf86-video-intel-2.12.0/src/i830.h.uevent xf86-video-intel-2.12.0/src/i830.h
+--- xf86-video-intel-2.12.0/src/i830.h.uevent 2010-06-24 16:29:49.000000000 -0400
++++ xf86-video-intel-2.12.0/src/i830.h 2010-06-25 11:39:15.665029821 -0400
@@ -47,6 +47,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
#ifndef _I830_H_
#define _I830_H_
@@ -122,7 +122,7 @@ diff -up xf86-video-intel-2.10.0/src/i83
#include "xf86_OSproc.h"
#include "compiler.h"
#include "xf86PciInfo.h"
-@@ -385,6 +387,9 @@ typedef struct intel_screen_private {
+@@ -432,6 +434,9 @@ typedef struct intel_screen_private {
*/
Bool fallback_debug;
unsigned debug_flush;
@@ -132,9 +132,9 @@ diff -up xf86-video-intel-2.10.0/src/i83
} intel_screen_private;
enum {
-diff -up xf86-video-intel-2.10.0/src/Makefile.am.dave xf86-video-intel-2.10.0/src/Makefile.am
---- xf86-video-intel-2.10.0/src/Makefile.am.dave 2010-01-05 08:09:52.000000000 +1000
-+++ xf86-video-intel-2.10.0/src/Makefile.am 2010-01-13 18:49:14.000000000 +1000
+diff -up xf86-video-intel-2.12.0/src/Makefile.am.uevent xf86-video-intel-2.12.0/src/Makefile.am
+--- xf86-video-intel-2.12.0/src/Makefile.am.uevent 2010-06-24 16:29:37.000000000 -0400
++++ xf86-video-intel-2.12.0/src/Makefile.am 2010-06-25 11:39:15.665029821 -0400
@@ -32,7 +32,7 @@ AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @
intel_drv_la_LTLIBRARIES = intel_drv.la
intel_drv_la_LDFLAGS = -module -avoid-version
Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-13/xorg-x11-drv-intel.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xorg-x11-drv-intel.spec 25 Jun 2010 01:22:02 -0000 1.51
+++ xorg-x11-drv-intel.spec 25 Jun 2010 15:44:12 -0000 1.52
@@ -2,13 +2,13 @@
%define legacyver 2.6.0-8
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
-%define gputoolsdate 20100416
+%define gputoolsdate 20100625
#define gitdate 20100326
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
-Version: 2.11.0
-Release: 5%{?dist}
+Version: 2.12.0
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -37,9 +37,6 @@ Patch61: intel-2.10.0-add-mbp-backlight.
# https://bugzilla.redhat.com/588421
Patch62: intel-2.11-no-pageflipping.patch
-# https://bugzilla.redhat.com/604024
-Patch63: intel-2.11.0-fix-rotate-flushing-965.patch
-
ExclusiveArch: %{ix86} x86_64 ia64
BuildRequires: autoconf automake libtool
@@ -98,7 +95,6 @@ Debugging tools for Intel graphics chips
%patch60 -p1 -b .uevent
%patch61 -p1 -b .mbp-backlight
%patch62 -p1 -b .no-flip
-%patch63 -p1 -b .rotateflush
%build
@@ -149,6 +145,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/intel_*.1*
%changelog
+* Fri Jun 25 2010 Adam Jackson <ajax at redhat.com> 2.12.0-1
+- intel 2.12.0
+- new gpu-tools snapshot
+
* Fri Jun 25 2010 Dave Airlie <airlied at redhat.com> 2.11.0-5
- intel-2.11.0-fix-rotate-flushing-965.patch: fix rotation issues
--- intel-2.11.0-fix-rotate-flushing-965.patch DELETED ---
More information about the scm-commits
mailing list