xserver-xorg-video-rendition: Changes to 'upstream-unstable'
COPYING | 27 ++++++++++++-----
configure.ac | 2 -
src/rendition.c | 85 +-------------------------------------------------------
src/rendition.h | 2 +
4 files changed, 24 insertions(+), 92 deletions(-)
New commits:
commit 2d62a81b452641999207c0576a08d82aee41cf06
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Sep 7 14:42:11 2009 +1000
rendition 4.2.3
diff --git a/configure.ac b/configure.ac
index 84e5c7b..e209b16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.2.2,
+ 4.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
commit 47b68f542c836a76f4adb0d7951b7f0b6aaeabd1
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 15:22:41 2009 +1000
rendition: change to using ABI version check
diff --git a/src/rendition.h b/src/rendition.h
index 84809fa..ba0a22e 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,7 +37,7 @@
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
commit d9e34c59faf63162f18dc87f599e36de024f557c
Author: Dave Airlie <airlied@redhat.com>
Date: Tue Jul 28 13:32:35 2009 +1000
rendition: update for resources/RAC API removal
diff --git a/src/rendition.c b/src/rendition.c
index db62f8e..7a9e18b 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -538,7 +538,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
pRendition->PciInfo = xf86GetPciInfoForEntity(pRendition->pEnt->index);
pRendition->pcitag= pciTag(pRendition->PciInfo->bus,
pRendition->PciInfo->device, pRendition->PciInfo->func);
-#endif
/*
* XXX This could be refined if some VGA memory resources are not
@@ -549,11 +548,12 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (xf86RegisterResources(pRendition->pEnt->index, NULL, ResExclusive))
return FALSE;
+
/* Operations for which memory access is required. */
pScreenInfo->racMemFlags = RAC_FB | RAC_CURSOR;
/* Operations for which I/O access is required. (XXX Check this) */
pScreenInfo->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
-
+#endif
/* determine depth, bpp, etc. */
if (!xf86SetDepthBpp(pScreenInfo, 0, 0, 0, Support32bppFb))
return FALSE;
diff --git a/src/rendition.h b/src/rendition.h
index 2b43cba..84809fa 100644
--- a/src/rendition.h
+++ b/src/rendition.h
@@ -37,11 +37,13 @@
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
+#ifndef XSERVER_LIBPCIACCESS
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
/* Several predefined resource lists */
#include "xf86Resources.h"
+#endif
/* Needed by the Shadow Framebuffer */
#include "shadowfb.h"
commit 2013e650484bd66c238a497f241c23d82361e49e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 11:28:29 2009 -0400
rendition 4.2.2
diff --git a/configure.ac b/configure.ac
index d69aef2..84e5c7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.2.1,
+ 4.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
commit c22f51f750dc495b9c58f8390c6a0d9fff756829
Author: Adam Jackson <ajax@redhat.com>
Date: Thu May 28 15:13:38 2009 -0400
Remove useless loader symbol lists.
diff --git a/src/rendition.c b/src/rendition.c
index 594c7b8..db62f8e 100644
--- a/src/rendition.c
+++ b/src/rendition.c
@@ -200,72 +200,6 @@ _X_EXPORT DriverRec RENDITION={
#endif
};
-static const char *vgahwSymbols[]={
- "vgaHWBlankScreen",
- "vgaHWDPMSSet",
- "vgaHWFreeHWRec",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWLock",
- "vgaHWMapMem",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWUnlock",
- "vgaHWHandleColormaps",
- NULL
-};
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
- "xf86DestroyCursorInfoRec",
- "xf86InitCursor",
- NULL
-};
-
-#if defined(XFree86LOADER) || USE_ACCEL
-static const char *xaaSymbols[] = {
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAInit",
- NULL
-};
-#endif
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86PrintEDID",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86FreeInt10",
- "xf86InitInt10",
- NULL
-};
-
-static const char *fbSymbols[]={
- "fbScreenInit",
- "fbPictureInit",
- NULL
-};
-
-static const char *shadowfbSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
- "vbeFree",
- NULL
-};
-
-
-
#ifdef XFree86LOADER
/* Module loader interface */
@@ -297,9 +231,6 @@ renditionSetup(pointer Module, pointer Options, int *ErrorMajor,
if (!Initialised) {
Initialised = TRUE;
xf86AddDriver(&RENDITION, Module, 1);
- LoaderRefSymLists(vgahwSymbols, ramdacSymbols,
- fbSymbols, xaaSymbols, ddcSymbols, int10Symbols,
- shadowfbSymbols, vbeSymbols, NULL);
return (pointer) TRUE;
}
@@ -597,8 +528,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (xf86LoadSubModule(pScreenInfo, "int10")){
xf86Int10InfoPtr pInt=NULL;
- xf86LoaderReqSymLists(int10Symbols, NULL);
-
xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO, "Initializing int10\n");
pInt = xf86InitInt10(pRendition->pEnt->index);
xf86FreeInt10(pInt);
@@ -678,8 +607,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (!xf86LoadSubModule(pScreenInfo, "fb"))
return FALSE;
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
/* determine colour weights */
pScreenInfo->rgbBits=8;
@@ -727,7 +654,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (!xf86LoadSubModule(pScreenInfo, "vgahw")){
return FALSE;
}
- xf86LoaderReqSymLists(vgahwSymbols, NULL);
if (!vgaHWGetHWRec(pScreenInfo))
return FALSE;
@@ -827,7 +753,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
"Oops, \"ShadowFB\" module loading failed, disabling ShadowFB!\n");
}
else{
- xf86LoaderReqSymLists(shadowfbSymbols, NULL);
pRendition->board.shadowfb=TRUE;
xf86DrvMsg(pScreenInfo->scrnIndex, X_INFO,
"Using \"Shadow Framebuffer\"\n");
@@ -846,7 +771,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
if (!xf86LoadSubModule(pScreenInfo, "ramdac")) {
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
#if 0
@@ -857,7 +781,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
("Loading of DDC library failed, skipping DDC-probe\n"));
}
else {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
pScreenInfo->monitor->DDC = renditionDDC(pScreenInfo);
}
}
@@ -874,7 +797,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
}
else {
xf86MonPtr mon;
- xf86LoaderReqSymLists(ddcSymbols, NULL);
mon = renditionProbeDDC(pScreenInfo, pRendition->pEnt->index);
xf86PrintEDID(mon);
xf86SetDDCproperties(pScreenInfo, mon);
@@ -951,7 +873,6 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
!pRendition->board.shadowfb) {
/* Load XAA if needed */
if (xf86LoadSubModule(pScreenInfo, "xaa")) {
- xf86LoaderReqSymLists(xaaSymbols, NULL);
renditionMapMem(pScreenInfo);
RENDITIONAccelPreInit (pScreenInfo);
renditionUnmapMem(pScreenInfo);
@@ -1551,8 +1472,6 @@ renditionProbeDDC(ScrnInfoPtr pScreenInfo, int index)
xf86MonPtr mon = NULL;
if (xf86LoadSubModule(pScreenInfo, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
-
pVbe = VBEInit(NULL,index);
mon = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);
commit 560e4fd2d289615297b7529bcbd61799db5b277b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon May 11 22:24:37 2009 -0700
Fill in COPYING file
diff --git a/COPYING b/COPYING
index 7f33cbf..c513618 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,23 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-Please submit updated COPYING files to the Xorg bugzilla:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
Reply to: