Permalink
Browse files

Rename the driver from "xf86-video-sunxifb" to "xf86-video-fbturbo"

Because a wide range of embedded ARM devices are actually supported
(Allwinner A1X/A20, Raspberry Pi, ODROID-X, Rockchip, ...) and
are getting some sort of performance improvement and/or hardware
acceleration, the DDX driver needs a vendor neutral name.

Resolves #10

Signed-off-by: Siarhei Siamashka <siarhei.siamashka@gmail.com>
  • Loading branch information...
ssvb committed Sep 22, 2013
1 parent cbd5b2b commit 48427e49b29b5fe39de1e83cedeb4a0f4c0fc8c7
Showing with 33 additions and 35 deletions.
  1. +5 −7 README
  2. +5 −5 configure.ac
  3. +6 −6 man/{sunxifb.man → fbturbo.man}
  4. +5 −5 src/Makefile.am
  5. +9 −9 src/fbdev.c
  6. +3 −3 xorg.conf
View
12 README
@@ -1,10 +1,10 @@
xf86-video-sunxifb - video driver, primarily optimized for the devices powered
xf86-video-fbturbo - video driver, primarily optimized for the devices powered
by the Allwinner SoC (A10, A13, A20). It can use some of the 2D/3D hardware
acceleration features.
And because this driver is based on xf86-video-fbdev (with none of the
original features stripped), it actually supports all the same hardware
as xf86-video-fbdev. Essentially, xf86-video-sunxifb can be just used as
as xf86-video-fbdev. Essentially, xf86-video-fbturbo can be just used as
a drop-in replacement and run on practically any Linux system. There will
be no real difference on x86, but any ARM based system should see better
performance thanks to some additional optimizations (the elimination of
@@ -40,15 +40,15 @@ XV overlay is supported on Allwinner A10/A13/A20.
== Installation instructions ==
https://github.com/ssvb/xf86-video-sunxifb/wiki/Installation
https://github.com/ssvb/xf86-video-fbturbo/wiki/Installation
== Troubleshooting ==
If something does not work right, it's a good idea to check dmesg log and
/var/log/Xorg.0.log for any suspicious error messages or warnings.
Some important notes:
1. The messages "(EE) SUNXIFB(0): FBIOPUTCMAP: Invalid argument" in
1. The messages "(EE) FBTURBO(0): FBIOPUTCMAP: Invalid argument" in
Xorg.0.log can be safely ignored. They are harmless.
2. If you are limited by exactly 60 FPS in benchmarks and want to see more,
@@ -70,8 +70,6 @@ Some important notes:
of the individual tests from glmark2-es2 should run with more
than 200-300 FPS.
4. https://github.com/ssvb/xf86-video-sunxifb/wiki/Troubleshooting
== Contacts. Reporting bugs ==
If something from the list above does not seem to work right, then that's
@@ -81,7 +79,7 @@ at freenode.net irc. I'm known as "ssvb" there. The platforms other than
allwinner/sunxi are also supported.
Or alternatively just use the issue tracker for reporting bugs:
https://github.com/ssvb/xf86-video-sunxifb/issues
https://github.com/ssvb/xf86-video-fbturbo/issues
== Links to the other interesting projects ==
View
@@ -22,10 +22,10 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-sunxifb],
AC_INIT([xf86-video-fbturbo],
[0.3.1],
[https://github.com/ssvb/xf86-video-sunxifb],
[xf86-video-sunxifb])
[https://github.com/ssvb/xf86-video-fbturbo],
[xf86-video-fbturbo])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
@@ -84,7 +84,7 @@ fi
# Checks for libraries.
# add -pthread to workaround https://github.com/ssvb/xf86-video-sunxifb/issues/11
# add -pthread to workaround https://github.com/ssvb/xf86-video-fbturbo/issues/11
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -pthread"
@@ -104,7 +104,7 @@ fi
AC_SUBST([moduledir])
DRIVER_NAME=sunxifb
DRIVER_NAME=fbturbo
AC_SUBST([DRIVER_NAME])
AC_CONFIG_FILES([
@@ -1,18 +1,18 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH SUNXIFB __drivermansuffix__ __vendorversion__
.TH FBTURBO __drivermansuffix__ __vendorversion__
.SH NAME
sunxifb \- video driver for Allwinner and other ARM-based devices
fbturbo \- video driver for Allwinner and other ARM-based devices
.SH SYNOPSIS
.nf
.B "Section \*qDevice\*q"
.BI " Identifier \*q" devname \*q
.B " Driver \*qsunxifb\*q"
.B " Driver \*qfbturbo\*q"
\ \ ...
.B EndSection
.fi
.SH DESCRIPTION
.B sunxifb
.B fbturbo
is an __xservername__ driver for Allwinner and other ARM-based devices,
derived from
.B fbdev
@@ -26,7 +26,7 @@ framebuffer color depths are 16 (RGB565) and 24 (XRGB8888), the other color
depths may be supported too. Multi-head configurations are supported.
.SH SUPPORTED HARDWARE
The
.B sunxifb
.B fbturbo
driver supports all hardware where a framebuffer driver is available and
uses the os-specific submodule fbdevhw(__drivermansuffix__) to talk
to the kernel
@@ -45,7 +45,7 @@ this driver.
.PP
For this driver it is not required to specify modes in the screen
section of the config file. The
.B sunxifb
.B fbturbo
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
View
@@ -24,11 +24,11 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
AM_CFLAGS = @XORG_CFLAGS@
sunxifb_drv_la_LTLIBRARIES = sunxifb_drv.la
sunxifb_drv_la_LDFLAGS = -module -avoid-version
sunxifb_drv_ladir = @moduledir@/drivers
fbturbo_drv_la_LTLIBRARIES = fbturbo_drv.la
fbturbo_drv_la_LDFLAGS = -module -avoid-version
fbturbo_drv_ladir = @moduledir@/drivers
sunxifb_drv_la_SOURCES = \
fbturbo_drv_la_SOURCES = \
compat-api.h \
uthash.h \
arm_asm.S \
@@ -51,7 +51,7 @@ sunxifb_drv_la_SOURCES = \
sunxi_video.h
if HAVE_LIBUMP
sunxifb_drv_la_SOURCES += \
fbturbo_drv_la_SOURCES += \
sunxi_mali_ump_dri2.c \
sunxi_mali_ump_dri2.h
endif
View
@@ -79,11 +79,11 @@
static Bool debug = 0;
#define TRACE_ENTER(str) \
do { if (debug) ErrorF("sunxifb: " str " %d\n",pScrn->scrnIndex); } while (0)
do { if (debug) ErrorF("fbturbo: " str " %d\n",pScrn->scrnIndex); } while (0)
#define TRACE_EXIT(str) \
do { if (debug) ErrorF("sunxifb: " str " done\n"); } while (0)
do { if (debug) ErrorF("fbturbo: " str " done\n"); } while (0)
#define TRACE(str) \
do { if (debug) ErrorF("sunxifb trace: " str "\n"); } while (0)
do { if (debug) ErrorF("fbturbo trace: " str "\n"); } while (0)
/* -------------------------------------------------------------------- */
/* prototypes */
@@ -118,8 +118,8 @@ enum { FBDEV_ROTATE_NONE=0, FBDEV_ROTATE_CW=270, FBDEV_ROTATE_UD=180, FBDEV_ROTA
static int pix24bpp = 0;
#define FBDEV_VERSION 4000
#define FBDEV_NAME "SUNXIFB"
#define FBDEV_DRIVER_NAME "sunxifb"
#define FBDEV_NAME "FBTURBO"
#define FBDEV_DRIVER_NAME "fbturbo"
#ifdef XSERVER_LIBPCIACCESS
static const struct pci_id_match fbdev_device_match[] = {
@@ -153,7 +153,7 @@ _X_EXPORT DriverRec FBDEV = {
/* Supported "chipsets" */
static SymTabRec FBDevChipsets[] = {
{ 0, "sunxifb" },
{ 0, "fbturbo" },
{-1, NULL }
};
@@ -199,7 +199,7 @@ MODULESETUPPROTO(FBDevSetup);
static XF86ModuleVersionInfo FBDevVersRec =
{
"sunxifb",
"fbturbo",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
@@ -211,7 +211,7 @@ static XF86ModuleVersionInfo FBDevVersRec =
{0,0,0,0}
};
_X_EXPORT XF86ModuleData sunxifbModuleData = { &FBDevVersRec, FBDevSetup, NULL };
_X_EXPORT XF86ModuleData fbturboModuleData = { &FBDevVersRec, FBDevSetup, NULL };
pointer
FBDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -504,7 +504,7 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
pScrn->progClock = TRUE;
pScrn->rgbBits = 8;
pScrn->chipset = "sunxifb";
pScrn->chipset = "fbturbo";
pScrn->videoRam = fbdevHWGetVidmem(pScrn);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "hardware: %s (video memory:"
View
@@ -1,16 +1,16 @@
# This is a minimal sample config file, which can be copied to
# /etc/X11/xorg.conf in order to make the Xorg server pick up
# and load xf86-video-sunxifb driver installed in the system.
# and load xf86-video-fbturbo driver installed in the system.
#
# When troubleshooting, check /var/log/Xorg.0.log for the debugging
# output and error messages.
#
# Run "man sunxifb" to get additional information about the extra
# Run "man fbturbo" to get additional information about the extra
# configuration options for tuning the driver.
Section "Device"
Identifier "Allwinner A10/A13 FBDEV"
Driver "sunxifb"
Driver "fbturbo"
Option "fbdev" "/dev/fb0"
Option "SwapbuffersWait" "true"

0 comments on commit 48427e4

Please sign in to comment.