From 4b9f43907be888328f680f6777fcc78ed070c954 Mon Sep 17 00:00:00 2001 From: John Fredriksson Date: Mon, 8 Aug 2011 09:50:40 +0000 Subject: Updated to new hwmem api. --- man/fbdev.man | 63 ---------------------------------------------------------- src/mali_exa.c | 5 ++--- 2 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 man/fbdev.man diff --git a/man/fbdev.man b/man/fbdev.man deleted file mode 100644 index 536f40b..0000000 --- a/man/fbdev.man +++ /dev/null @@ -1,63 +0,0 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ -.\" shorthand for double quote that works everywhere. -.ds q \N'34' -.TH FBDEV __drivermansuffix__ __vendorversion__ -.SH NAME -fbdev \- video driver for framebuffer device -.SH SYNOPSIS -.nf -.B "Section \*qDevice\*q" -.BI " Identifier \*q" devname \*q -.B " Driver \*qfbdev\*q" -.BI " BusID \*qpci:" bus : dev : func \*q -\ \ ... -.B EndSection -.fi -.SH DESCRIPTION -.B fbdev -is an __xservername__ driver for framebuffer devices. This is a non-accelerated -driver, the following framebuffer depths are supported: 8, 15, 16, 24. -All visual types are supported for depth 8, and TrueColor visual is -supported for the other depths. Multi-head configurations are supported. -.SH SUPPORTED HARDWARE -The -.B fbdev -driver supports all hardware where a framebuffer driver is available. -fbdev uses the os-specific submodule fbdevhw(__drivermansuffix__) to talk -to the kernel -device driver. Currently a fbdevhw module is available for linux. -.SH CONFIGURATION DETAILS -Please refer to __xconfigfile__(__filemansuffix__) for general configuration -details. This section only covers configuration details specific to -this driver. -.PP -For this driver it is not required to specify modes in the screen -section of the config file. The -.B fbdev -driver can pick up the currently used video mode from the framebuffer -driver and will use it if there are no video modes configured. -.PP -For PCI boards you might have to add a BusID line to the Device -section. See above for a sample line. You can use \*q\__xservername__ --scanpci\*q -to figure out the correct values. -.PP -The following driver -.B Options -are supported: -.TP -.BI "Option \*qfbdev\*q \*q" string \*q -The framebuffer device to use. Default: /dev/fb0. -.TP -.BI "Option \*qShadowFB\*q \*q" boolean \*q -Enable or disable use of the shadow framebuffer layer. Default: on. -.TP -.BI "Option \*qRotate\*q \*q" string \*q -Enable rotation of the display. The supported values are "CW" (clockwise, -90 degrees), "UD" (upside down, 180 degrees) and "CCW" (counter clockwise, -270 degrees). Implies use of the shadow framebuffer layer. Default: off. -.SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), -X(__miscmansuffix__), fbdevhw(__drivermansuffix__) -.SH AUTHORS -Authors include: Gerd Knorr, Michel D\(:anzer, Geert Uytterhoeven diff --git a/src/mali_exa.c b/src/mali_exa.c index c62c1af..b54b344 100644 --- a/src/mali_exa.c +++ b/src/mali_exa.c @@ -445,7 +445,7 @@ static Bool maliModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, int { struct hwmem_alloc_request args; args.size = size; - args.flags = HWMEM_ALLOC_CACHED; + args.flags = HWMEM_ALLOC_HINT_CACHED; args.default_access = HWMEM_ACCESS_READ | HWMEM_ACCESS_WRITE | HWMEM_ACCESS_IMPORT; args.mem_type = HWMEM_MEM_CONTIGUOUS_SYS; mem_info->hwmem_alloc = ioctl( MALIPTR(xf86Screens[pPixmap->drawable.pScreen->myNum])->hwmem_fd, @@ -528,7 +528,6 @@ static Bool maliPrepareAccess(PixmapPtr pPix, int index) { struct hwmem_set_domain_request args; args.id = mem_info->hwmem_alloc; - args.domain = HWMEM_DOMAIN_CPU; args.access = HWMEM_ACCESS_READ | HWMEM_ACCESS_WRITE | HWMEM_ACCESS_IMPORT; /* using memset avoids API compatibility problems with the skip/offset field. */ @@ -538,7 +537,7 @@ static Bool maliPrepareAccess(PixmapPtr pPix, int index) args.region.end = mem_info->usize; args.region.size = mem_info->usize; ioctl( MALIPTR(xf86Screens[pPix->drawable.pScreen->myNum])->hwmem_fd, - HWMEM_SET_DOMAIN_IOC, + HWMEM_SET_CPU_DOMAIN_IOC, &args); if (!privPixmap->addr) -- cgit v1.2.3