rpms/xorg-x11-drv-intel/F-12 copy-fb.patch, 1.8, 1.9 sources, 1.11, 1.12 xorg-x11-drv-intel.spec, 1.36, 1.37 intel-gamma-fix.patch, 1.1, NONE
Adam Jackson
ajax at fedoraproject.org
Mon Oct 26 15:25:46 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4988
Modified Files:
copy-fb.patch sources xorg-x11-drv-intel.spec
Removed Files:
intel-gamma-fix.patch
Log Message:
* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 2.9.1-1
- intel 2.9.1
copy-fb.patch:
drmmode_display.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
i830.h | 1
i830_driver.c | 2
3 files changed, 111 insertions(+), 1 deletion(-)
Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/copy-fb.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- copy-fb.patch 23 Sep 2009 23:40:02 -0000 1.8
+++ copy-fb.patch 26 Oct 2009 15:25:45 -0000 1.9
@@ -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 <unistd.h>
#include <errno.h>
@@ -10,7 +10,7 @@ diff -up xf86-video-intel-20090909/src/d
#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/d
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/d
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/d
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/d
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/d
+ (*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/i
}
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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources 2 Oct 2009 01:06:17 -0000 1.11
+++ sources 26 Oct 2009 15:25:45 -0000 1.12
@@ -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
Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-12/xorg-x11-drv-intel.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- xorg-x11-drv-intel.spec 9 Oct 2009 03:44:44 -0000 1.36
+++ xorg-x11-drv-intel.spec 26 Oct 2009 15:25:45 -0000 1.37
@@ -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 <ajax at redhat.com> 2.9.1-1
+- intel 2.9.1
+
* Fri Oct 09 2009 Dave Airlie <airlied at redhat.com> 2.9.0-3
- set gamma on mode set major for kms
--- intel-gamma-fix.patch DELETED ---
More information about the fedora-extras-commits
mailing list