bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update omapfb patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@22624 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2010-08-13 17:15:11 +00:00
parent 5b7bb4d28f
commit fb7f84caf6
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch
View File

@ -1,7 +1,6 @@
--- ---
src/omapfb-driver.c | 5 +++-- src/omapfb-driver.c | 4 ++--
src/omapfb-xv.c | 6 +++--- 1 file changed, 2 insertions(+), 2 deletions(-)
2 files changed, 6 insertions(+), 5 deletions(-)
--- xf86-video-omapfb-20100810.orig/src/omapfb-driver.c --- xf86-video-omapfb-20100810.orig/src/omapfb-driver.c
+++ xf86-video-omapfb-20100810/src/omapfb-driver.c +++ xf86-video-omapfb-20100810/src/omapfb-driver.c
@ -14,30 +13,12 @@
for (i = 0; i < numDevSections; i++) { for (i = 0; i < numDevSections; i++) {
int fd; int fd;
@@ -831,7 +831,8 @@ static XF86ModuleVersionInfo OMAPFBVersR @@ -831,7 +831,7 @@ static XF86ModuleVersionInfo OMAPFBVersR
MODINFOSTRING1, MODINFOSTRING1,
MODINFOSTRING2, MODINFOSTRING2,
XORG_VERSION_CURRENT, XORG_VERSION_CURRENT,
- PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, - PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
+// PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, + 99, 99, 99,
+ 0, 0, 1,
ABI_CLASS_VIDEODRV, ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION, ABI_VIDEODRV_VERSION,
NULL, NULL,
--- xf86-video-omapfb-20100810.orig/src/omapfb-xv.c
+++ xf86-video-omapfb-20100810/src/omapfb-xv.c
@@ -225,11 +225,11 @@ int OMAPFBXVInit (ScrnInfoPtr pScrn,
*/
// ofb->port->mem_info.type = OMAPFB_MEMTYPE_SRAM;
if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Failed to unallocate video plane memory: %s\n",
strerror(errno));
- OMAPFBPortFreeRec(pScrn);
- return 0;
+// OMAPFBPortFreeRec(pScrn);
+// return 0;
}
}
if(ioctl(ofb->port->fd, OMAPFB_QUERY_PLANE, &ofb->port->plane_info) != 0) {