From 7ef61a56e4d6c23dadaa621fbfe6efe0c488c0ba Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 2 Dec 2010 17:10:19 +1000 Subject: [PATCH] - fix bg none root --- BGNoneRoot.patch | 21 +++++++++++---------- xorg-x11-drv-fbdev.spec | 5 ++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/BGNoneRoot.patch b/BGNoneRoot.patch index 48ba9d3..9989869 100644 --- a/BGNoneRoot.patch +++ b/BGNoneRoot.patch @@ -1,11 +1,12 @@ -diff -up xf86-video-fbdev-0.4.0/src/fbdev.c.foo xf86-video-fbdev-0.4.0/src/fbdev.c ---- xf86-video-fbdev-0.4.0/src/fbdev.c.foo 2008-10-30 11:16:44.000000000 -0400 -+++ xf86-video-fbdev-0.4.0/src/fbdev.c 2008-10-30 11:18:19.000000000 -0400 -@@ -472,6 +472,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flag - return FALSE; +diff -up xf86-video-fbdev-0.4.1/src/fbdev.c.orig xf86-video-fbdev-0.4.1/src/fbdev.c +--- xf86-video-fbdev-0.4.1/src/fbdev.c.orig 2009-07-28 15:20:10.000000000 +1000 ++++ xf86-video-fbdev-0.4.1/src/fbdev.c 2010-12-02 17:09:09.859998634 +1000 +@@ -680,6 +680,8 @@ FBDevScreenInit(int scrnIndex, ScreenPtr + pScrn->offset.red,pScrn->offset.green,pScrn->offset.blue); + #endif - pScrn->monitor = pScrn->confScreen->monitor; -+ pScrn->canDoBGNoneRoot = 1; - - FBDevGetRec(pScrn); - fPtr = FBDEVPTR(pScrn); ++ pScreen->canDoBGNoneRoot = 1; ++ + if (NULL == (fPtr->fbmem = fbdevHWMapVidmem(pScrn))) { + xf86DrvMsg(scrnIndex,X_ERROR,"mapping of video memory" + " failed\n"); diff --git a/xorg-x11-drv-fbdev.spec b/xorg-x11-drv-fbdev.spec index 0ce72bf..ab4aedc 100644 --- a/xorg-x11-drv-fbdev.spec +++ b/xorg-x11-drv-fbdev.spec @@ -5,7 +5,7 @@ Summary: Xorg X11 fbdev video driver Name: xorg-x11-drv-fbdev Version: 0.4.1 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/fbdev.4* %changelog +* Thu Dec 02 2010 Dave Airlie 0.4.1-6 +- fix bg none root + * Wed Oct 27 2010 Adam Jackson 0.4.1-5 - Add ABI requires magic. (#542742)