Xorg: Add OMAP 1/2/3 framebuffer driver.
[openwrt/svn-archive/archive.git] / Xorg / xorg / driver / xf86-video-omap / patches / 001-misc-fixes.patch
1 ---
2 src/omapfb-driver.c | 5 +++--
3 src/omapfb-xv.c | 6 +++---
4 2 files changed, 6 insertions(+), 5 deletions(-)
5
6 --- xf86-video-omapfb-20100810.orig/src/omapfb-driver.c
7 +++ xf86-video-omapfb-20100810/src/omapfb-driver.c
8 @@ -182,7 +182,7 @@ OMAPFBProbe(DriverPtr drv, int flags)
9 return FALSE;
10
11 /* FIXME: We don't really want to do it like this... */
12 -#define DEFAULT_DEVICE "/dev/fb"
13 +#define DEFAULT_DEVICE "/dev/fb0"
14
15 for (i = 0; i < numDevSections; i++) {
16 int fd;
17 @@ -831,7 +831,8 @@ static XF86ModuleVersionInfo OMAPFBVersR
18 MODINFOSTRING1,
19 MODINFOSTRING2,
20 XORG_VERSION_CURRENT,
21 - PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
22 +// PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
23 + 0, 0, 1,
24 ABI_CLASS_VIDEODRV,
25 ABI_VIDEODRV_VERSION,
26 NULL,
27 --- xf86-video-omapfb-20100810.orig/src/omapfb-xv.c
28 +++ xf86-video-omapfb-20100810/src/omapfb-xv.c
29 @@ -225,11 +225,11 @@ int OMAPFBXVInit (ScrnInfoPtr pScrn,
30 */
31 // ofb->port->mem_info.type = OMAPFB_MEMTYPE_SRAM;
32 if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) {
33 - xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
34 + xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
35 "Failed to unallocate video plane memory: %s\n",
36 strerror(errno));
37 - OMAPFBPortFreeRec(pScrn);
38 - return 0;
39 +// OMAPFBPortFreeRec(pScrn);
40 +// return 0;
41 }
42 }
43 if(ioctl(ofb->port->fd, OMAPFB_QUERY_PLANE, &ofb->port->plane_info) != 0) {