Skip to content

Commit

Permalink
Change driver name: fbdev -> pvrsgx
Browse files Browse the repository at this point in the history
  • Loading branch information
@spinal84
spinal84 committed Mar 5, 2019
1 parent bbdc0b1 commit 219c3da
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 66 deletions.
2 changes: 1 addition & 1 deletion configure.ac
View file
Expand Up @@ -79,7 +79,7 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])

DRIVER_NAME=fbdev
DRIVER_NAME=pvrsgx
AC_SUBST([DRIVER_NAME])

XORG_MANPAGE_SECTIONS
Expand Down
12 changes: 6 additions & 6 deletions man/fbdev.man → man/pvrsgx.man
View file
@@ -1,25 +1,25 @@
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH FBDEV __drivermansuffix__ __vendorversion__
.TH PVRSGX __drivermansuffix__ __vendorversion__
.SH NAME
fbdev \- video driver for TI's OMAP 3 SoCs with a POWERVR SGX graphics core
pvrsgx \- video driver for TI's OMAP 3 SoCs with a POWERVR SGX graphics core
.SH SYNOPSIS
.nf
.B "Section \*qDevice\*q"
.BI " Identifier \*q" devname \*q
.B " Driver \*qfbdev\*q"
.B " Driver \*qpvrsgx\*q"
\ \ ...
.B EndSection
.fi
.SH DESCRIPTION
.B fbdev
.B pvrsgx
is an __xservername__ driver for PowerVR SGX. This is an accelerated
driver using EXA and DRI2, the following framebuffer depths are
supported: 8, 15, 16, 24, 32. RandR multi-head configuration is
supported for builtin LCD and TV.
.SH SUPPORTED HARDWARE
The
.B fbdev
.B pvrsgx
driver supports TI's OMAP 3 SoCs with a POWERVR SGX graphics core.
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
Expand All @@ -28,7 +28,7 @@ this driver.
.PP
For this driver it is not required to specify modes in the screen
section of the config file. The
.B fbdev
.B pvrsgx
driver uses RandR configuration for modesetting.
.PP
The following driver
Expand Down
86 changes: 43 additions & 43 deletions src/Makefile.am
View file
Expand Up @@ -36,53 +36,53 @@ PVR2D_CFLAGS = \

AM_CFLAGS = @XORG_CFLAGS@ $(PVR2D_CFLAGS)

fbdev_drv_la_LTLIBRARIES = fbdev_drv.la
fbdev_drv_la_LDFLAGS = -module -avoid-version -lm -lpvr2d
fbdev_drv_ladir = @moduledir@/drivers
pvrsgx_drv_la_LTLIBRARIES = pvrsgx_drv.la
pvrsgx_drv_la_LDFLAGS = -module -avoid-version -lm -lpvr2d
pvrsgx_drv_ladir = @moduledir@/drivers

fbdev_drv_la_SOURCES = \
crtc.c \
extfb.c \
extfb.h \
fbdev.c \
fbdev.h \
flip_stats.h \
omap.c \
omap.h \
omap_sysfs.c \
omap_sysfs.h \
omap_tvout.c \
omap_tvout.h \
omap_video.c \
omap_video_formats.c \
omap_video_formats.h \
output.c \
perf.h \
sgx_cache.c \
sgx_cache.h \
sgx_dri2.c \
sgx_dri2.h \
sgx_exa_user.c \
sgx_exa_user.h \
sgx_exa.c \
sgx_exa.h \
sgx_pvr2d.c \
sgx_pvr2d.h \
sgx_pvr2d_alloc.c \
sgx_pvr2d_alloc.h \
sgx_pvr2d_flip.c \
sgx_pvr2d_flip.h \
sgx_xv.c \
sgx_xv.h \
x-hash.c \
x-hash.h \
x-list.c \
x-list.h
pvrsgx_drv_la_SOURCES = \
crtc.c \
extfb.c \
extfb.h \
fbdev.c \
fbdev.h \
flip_stats.h \
omap.c \
omap.h \
omap_sysfs.c \
omap_sysfs.h \
omap_tvout.c \
omap_tvout.h \
omap_video.c \
omap_video_formats.c \
omap_video_formats.h \
output.c \
perf.h \
sgx_cache.c \
sgx_cache.h \
sgx_dri2.c \
sgx_dri2.h \
sgx_exa_user.c \
sgx_exa_user.h \
sgx_exa.c \
sgx_exa.h \
sgx_pvr2d.c \
sgx_pvr2d.h \
sgx_pvr2d_alloc.c \
sgx_pvr2d_alloc.h \
sgx_pvr2d_flip.c \
sgx_pvr2d_flip.h \
sgx_xv.c \
sgx_xv.h \
x-hash.c \
x-hash.h \
x-list.c \
x-list.h

if PERF
fbdev_drv_la_SOURCES += perf.c
pvrsgx_drv_la_SOURCES += perf.c
endif

if FLIP_STATS
fbdev_drv_la_SOURCES += flip_stats.c
pvrsgx_drv_la_SOURCES += flip_stats.c
endif
26 changes: 13 additions & 13 deletions src/fbdev.c
View file
Expand Up @@ -483,9 +483,9 @@ realloc_fb(ScrnInfoPtr pScrn,

/* -------------------------------------------------------------------- */

_X_EXPORT DriverRec FBDEV = {
.driverVersion = FBDEV_VERSION,
.driverName = FBDEV_DRIVER_NAME,
_X_EXPORT DriverRec PVRSGX = {
.driverVersion = PVRSGX_VERSION,
.driverName = PVRSGX_DRIVER_NAME,
.Identify = FBDevIdentify,
.Probe = FBDevProbe,
.AvailableOptions = FBDevAvailableOptions,
Expand All @@ -495,7 +495,7 @@ _X_EXPORT DriverRec FBDEV = {
static SymTabRec FBDevChipsets[] = {
{
.token = 0,
.name = "fbdev",
.name = "pvrsgx",
},
{
.token = -1,
Expand Down Expand Up @@ -607,7 +607,7 @@ static const OptionInfoRec FBDevOptions[] = {
MODULESETUPPROTO(FBDevSetup);

static XF86ModuleVersionInfo FBDevVersRec = {
.modname = "fbdev",
.modname = "pvrsgx",
.vendor = MODULEVENDORSTRING,
._modinfo1_ = MODINFOSTRING1,
._modinfo2_ = MODINFOSTRING2,
Expand All @@ -621,7 +621,7 @@ static XF86ModuleVersionInfo FBDevVersRec = {
.checksum = { 0, 0, 0, 0 },
};

_X_EXPORT XF86ModuleData fbdevModuleData = {
_X_EXPORT XF86ModuleData pvrsgxModuleData = {
.vers = &FBDevVersRec,
.setup = FBDevSetup,
};
Expand All @@ -632,7 +632,7 @@ pointer FBDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)

if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&FBDEV, module, 0);
xf86AddDriver(&PVRSGX, module, 0);
return (pointer) 1;
} else {
if (errmaj)
Expand Down Expand Up @@ -670,7 +670,7 @@ static const OptionInfoRec *FBDevAvailableOptions(int chipid, int busid)

static void FBDevIdentify(int flags)
{
xf86PrintChipsets(FBDEV_NAME, "driver for framebuffer", FBDevChipsets);
xf86PrintChipsets(PVRSGX_NAME, "driver for framebuffer", FBDevChipsets);
}

static Bool FBDevProbe(DriverPtr drv, int flags)
Expand All @@ -688,7 +688,7 @@ static Bool FBDevProbe(DriverPtr drv, int flags)
if (flags & PROBE_DETECT)
return FALSE;

numDevSections = xf86MatchDevice(FBDEV_DRIVER_NAME, &devSections);
numDevSections = xf86MatchDevice(PVRSGX_DRIVER_NAME, &devSections);
if (numDevSections <= 0)
return FALSE;

Expand All @@ -702,9 +702,9 @@ static Bool FBDevProbe(DriverPtr drv, int flags)

foundScreen = TRUE;

pScrn->driverVersion = FBDEV_VERSION;
pScrn->driverName = FBDEV_DRIVER_NAME;
pScrn->name = FBDEV_NAME;
pScrn->driverVersion = PVRSGX_VERSION;
pScrn->driverName = PVRSGX_DRIVER_NAME;
pScrn->name = PVRSGX_NAME;
pScrn->Probe = FBDevProbe;
pScrn->PreInit = FBDevPreInit;
pScrn->ScreenInit = FBDevScreenInit;
Expand Down Expand Up @@ -885,7 +885,7 @@ static Bool FBDevPreInit(ScrnInfoPtr pScrn, int flags)

pScrn->progClock = TRUE;
pScrn->rgbBits = 8;
pScrn->chipset = "fbdev";
pScrn->chipset = "pvrsgx";

/* handle options */
xf86CollectOptions(pScrn, NULL);
Expand Down
6 changes: 3 additions & 3 deletions src/fbdev.h
View file
Expand Up @@ -42,9 +42,9 @@

#include "omap.h"

#define FBDEV_VERSION 4000
#define FBDEV_NAME "FBDEV"
#define FBDEV_DRIVER_NAME "fbdev"
#define PVRSGX_VERSION 4000
#define PVRSGX_NAME "PVRSGX"
#define PVRSGX_DRIVER_NAME "pvrsgx"

#if 0
#define CALLTRACE(...) ErrorF(__VA_ARGS__)
Expand Down

0 comments on commit 219c3da

Please sign in to comment.