rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.27, 1.28 nouveau-fedora.patch, 1.16, 1.17 sources, 1.28, 1.29 xorg-x11-drv-nouveau.spec, 1.33, 1.34
Ben Skeggs
bskeggs at fedoraproject.org
Fri Apr 3 16:18:30 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9191
Modified Files:
.cvsignore nouveau-fedora.patch sources
xorg-x11-drv-nouveau.spec
Log Message:
* Sat Apr 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-22.20090404git836d985
- use consistent connector names across all modesetting paths
- rh#493981
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 3 Apr 2009 04:16:00 -0000 1.27
+++ .cvsignore 3 Apr 2009 16:17:59 -0000 1.28
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090403git11be9a9.tar.bz2
+xf86-video-nouveau-0.0.12-20090404git836d985.tar.bz2
nouveau-fedora.patch:
Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nouveau-fedora.patch 3 Apr 2009 04:16:00 -0000 1.16
+++ nouveau-fedora.patch 3 Apr 2009 16:17:59 -0000 1.17
@@ -11,10 +11,10 @@
nouveau_output.h \
nouveau_connector.h \
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 8150a28..bc15231 100644
+index b7a38fa..5361825 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -185,6 +185,50 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
+@@ -185,6 +185,51 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, int *w, int *h)
}
static void
@@ -49,12 +49,13 @@
+
+ nouveau_bo_map(pNv->scanout, NOUVEAU_BO_WR);
+ dst = pNv->scanout->map;
++ dst += (y * fb->pitch) + (x * (fb->bpp >> 3));
+
+ h = fb->height;
+ while (h--) {
+ memcpy(dst, src, fb->width * (fb->bpp >> 3));
+ src += fb->pitch;
-+ dst += fb->pitch;
++ dst += pScrn->displayWidth * (pScrn->bitsPerPixel / 8);
+ }
+
+ nouveau_bo_unmap(pNv->scanout);
@@ -65,7 +66,7 @@
drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
int x, int y)
{
-@@ -194,6 +238,11 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -194,6 +239,11 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
PixmapPtr pspix, pdpix;
int w, h;
@@ -77,7 +78,7 @@
pspix = drmmode_fb_pixmap(pScrn, src_id, NULL, NULL);
if (!pspix)
return;
-@@ -239,7 +288,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -239,7 +289,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
ret = drmModeAddFB(drmmode->fd,
pScrn->virtualX, pScrn->virtualY,
pScrn->depth, pScrn->bitsPerPixel,
@@ -86,7 +87,7 @@
if (ret < 0) {
ErrorF("failed to add fb\n");
return FALSE;
-@@ -292,8 +341,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -292,8 +342,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
if (drmmode_crtc->rotate_fb_id)
fb_id = drmmode_crtc->rotate_fb_id;
else
@@ -484,7 +485,7 @@
+ return true;
+}
diff --git a/src/nv_bios.c b/src/nv_bios.c
-index 7da48d2..fe6368e 100644
+index e5ef11a..735fee0 100644
--- a/src/nv_bios.c
+++ b/src/nv_bios.c
@@ -22,6 +22,9 @@
@@ -497,7 +498,7 @@
#include "nv_include.h"
#if defined(__FreeBSD__) || defined(__NetBSD__)
-@@ -4485,7 +4488,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4486,7 +4489,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
bool NVInitVBIOS(ScrnInfoPtr pScrn)
{
@@ -508,7 +509,7 @@
memset(bios, 0, sizeof(struct nvbios));
-@@ -4496,6 +4502,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4497,6 +4503,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
if (bios->length > NV_PROM_SIZE)
bios->length = NV_PROM_SIZE;
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 3 Apr 2009 04:16:00 -0000 1.28
+++ sources 3 Apr 2009 16:17:59 -0000 1.29
@@ -1 +1 @@
-55e911e7dadc7e445469a0be81b6306b xf86-video-nouveau-0.0.12-20090403git11be9a9.tar.bz2
+2b3bc53449226e0f3028afc78c578602 xf86-video-nouveau-0.0.12-20090404git836d985.tar.bz2
Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xorg-x11-drv-nouveau.spec 3 Apr 2009 04:16:00 -0000 1.33
+++ xorg-x11-drv-nouveau.spec 3 Apr 2009 16:17:59 -0000 1.34
@@ -7,8 +7,8 @@
# git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
# git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
-%define gitdate 20090403
-%define git_version 11be9a9
+%define gitdate 20090404
+%define git_version 836d985
%define snapshot %{gitdate}git%{git_version}
@@ -19,7 +19,7 @@
# need to set an epoch to get version number in sync with upstream
Epoch: 1
Version: %{nouveau_version}
-Release: 21.%{snapshot}%{?dist}
+Release: 22.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -77,6 +77,10 @@
%{_mandir}/man4/nouveau.4*
%changelog
+* Sat Apr 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-22.20090404git836d985
+- use consistent connector names across all modesetting paths
+- rh#493981
+
* Fri Apr 03 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-21.20090403git11be9a9
- upstream update, loads of modesetting fixes
- rh#492819, rh#492427, rh#492289, rh#492289
More information about the fedora-extras-commits
mailing list