frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modesetting: Run x-indent-all.sh. 

As I was editing code, the top-level .dir-locals.el was making my new
stuff conflict with the existing style.  Make it consistently use the
xorg style, instead.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Eric Anholt 2014-10-08 00:39:15 -07:00
parent 95a5b92e37
commit 3119acdab9
4 changed files with 1452 additions and 1376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
hw/xfree86/drivers/modesetting/driver.c
View File

@ -66,8 +66,8 @@ static Bool CloseScreen(ScreenPtr pScreen);
static Bool EnterVT(ScrnInfoPtr pScrn); static Bool EnterVT(ScrnInfoPtr pScrn);
static void Identify(int flags); static void Identify(int flags);
static const OptionInfoRec *AvailableOptions(int chipid, int busid); static const OptionInfoRec *AvailableOptions(int chipid, int busid);
static ModeStatus ValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool verbose, static ModeStatus ValidMode(ScrnInfoPtr pScrn, DisplayModePtr mode,
int flags); Bool verbose, int flags);
static void FreeScreen(ScrnInfoPtr pScrn); static void FreeScreen(ScrnInfoPtr pScrn);
static void LeaveVT(ScrnInfoPtr pScrn); static void LeaveVT(ScrnInfoPtr pScrn);
static Bool SwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode); static Bool SwitchMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
@ -78,23 +78,22 @@ static Bool Probe(DriverPtr drv, int flags);
static Bool ms_pci_probe(DriverPtr driver, static Bool ms_pci_probe(DriverPtr driver,
int entity_num, struct pci_device *device, int entity_num, struct pci_device *device,
intptr_t match_data); intptr_t match_data);
static Bool ms_driver_func(ScrnInfoPtr scrn, xorgDriverFuncOp op, static Bool ms_driver_func(ScrnInfoPtr scrn, xorgDriverFuncOp op, void *data);
void *data);
#ifdef XSERVER_LIBPCIACCESS #ifdef XSERVER_LIBPCIACCESS
static const struct pci_id_match ms_device_match[] = { static const struct pci_id_match ms_device_match[] = {
{ {
PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
0x00030000, 0x00ff0000, 0 0x00030000, 0x00ff0000, 0},
},
{ 0, 0, 0 }, {0, 0, 0},
}; };
#endif #endif
#ifdef XSERVER_PLATFORM_BUS #ifdef XSERVER_PLATFORM_BUS
static Bool ms_platform_probe(DriverPtr driver, static Bool ms_platform_probe(DriverPtr driver,
int entity_num, int flags, struct xf86_platform_device *device, int entity_num, int flags,
struct xf86_platform_device *device,
intptr_t match_data); intptr_t match_data);
#endif #endif
@ -115,12 +114,11 @@ _X_EXPORT DriverRec modesetting = {
}; };
static SymTabRec Chipsets[] = { static SymTabRec Chipsets[] = {
{0, "kms" }, {0, "kms"},
{-1, NULL} {-1, NULL}
}; };
typedef enum typedef enum {
{
OPTION_SW_CURSOR, OPTION_SW_CURSOR,
OPTION_DEVICE_PATH, OPTION_DEVICE_PATH,
OPTION_SHADOW_FB, OPTION_SHADOW_FB,
@ -128,8 +126,8 @@ typedef enum
static const OptionInfoRec Options[] = { static const OptionInfoRec Options[] = {
{OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE}, {OPTION_SW_CURSOR, "SWcursor", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_DEVICE_PATH, "kmsdev", OPTV_STRING, {0}, FALSE }, {OPTION_DEVICE_PATH, "kmsdev", OPTV_STRING, {0}, FALSE},
{OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE }, {OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE},
{-1, NULL, OPTV_NONE, {0}, FALSE} {-1, NULL, OPTV_NONE, {0}, FALSE}
}; };
@ -155,7 +153,7 @@ static XF86ModuleVersionInfo VersRec = {
_X_EXPORT XF86ModuleData modesettingModuleData = { &VersRec, Setup, NULL }; _X_EXPORT XF86ModuleData modesettingModuleData = { &VersRec, Setup, NULL };
static void * static void *
Setup(void * module, void * opts, int *errmaj, int *errmin) Setup(void *module, void *opts, int *errmaj, int *errmin)
{ {
static Bool setupDone = 0; static Bool setupDone = 0;
@ -170,7 +168,8 @@ Setup(void * module, void * opts, int *errmaj, int *errmin)
* is no TearDownProc. * is no TearDownProc.
*/ */
return (void *) 1; return (void *) 1;
} else { }
else {
if (errmaj) if (errmaj)
*errmaj = LDR_ONCEONLY; *errmaj = LDR_ONCEONLY;
return NULL; return NULL;
@ -184,25 +183,28 @@ Identify(int flags)
Chipsets); Chipsets);
} }
static int open_hw(const char *dev) static int
open_hw(const char *dev)
{ {
int fd; int fd;
if (dev) if (dev)
fd = open(dev, O_RDWR, 0); fd = open(dev, O_RDWR, 0);
else { else {
dev = getenv("KMSDEVICE"); dev = getenv("KMSDEVICE");
if ((NULL == dev) || ((fd = open(dev, O_RDWR, 0)) == -1)) { if ((NULL == dev) || ((fd = open(dev, O_RDWR, 0)) == -1)) {
dev = "/dev/dri/card0"; dev = "/dev/dri/card0";
fd = open(dev,O_RDWR, 0); fd = open(dev, O_RDWR, 0);
} }
} }
if (fd == -1) if (fd == -1)
xf86DrvMsg(-1, X_ERROR,"open %s: %s\n", dev, strerror(errno)); xf86DrvMsg(-1, X_ERROR, "open %s: %s\n", dev, strerror(errno));
return fd; return fd;
} }
static int check_outputs(int fd) static int
check_outputs(int fd)
{ {
drmModeResPtr res = drmModeGetResources(fd); drmModeResPtr res = drmModeGetResources(fd);
int ret; int ret;
@ -214,7 +216,8 @@ static int check_outputs(int fd)
return ret; return ret;
} }
static Bool probe_hw(const char *dev, struct xf86_platform_device *platform_dev) static Bool
probe_hw(const char *dev, struct xf86_platform_device *platform_dev)
{ {
int fd; int fd;
@ -230,6 +233,7 @@ static Bool probe_hw(const char *dev, struct xf86_platform_device *platform_dev)
fd = open_hw(dev); fd = open_hw(dev);
if (fd != -1) { if (fd != -1) {
int ret = check_outputs(fd); int ret = check_outputs(fd);
close(fd); close(fd);
return ret; return ret;
} }
@ -248,8 +252,8 @@ ms_DRICreatePCIBusID(const struct pci_device *dev)
return busID; return busID;
} }
static Bool
static Bool probe_hw_pci(const char *dev, struct pci_device *pdev) probe_hw_pci(const char *dev, struct pci_device *pdev)
{ {
int ret = FALSE, fd = open_hw(dev); int ret = FALSE, fd = open_hw(dev);
char *id, *devid; char *id, *devid;
@ -267,7 +271,6 @@ static Bool probe_hw_pci(const char *dev, struct pci_device *pdev)
return FALSE; return FALSE;
} }
id = drmGetBusid(fd); id = drmGetBusid(fd);
devid = ms_DRICreatePCIBusID(pdev); devid = ms_DRICreatePCIBusID(pdev);
@ -279,6 +282,7 @@ static Bool probe_hw_pci(const char *dev, struct pci_device *pdev)
free(devid); free(devid);
return ret; return ret;
} }
static const OptionInfoRec * static const OptionInfoRec *
AvailableOptions(int chipid, int busid) AvailableOptions(int chipid, int busid)
{ {
@ -292,7 +296,7 @@ ms_driver_func(ScrnInfoPtr scrn, xorgDriverFuncOp op, void *data)
switch (op) { switch (op) {
case GET_REQUIRED_HW_INTERFACES: case GET_REQUIRED_HW_INTERFACES:
flag = (CARD32 *)data; flag = (CARD32 *) data;
(*flag) = 0; (*flag) = 0;
return TRUE; return TRUE;
case SUPPORTS_SERVER_FDS: case SUPPORTS_SERVER_FDS:
@ -336,7 +340,8 @@ ms_pci_probe(DriverPtr driver,
dev->bus, dev->domain, dev->dev, dev->func); dev->bus, dev->domain, dev->dev, dev->func);
xf86DrvMsg(scrn->scrnIndex, X_INFO, xf86DrvMsg(scrn->scrnIndex, X_INFO,
"using %s\n", devpath ? devpath : "default device"); "using %s\n", devpath ? devpath : "default device");
} else }
else
scrn = NULL; scrn = NULL;
} }
return scrn != NULL; return scrn != NULL;
@ -346,7 +351,8 @@ ms_pci_probe(DriverPtr driver,
#ifdef XSERVER_PLATFORM_BUS #ifdef XSERVER_PLATFORM_BUS
static Bool static Bool
ms_platform_probe(DriverPtr driver, ms_platform_probe(DriverPtr driver,
int entity_num, int flags, struct xf86_platform_device *dev, intptr_t match_data) int entity_num, int flags, struct xf86_platform_device *dev,
intptr_t match_data)
{ {
ScrnInfoPtr scrn = NULL; ScrnInfoPtr scrn = NULL;
const char *path = xf86_platform_device_odev_attributes(dev)->path; const char *path = xf86_platform_device_odev_attributes(dev)->path;
@ -400,12 +406,12 @@ Probe(DriverPtr drv, int flags)
for (i = 0; i < numDevSections; i++) { for (i = 0; i < numDevSections; i++) {
dev = xf86FindOptionValue(devSections[i]->options,"kmsdev"); dev = xf86FindOptionValue(devSections[i]->options, "kmsdev");
if (probe_hw(dev, NULL)) { if (probe_hw(dev, NULL)) {
int entity; int entity;
entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE); entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE);
scrn = xf86ConfigFbEntity(scrn, 0, entity, scrn = xf86ConfigFbEntity(scrn, 0, entity, NULL, NULL, NULL, NULL);
NULL, NULL, NULL, NULL);
} }
if (scrn) { if (scrn) {
@ -444,10 +450,9 @@ GetRec(ScrnInfoPtr pScrn)
return TRUE; return TRUE;
} }
static int dispatch_dirty_region(ScrnInfoPtr scrn, static int
PixmapPtr pixmap, dispatch_dirty_region(ScrnInfoPtr scrn,
DamagePtr damage, PixmapPtr pixmap, DamagePtr damage, int fb_id)
int fb_id)
{ {
modesettingPtr ms = modesettingPTR(scrn); modesettingPtr ms = modesettingPTR(scrn);
RegionPtr dirty = DamageRegion(damage); RegionPtr dirty = DamageRegion(damage);
@ -481,7 +486,8 @@ static int dispatch_dirty_region(ScrnInfoPtr scrn,
return 0; return 0;
} }
static void dispatch_dirty(ScreenPtr pScreen) static void
dispatch_dirty(ScreenPtr pScreen)
{ {
ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(scrn); modesettingPtr ms = modesettingPTR(scrn);
@ -495,12 +501,14 @@ static void dispatch_dirty(ScreenPtr pScreen)
DamageUnregister(ms->damage); DamageUnregister(ms->damage);
DamageDestroy(ms->damage); DamageDestroy(ms->damage);
ms->damage = NULL; ms->damage = NULL;
xf86DrvMsg(scrn->scrnIndex, X_INFO, "Disabling kernel dirty updates, not required.\n"); xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Disabling kernel dirty updates, not required.\n");
return; return;
} }
} }
static void dispatch_dirty_crtc(ScrnInfoPtr scrn, xf86CrtcPtr crtc) static void
dispatch_dirty_crtc(ScrnInfoPtr scrn, xf86CrtcPtr crtc)
{ {
modesettingPtr ms = modesettingPTR(scrn); modesettingPtr ms = modesettingPTR(scrn);
PixmapPtr pixmap = crtc->randr_crtc->scanout_pixmap; PixmapPtr pixmap = crtc->randr_crtc->scanout_pixmap;
@ -516,7 +524,8 @@ static void dispatch_dirty_crtc(ScrnInfoPtr scrn, xf86CrtcPtr crtc)
} }
} }
static void dispatch_slave_dirty(ScreenPtr pScreen) static void
dispatch_slave_dirty(ScreenPtr pScreen)
{ {
ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@ -534,7 +543,8 @@ static void dispatch_slave_dirty(ScreenPtr pScreen)
} }
} }
static void msBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadmask) static void
msBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadmask)
{ {
modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen)); modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
@ -625,13 +635,15 @@ PreInit(ScrnInfoPtr pScrn, int flags)
msEnt = xf86GetEntityPrivate(pScrn->entityList[0], msEnt = xf86GetEntityPrivate(pScrn->entityList[0],
modesettingEntityIndex)->ptr; modesettingEntityIndex)->ptr;
ms->entityPrivate = msEnt; ms->entityPrivate = msEnt;
} else }
else
ms->entityPrivate = NULL; ms->entityPrivate = NULL;
if (xf86IsEntityShared(pScrn->entityList[0])) { if (xf86IsEntityShared(pScrn->entityList[0])) {
if (xf86IsPrimInitDone(pScrn->entityList[0])) { if (xf86IsPrimInitDone(pScrn->entityList[0])) {
/* do something */ /* do something */
} else { }
else {
xf86SetPrimInitDone(pScrn->entityList[0]); xf86SetPrimInitDone(pScrn->entityList[0]);
} }
} }
@ -644,11 +656,15 @@ PreInit(ScrnInfoPtr pScrn, int flags)
if (pEnt->location.type == BUS_PLATFORM) { if (pEnt->location.type == BUS_PLATFORM) {
#ifdef XF86_PDEV_SERVER_FD #ifdef XF86_PDEV_SERVER_FD
if (pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD) if (pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD)
ms->fd = xf86_platform_device_odev_attributes(pEnt->location.id.plat)->fd; ms->fd =
xf86_platform_device_odev_attributes(pEnt->location.id.plat)->
fd;
else else
#endif #endif
{ {
char *path = xf86_platform_device_odev_attributes(pEnt->location.id.plat)->path; char *path =
xf86_platform_device_odev_attributes(pEnt->location.id.plat)->
path;
ms->fd = open_hw(path); ms->fd = open_hw(path);
} }
} }
@ -670,7 +686,8 @@ PreInit(ScrnInfoPtr pScrn, int flags)
); );
} }
ms->fd = drmOpen(NULL, BusID); ms->fd = drmOpen(NULL, BusID);
} else { }
else {
devicename = xf86FindOptionValue(ms->pEnt->device->options, "kmsdev"); devicename = xf86FindOptionValue(ms->pEnt->device->options, "kmsdev");
ms->fd = open_hw(devicename); ms->fd = open_hw(devicename);
} }
@ -728,7 +745,7 @@ PreInit(ScrnInfoPtr pScrn, int flags)
ret = drmGetCap(ms->fd, DRM_CAP_DUMB_PREFER_SHADOW, &value); ret = drmGetCap(ms->fd, DRM_CAP_DUMB_PREFER_SHADOW, &value);
if (!ret) { if (!ret) {
prefer_shadow = !!value; prefer_shadow = ! !value;
} }
ms->cursor_width = 64; ms->cursor_width = 64;
@ -742,9 +759,12 @@ PreInit(ScrnInfoPtr pScrn, int flags)
ms->cursor_height = value; ms->cursor_height = value;
} }
ms->drmmode.shadow_enable = xf86ReturnOptValBool(ms->Options, OPTION_SHADOW_FB, prefer_shadow); ms->drmmode.shadow_enable =
xf86ReturnOptValBool(ms->Options, OPTION_SHADOW_FB, prefer_shadow);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ShadowFB: preferred %s, enabled %s\n", prefer_shadow ? "YES" : "NO", ms->drmmode.shadow_enable ? "YES" : "NO"); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ShadowFB: preferred %s, enabled %s\n",
prefer_shadow ? "YES" : "NO",
ms->drmmode.shadow_enable ? "YES" : "NO");
if (drmmode_pre_init(pScrn, &ms->drmmode, pScrn->bitsPerPixel / 8) == FALSE) { if (drmmode_pre_init(pScrn, &ms->drmmode, pScrn->bitsPerPixel / 8) == FALSE) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "KMS setup failed\n"); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "KMS setup failed\n");
goto fail; goto fail;
@ -798,7 +818,7 @@ msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8; stride = (pScrn->displayWidth * pScrn->bitsPerPixel) / 8;
*size = stride; *size = stride;
return ((uint8_t *)ms->drmmode.front_bo->ptr + row * stride + offset); return ((uint8_t *) ms->drmmode.front_bo->ptr + row * stride + offset);
} }
static void static void
@ -815,6 +835,7 @@ CreateScreenResources(ScreenPtr pScreen)
PixmapPtr rootPixmap; PixmapPtr rootPixmap;
Bool ret; Bool ret;
void *pixels; void *pixels;
pScreen->CreateScreenResources = ms->createScreenResources; pScreen->CreateScreenResources = ms->createScreenResources;
ret = pScreen->CreateScreenResources(pScreen); ret = pScreen->CreateScreenResources(pScreen);
pScreen->CreateScreenResources = CreateScreenResources; pScreen->CreateScreenResources = CreateScreenResources;
@ -851,7 +872,8 @@ CreateScreenResources(ScreenPtr pScreen)
DamageRegister(&rootPixmap->drawable, ms->damage); DamageRegister(&rootPixmap->drawable, ms->damage);
ms->dirty_enabled = TRUE; ms->dirty_enabled = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Damage tracking initialized\n"); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Damage tracking initialized\n");
} else { }
else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Failed to create screen damage record\n"); "Failed to create screen damage record\n");
return FALSE; return FALSE;
@ -876,7 +898,7 @@ msSetSharedPixmapBacking(PixmapPtr ppix, void *fd_handle)
modesettingPtr ms = modesettingPTR(scrn); modesettingPtr ms = modesettingPTR(scrn);
Bool ret; Bool ret;
int size = ppix->devKind * ppix->drawable.height; int size = ppix->devKind * ppix->drawable.height;
int ihandle = (int)(long)fd_handle; int ihandle = (int) (long) fd_handle;
ret = drmmode_SetSlaveBO(ppix, &ms->drmmode, ihandle, ppix->devKind, size); ret = drmmode_SetSlaveBO(ppix, &ms->drmmode, ihandle, ppix->devKind, size);
if (ret == FALSE) if (ret == FALSE)
@ -923,7 +945,9 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
return FALSE; return FALSE;
if (ms->drmmode.shadow_enable) { if (ms->drmmode.shadow_enable) {
ms->drmmode.shadow_fb = calloc(1, pScrn->displayWidth * pScrn->virtualY * ms->drmmode.shadow_fb =
calloc(1,
pScrn->displayWidth * pScrn->virtualY *
((pScrn->bitsPerPixel + 7) >> 3)); ((pScrn->bitsPerPixel + 7) >> 3));
if (!ms->drmmode.shadow_fb) if (!ms->drmmode.shadow_fb)
ms->drmmode.shadow_enable = FALSE; ms->drmmode.shadow_enable = FALSE;
@ -939,8 +963,9 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
if (!miSetPixmapDepths()) if (!miSetPixmapDepths())
return FALSE; return FALSE;
if (!dixRegisterScreenSpecificPrivateKey(pScreen, &ms->drmmode.pixmapPrivateKeyRec, if (!dixRegisterScreenSpecificPrivateKey
PRIVATE_PIXMAP, sizeof(msPixmapPrivRec))) { (pScreen, &ms->drmmode.pixmapPrivateKeyRec, PRIVATE_PIXMAP,
sizeof(msPixmapPrivRec))) {
return FALSE; return FALSE;
} }
@ -971,8 +996,7 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv)
fbPictureInit(pScreen, NULL, 0); fbPictureInit(pScreen, NULL, 0);
if (ms->drmmode.shadow_enable && !msShadowInit(pScreen)) { if (ms->drmmode.shadow_enable && !msShadowInit(pScreen)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "shadow fb init failed\n");
"shadow fb init failed\n");
return FALSE; return FALSE;
} }
@ -1036,6 +1060,7 @@ static void
LeaveVT(ScrnInfoPtr pScrn) LeaveVT(ScrnInfoPtr pScrn)
{ {
modesettingPtr ms = modesettingPTR(pScrn); modesettingPtr ms = modesettingPTR(pScrn);
xf86_hide_cursors(pScrn); xf86_hide_cursors(pScrn);
pScrn->vtSema = FALSE; pScrn->vtSema = FALSE;

6
hw/xfree86/drivers/modesetting/driver.h
View File

@ -35,16 +35,14 @@
#include "drmmode_display.h" #include "drmmode_display.h"
#define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg); #define DRV_ERROR(msg) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, msg);
typedef struct typedef struct {
{
int lastInstance; int lastInstance;
int refCount; int refCount;
ScrnInfoPtr pScrn_1; ScrnInfoPtr pScrn_1;
ScrnInfoPtr pScrn_2; ScrnInfoPtr pScrn_2;
} EntRec, *EntPtr; } EntRec, *EntPtr;
typedef struct _modesettingRec typedef struct _modesettingRec {
{
int fd; int fd;
EntPtr entityPrivate; EntPtr entityPrivate;

319
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -49,9 +49,9 @@
#include "driver.h" #include "driver.h"
static struct dumb_bo *dumb_bo_create(int fd, static struct dumb_bo *
const unsigned width, const unsigned height, dumb_bo_create(int fd,
const unsigned bpp) const unsigned width, const unsigned height, const unsigned bpp)
{ {
struct drm_mode_create_dumb arg; struct drm_mode_create_dumb arg;
struct dumb_bo *bo; struct dumb_bo *bo;
@ -80,7 +80,8 @@ static struct dumb_bo *dumb_bo_create(int fd,
return NULL; return NULL;
} }
static int dumb_bo_map(int fd, struct dumb_bo *bo) static int
dumb_bo_map(int fd, struct dumb_bo *bo)
{ {
struct drm_mode_map_dumb arg; struct drm_mode_map_dumb arg;
int ret; int ret;
@ -98,8 +99,7 @@ static int dumb_bo_map(int fd, struct dumb_bo *bo)
if (ret) if (ret)
return ret; return ret;
map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, map = mmap(0, bo->size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, arg.offset);
fd, arg.offset);
if (map == MAP_FAILED) if (map == MAP_FAILED)
return -errno; return -errno;
@ -108,14 +108,16 @@ static int dumb_bo_map(int fd, struct dumb_bo *bo)
} }
#if 0 #if 0
static int dumb_bo_unmap(int fd, struct dumb_bo *bo) static int
dumb_bo_unmap(int fd, struct dumb_bo *bo)
{ {
bo->map_count--; bo->map_count--;
return 0; return 0;
} }
#endif #endif
static int dumb_bo_destroy(int fd, struct dumb_bo *bo) static int
dumb_bo_destroy(int fd, struct dumb_bo *bo)
{ {
struct drm_mode_destroy_dumb arg; struct drm_mode_destroy_dumb arg;
int ret; int ret;
@ -135,7 +137,8 @@ static int dumb_bo_destroy(int fd, struct dumb_bo *bo)
return 0; return 0;
} }
static struct dumb_bo *dumb_get_bo_from_handle(int fd, int handle, int pitch, int size) static struct dumb_bo *
dumb_get_bo_from_handle(int fd, int handle, int pitch, int size)
{ {
struct dumb_bo *bo; struct dumb_bo *bo;
int ret; int ret;
@ -154,13 +157,14 @@ static struct dumb_bo *dumb_get_bo_from_handle(int fd, int handle, int pitch, in
return bo; return bo;
} }
Bool drmmode_SetSlaveBO(PixmapPtr ppix, Bool
drmmode_ptr drmmode, drmmode_SetSlaveBO(PixmapPtr ppix,
int fd_handle, int pitch, int size) drmmode_ptr drmmode, int fd_handle, int pitch, int size)
{ {
msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, ppix); msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, ppix);
ppriv->backing_bo = dumb_get_bo_from_handle(drmmode->fd, fd_handle, pitch, size); ppriv->backing_bo =
dumb_get_bo_from_handle(drmmode->fd, fd_handle, pitch, size);
if (!ppriv->backing_bo) if (!ppriv->backing_bo)
return FALSE; return FALSE;
@ -170,8 +174,7 @@ Bool drmmode_SetSlaveBO(PixmapPtr ppix,
static void static void
drmmode_ConvertFromKMode(ScrnInfoPtr scrn, drmmode_ConvertFromKMode(ScrnInfoPtr scrn,
drmModeModeInfo *kmode, drmModeModeInfo * kmode, DisplayModePtr mode)
DisplayModePtr mode)
{ {
memset(mode, 0, sizeof(DisplayModeRec)); memset(mode, 0, sizeof(DisplayModeRec));
mode->status = MODE_OK; mode->status = MODE_OK;
@ -197,13 +200,12 @@ drmmode_ConvertFromKMode(ScrnInfoPtr scrn,
mode->type = M_T_DRIVER; mode->type = M_T_DRIVER;
if (kmode->type & DRM_MODE_TYPE_PREFERRED) if (kmode->type & DRM_MODE_TYPE_PREFERRED)
mode->type |= M_T_PREFERRED; mode->type |= M_T_PREFERRED;
xf86SetModeCrtc (mode, scrn->adjustFlags); xf86SetModeCrtc(mode, scrn->adjustFlags);
} }
static void static void
drmmode_ConvertToKMode(ScrnInfoPtr scrn, drmmode_ConvertToKMode(ScrnInfoPtr scrn,
drmModeModeInfo *kmode, drmModeModeInfo * kmode, DisplayModePtr mode)
DisplayModePtr mode)
{ {
memset(kmode, 0, sizeof(*kmode)); memset(kmode, 0, sizeof(*kmode));
@ -223,7 +225,7 @@ drmmode_ConvertToKMode(ScrnInfoPtr scrn,
kmode->flags = mode->Flags; //& FLAG_BITS; kmode->flags = mode->Flags; //& FLAG_BITS;
if (mode->name) if (mode->name)
strncpy(kmode->name, mode->name, DRM_DISPLAY_MODE_LEN); strncpy(kmode->name, mode->name, DRM_DISPLAY_MODE_LEN);
kmode->name[DRM_DISPLAY_MODE_LEN-1] = 0; kmode->name[DRM_DISPLAY_MODE_LEN - 1] = 0;
} }
@ -232,6 +234,7 @@ drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
{ {
#if 0 #if 0
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
// drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; // drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
// drmmode_ptr drmmode = drmmode_crtc->drmmode; // drmmode_ptr drmmode = drmmode_crtc->drmmode;
@ -245,8 +248,7 @@ drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
#if 0 #if 0
static PixmapPtr static PixmapPtr
create_pixmap_for_fbcon(drmmode_ptr drmmode, create_pixmap_for_fbcon(drmmode_ptr drmmode, ScrnInfoPtr pScrn, int crtc_id)
ScrnInfoPtr pScrn, int crtc_id)
{ {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
drmmode_crtc_private_ptr drmmode_crtc; drmmode_crtc_private_ptr drmmode_crtc;
@ -264,8 +266,7 @@ create_pixmap_for_fbcon(drmmode_ptr drmmode,
flink.handle = fbcon->handle; flink.handle = fbcon->handle;
if (ioctl(drmmode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) { if (ioctl(drmmode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Couldn't flink fbcon handle\n");
"Couldn't flink fbcon handle\n");
return NULL; return NULL;
} }
@ -315,8 +316,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
pScrn->virtualX, height, pScrn->virtualX, height,
pScrn->depth, pScrn->bitsPerPixel, pScrn->depth, pScrn->bitsPerPixel,
drmmode->front_bo->pitch, drmmode->front_bo->pitch,
drmmode->front_bo->handle, drmmode->front_bo->handle, &drmmode->fb_id);
&drmmode->fb_id);
if (ret < 0) { if (ret < 0) {
ErrorF("failed to add fb %d\n", ret); ErrorF("failed to add fb %d\n", ret);
return FALSE; return FALSE;
@ -351,7 +351,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
continue; continue;
drmmode_output = output->driver_private; drmmode_output = output->driver_private;
output_ids[output_count] = drmmode_output->mode_output->connector_id; output_ids[output_count] =
drmmode_output->mode_output->connector_id;
output_count++; output_count++;
} }
@ -365,10 +366,12 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
fb_id = drmmode->fb_id; fb_id = drmmode->fb_id;
if (crtc->randr_crtc->scanout_pixmap) { if (crtc->randr_crtc->scanout_pixmap) {
msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, crtc->randr_crtc->scanout_pixmap); msPixmapPrivPtr ppriv =
msGetPixmapPriv(drmmode, crtc->randr_crtc->scanout_pixmap);
fb_id = ppriv->fb_id; fb_id = ppriv->fb_id;
x = y = 0; x = y = 0;
} else if (drmmode_crtc->rotate_fb_id) { }
else if (drmmode_crtc->rotate_fb_id) {
fb_id = drmmode_crtc->rotate_fb_id; fb_id = drmmode_crtc->rotate_fb_id;
x = y = 0; x = y = 0;
} }
@ -398,7 +401,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
!xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE)) !xf86ReturnOptValBool(info->Options, OPTION_SW_CURSOR, FALSE))
xf86_reload_cursors(pScrn->pScreen); xf86_reload_cursors(pScrn->pScreen);
#endif #endif
done: done:
if (!ret) { if (!ret) {
crtc->x = saved_x; crtc->x = saved_x;
crtc->y = saved_y; crtc->y = saved_y;
@ -414,13 +417,13 @@ done:
} }
static void static void
drmmode_set_cursor_colors (xf86CrtcPtr crtc, int bg, int fg) drmmode_set_cursor_colors(xf86CrtcPtr crtc, int bg, int fg)
{ {
} }
static void static void
drmmode_set_cursor_position (xf86CrtcPtr crtc, int x, int y) drmmode_set_cursor_position(xf86CrtcPtr crtc, int x, int y)
{ {
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode; drmmode_ptr drmmode = drmmode_crtc->drmmode;
@ -429,7 +432,7 @@ drmmode_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
} }
static void static void
drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image) drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 *image)
{ {
modesettingPtr ms = modesettingPTR(crtc->scrn); modesettingPtr ms = modesettingPTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
@ -437,13 +440,16 @@ drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
uint32_t *ptr; uint32_t *ptr;
uint32_t handle = drmmode_crtc->cursor_bo->handle; uint32_t handle = drmmode_crtc->cursor_bo->handle;
int ret; int ret;
/* cursor should be mapped already */ /* cursor should be mapped already */
ptr = (uint32_t *)(drmmode_crtc->cursor_bo->ptr); ptr = (uint32_t *) (drmmode_crtc->cursor_bo->ptr);
for (i = 0; i < ms->cursor_width * ms->cursor_height; i++) for (i = 0; i < ms->cursor_width * ms->cursor_height; i++)
ptr[i] = image[i];// cpu_to_le32(image[i]); ptr[i] = image[i]; // cpu_to_le32(image[i]);
ret = drmModeSetCursor(drmmode_crtc->drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, ret =
drmModeSetCursor(drmmode_crtc->drmmode->fd,
drmmode_crtc->mode_crtc->crtc_id, handle,
ms->cursor_width, ms->cursor_height); ms->cursor_width, ms->cursor_height);
if (ret) { if (ret) {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
@ -455,9 +461,8 @@ drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
} }
} }
static void static void
drmmode_hide_cursor (xf86CrtcPtr crtc) drmmode_hide_cursor(xf86CrtcPtr crtc)
{ {
modesettingPtr ms = modesettingPTR(crtc->scrn); modesettingPtr ms = modesettingPTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
@ -469,7 +474,7 @@ drmmode_hide_cursor (xf86CrtcPtr crtc)
} }
static void static void
drmmode_show_cursor (xf86CrtcPtr crtc) drmmode_show_cursor(xf86CrtcPtr crtc)
{ {
modesettingPtr ms = modesettingPTR(crtc->scrn); modesettingPtr ms = modesettingPTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
@ -481,7 +486,11 @@ drmmode_show_cursor (xf86CrtcPtr crtc)
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
CursorPtr cursor = xf86_config->cursor; CursorPtr cursor = xf86_config->cursor;
int ret; int ret;
ret = drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, ms->cursor_width, ms->cursor_height, cursor->bits->xhot, cursor->bits->yhot);
ret =
drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
handle, ms->cursor_width, ms->cursor_height,
cursor->bits->xhot, cursor->bits->yhot);
if (ret == -EINVAL) if (ret == -EINVAL)
use_set_cursor2 = FALSE; use_set_cursor2 = FALSE;
else else
@ -493,8 +502,8 @@ drmmode_show_cursor (xf86CrtcPtr crtc)
} }
static void static void
drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t *red, uint16_t *green, drmmode_crtc_gamma_set(xf86CrtcPtr crtc, uint16_t * red, uint16_t * green,
uint16_t *blue, int size) uint16_t * blue, int size)
{ {
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode; drmmode_ptr drmmode = drmmode_crtc->drmmode;
@ -540,20 +549,19 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
ppix->drawable.height, ppix->drawable.height,
ppix->drawable.depth, ppix->drawable.depth,
ppix->drawable.bitsPerPixel, ppix->drawable.bitsPerPixel,
ppix->devKind, ppix->devKind, ppriv->backing_bo->handle, &ppriv->fb_id);
ppriv->backing_bo->handle,
&ppriv->fb_id);
} }
return TRUE; return TRUE;
} }
static void *drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height) static void *
drmmode_shadow_allocate(xf86CrtcPtr crtc, int width, int height)
{ {
return NULL; return NULL;
} }
static PixmapPtr drmmode_shadow_create(xf86CrtcPtr crtc, void *data, int width, static PixmapPtr
int height) drmmode_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
{ {
return NULL; return NULL;
} }
@ -585,7 +593,8 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num)
return; return;
drmmode_crtc = xnfcalloc(sizeof(drmmode_crtc_private_rec), 1); drmmode_crtc = xnfcalloc(sizeof(drmmode_crtc_private_rec), 1);
drmmode_crtc->mode_crtc = drmModeGetCrtc(drmmode->fd, drmmode->mode_res->crtcs[num]); drmmode_crtc->mode_crtc =
drmModeGetCrtc(drmmode->fd, drmmode->mode_res->crtcs[num]);
drmmode_crtc->drmmode = drmmode; drmmode_crtc->drmmode = drmmode;
crtc->driver_private = drmmode_crtc; crtc->driver_private = drmmode_crtc;
} }
@ -597,9 +606,11 @@ drmmode_output_detect(xf86OutputPtr output)
drmmode_output_private_ptr drmmode_output = output->driver_private; drmmode_output_private_ptr drmmode_output = output->driver_private;
drmmode_ptr drmmode = drmmode_output->drmmode; drmmode_ptr drmmode = drmmode_output->drmmode;
xf86OutputStatus status; xf86OutputStatus status;
drmModeFreeConnector(drmmode_output->mode_output); drmModeFreeConnector(drmmode_output->mode_output);
drmmode_output->mode_output = drmModeGetConnector(drmmode->fd, drmmode_output->output_id); drmmode_output->mode_output =
drmModeGetConnector(drmmode->fd, drmmode_output->output_id);
if (!drmmode_output->mode_output) if (!drmmode_output->mode_output)
return XF86OutputStatusDisconnected; return XF86OutputStatusDisconnected;
@ -653,8 +664,7 @@ has_panel_fitter(xf86OutputPtr output)
} }
static DisplayModePtr static DisplayModePtr
drmmode_output_add_gtf_modes(xf86OutputPtr output, drmmode_output_add_gtf_modes(xf86OutputPtr output, DisplayModePtr Modes)
DisplayModePtr Modes)
{ {
xf86MonPtr mon = output->MonInfo; xf86MonPtr mon = output->MonInfo;
DisplayModePtr i, m, preferred = NULL; DisplayModePtr i, m, preferred = NULL;
@ -717,7 +727,9 @@ drmmode_output_get_modes(xf86OutputPtr output)
if (!strcmp(props->name, "EDID")) { if (!strcmp(props->name, "EDID")) {
if (drmmode_output->edid_blob) if (drmmode_output->edid_blob)
drmModeFreePropertyBlob(drmmode_output->edid_blob); drmModeFreePropertyBlob(drmmode_output->edid_blob);
drmmode_output->edid_blob = drmModeGetPropertyBlob(drmmode->fd, koutput->prop_values[i]); drmmode_output->edid_blob =
drmModeGetPropertyBlob(drmmode->fd,
koutput->prop_values[i]);
} }
drmModeFreeProperty(props); drmModeFreeProperty(props);
} }
@ -780,7 +792,6 @@ drmmode_output_dpms(xf86OutputPtr output, int mode)
return; return;
} }
static Bool static Bool
drmmode_property_ignore(drmModePropertyPtr prop) drmmode_property_ignore(drmModePropertyPtr prop)
{ {
@ -790,8 +801,7 @@ drmmode_property_ignore(drmModePropertyPtr prop)
if (prop->flags & DRM_MODE_PROP_BLOB) if (prop->flags & DRM_MODE_PROP_BLOB)
return TRUE; return TRUE;
/* ignore standard property */ /* ignore standard property */
if (!strcmp(prop->name, "EDID") || if (!strcmp(prop->name, "EDID") || !strcmp(prop->name, "DPMS"))
!strcmp(prop->name, "DPMS"))
return TRUE; return TRUE;
return FALSE; return FALSE;
@ -806,7 +816,8 @@ drmmode_output_create_resources(xf86OutputPtr output)
drmModePropertyPtr drmmode_prop; drmModePropertyPtr drmmode_prop;
int i, j, err; int i, j, err;
drmmode_output->props = calloc(mode_output->count_props, sizeof(drmmode_prop_rec)); drmmode_output->props =
calloc(mode_output->count_props, sizeof(drmmode_prop_rec));
if (!drmmode_output->props) if (!drmmode_output->props)
return; return;
@ -825,6 +836,7 @@ drmmode_output_create_resources(xf86OutputPtr output)
for (i = 0; i < drmmode_output->num_props; i++) { for (i = 0; i < drmmode_output->num_props; i++) {
drmmode_prop_ptr p = &drmmode_output->props[i]; drmmode_prop_ptr p = &drmmode_output->props[i];
drmmode_prop = p->mode_prop; drmmode_prop = p->mode_prop;
if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) { if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) {
@ -835,37 +847,45 @@ drmmode_output_create_resources(xf86OutputPtr output)
p->atoms = calloc(p->num_atoms, sizeof(Atom)); p->atoms = calloc(p->num_atoms, sizeof(Atom));
if (!p->atoms) if (!p->atoms)
continue; continue;
p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE); p->atoms[0] =
MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
prop_range[0] = drmmode_prop->values[0]; prop_range[0] = drmmode_prop->values[0];
prop_range[1] = drmmode_prop->values[1]; prop_range[1] = drmmode_prop->values[1];
err = RRConfigureOutputProperty(output->randr_output, p->atoms[0], err = RRConfigureOutputProperty(output->randr_output, p->atoms[0],
FALSE, TRUE, FALSE, TRUE,
drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE, drmmode_prop->
2, prop_range); flags & DRM_MODE_PROP_IMMUTABLE ?
TRUE : FALSE, 2, prop_range);
if (err != 0) { if (err != 0) {
xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
"RRConfigureOutputProperty error, %d\n", err); "RRConfigureOutputProperty error, %d\n", err);
} }
err = RRChangeOutputProperty(output->randr_output, p->atoms[0], err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
XA_INTEGER, 32, PropModeReplace, 1, &value, FALSE, TRUE); XA_INTEGER, 32, PropModeReplace, 1,
&value, FALSE, TRUE);
if (err != 0) { if (err != 0) {
xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
"RRChangeOutputProperty error, %d\n", err); "RRChangeOutputProperty error, %d\n", err);
} }
} else if (drmmode_prop->flags & DRM_MODE_PROP_ENUM) { }
else if (drmmode_prop->flags & DRM_MODE_PROP_ENUM) {
p->num_atoms = drmmode_prop->count_enums + 1; p->num_atoms = drmmode_prop->count_enums + 1;
p->atoms = calloc(p->num_atoms, sizeof(Atom)); p->atoms = calloc(p->num_atoms, sizeof(Atom));
if (!p->atoms) if (!p->atoms)
continue; continue;
p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE); p->atoms[0] =
MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
for (j = 1; j <= drmmode_prop->count_enums; j++) { for (j = 1; j <= drmmode_prop->count_enums; j++) {
struct drm_mode_property_enum *e = &drmmode_prop->enums[j-1]; struct drm_mode_property_enum *e = &drmmode_prop->enums[j - 1];
p->atoms[j] = MakeAtom(e->name, strlen(e->name), TRUE); p->atoms[j] = MakeAtom(e->name, strlen(e->name), TRUE);
} }
err = RRConfigureOutputProperty(output->randr_output, p->atoms[0], err = RRConfigureOutputProperty(output->randr_output, p->atoms[0],
FALSE, FALSE, FALSE, FALSE,
drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE, drmmode_prop->
p->num_atoms - 1, (INT32 *)&p->atoms[1]); flags & DRM_MODE_PROP_IMMUTABLE ?
TRUE : FALSE, p->num_atoms - 1,
(INT32 *) &p->atoms[1]);
if (err != 0) { if (err != 0) {
xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
"RRConfigureOutputProperty error, %d\n", err); "RRConfigureOutputProperty error, %d\n", err);
@ -875,7 +895,8 @@ drmmode_output_create_resources(xf86OutputPtr output)
break; break;
/* there's always a matching value */ /* there's always a matching value */
err = RRChangeOutputProperty(output->randr_output, p->atoms[0], err = RRChangeOutputProperty(output->randr_output, p->atoms[0],
XA_ATOM, 32, PropModeReplace, 1, &p->atoms[j+1], FALSE, TRUE); XA_ATOM, 32, PropModeReplace, 1,
&p->atoms[j + 1], FALSE, TRUE);
if (err != 0) { if (err != 0) {
xf86DrvMsg(output->scrn->scrnIndex, X_ERROR, xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
"RRChangeOutputProperty error, %d\n", err); "RRChangeOutputProperty error, %d\n", err);
@ -904,17 +925,19 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
if (value->type != XA_INTEGER || value->format != 32 || if (value->type != XA_INTEGER || value->format != 32 ||
value->size != 1) value->size != 1)
return FALSE; return FALSE;
val = *(uint32_t *)value->data; val = *(uint32_t *) value->data;
drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id, drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id,
p->mode_prop->prop_id, (uint64_t)val); p->mode_prop->prop_id, (uint64_t) val);
return TRUE; return TRUE;
} else if (p->mode_prop->flags & DRM_MODE_PROP_ENUM) { }
else if (p->mode_prop->flags & DRM_MODE_PROP_ENUM) {
Atom atom; Atom atom;
const char *name; const char *name;
int j; int j;
if (value->type != XA_ATOM || value->format != 32 || value->size != 1) if (value->type != XA_ATOM || value->format != 32 ||
value->size != 1)
return FALSE; return FALSE;
memcpy(&atom, value->data, 4); memcpy(&atom, value->data, 4);
name = NameForAtom(atom); name = NameForAtom(atom);
@ -922,8 +945,10 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property,
/* search for matching name string, then set its value down */ /* search for matching name string, then set its value down */
for (j = 0; j < p->mode_prop->count_enums; j++) { for (j = 0; j < p->mode_prop->count_enums; j++) {
if (!strcmp(p->mode_prop->enums[j].name, name)) { if (!strcmp(p->mode_prop->enums[j].name, name)) {
drmModeConnectorSetProperty(drmmode->fd, drmmode_output->output_id, drmModeConnectorSetProperty(drmmode->fd,
p->mode_prop->prop_id, p->mode_prop->enums[j].value); drmmode_output->output_id,
p->mode_prop->prop_id,
p->mode_prop->enums[j].value);
return TRUE; return TRUE;
} }
} }
@ -956,9 +981,10 @@ static int subpixel_conv_table[7] = { 0, SubPixelUnknown,
SubPixelHorizontalBGR, SubPixelHorizontalBGR,
SubPixelVerticalRGB, SubPixelVerticalRGB,
SubPixelVerticalBGR, SubPixelVerticalBGR,
SubPixelNone }; SubPixelNone
};
static const char * const output_names[] = { "None", static const char *const output_names[] = { "None",
"VGA", "VGA",
"DVI", "DVI",
"DVI", "DVI",
@ -978,7 +1004,8 @@ static const char * const output_names[] = { "None",
}; };
static void static void
drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int *num_dvi, int *num_hdmi) drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num,
int *num_dvi, int *num_hdmi)
{ {
xf86OutputPtr output; xf86OutputPtr output;
drmModeConnectorPtr koutput; drmModeConnectorPtr koutput;
@ -988,7 +1015,8 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int *num_dv
char name[32]; char name[32];
int i; int i;
koutput = drmModeGetConnector(drmmode->fd, drmmode->mode_res->connectors[num]); koutput =
drmModeGetConnector(drmmode->fd, drmmode->mode_res->connectors[num]);
if (!koutput) if (!koutput)
return; return;
@ -1008,11 +1036,14 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int *num_dv
if (koutput->connector_type >= MS_ARRAY_SIZE(output_names)) if (koutput->connector_type >= MS_ARRAY_SIZE(output_names))
snprintf(name, 32, "Unknown-%d", koutput->connector_type_id - 1); snprintf(name, 32, "Unknown-%d", koutput->connector_type_id - 1);
else if (pScrn->is_gpu) else if (pScrn->is_gpu)
snprintf(name, 32, "%s-%d-%d", output_names[koutput->connector_type], pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1, koutput->connector_type_id - 1); snprintf(name, 32, "%s-%d-%d", output_names[koutput->connector_type],
pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1,
koutput->connector_type_id - 1);
else else
snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id - 1); snprintf(name, 32, "%s-%d", output_names[koutput->connector_type],
koutput->connector_type_id - 1);
output = xf86OutputCreate (pScrn, &drmmode_output_funcs, name); output = xf86OutputCreate(pScrn, &drmmode_output_funcs, name);
if (!output) { if (!output) {
goto out_free_encoders; goto out_free_encoders;
} }
@ -1055,8 +1086,8 @@ drmmode_output_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num, int *num_dv
} }
return; return;
out_free_encoders: out_free_encoders:
if (kencoders){ if (kencoders) {
for (i = 0; i < koutput->count_encoders; i++) for (i = 0; i < koutput->count_encoders; i++)
drmModeFreeEncoder(kencoders[i]); drmModeFreeEncoder(kencoders[i]);
free(kencoders); free(kencoders);
@ -1065,9 +1096,11 @@ out_free_encoders:
} }
static uint32_t find_clones(ScrnInfoPtr scrn, xf86OutputPtr output) static uint32_t
find_clones(ScrnInfoPtr scrn, xf86OutputPtr output)
{ {
drmmode_output_private_ptr drmmode_output = output->driver_private, clone_drmout; drmmode_output_private_ptr drmmode_output =
output->driver_private, clone_drmout;
int i; int i;
xf86OutputPtr clone_output; xf86OutputPtr clone_output;
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@ -1090,7 +1123,6 @@ static uint32_t find_clones(ScrnInfoPtr scrn, xf86OutputPtr output)
return index_mask; return index_mask;
} }
static void static void
drmmode_clones_init(ScrnInfoPtr scrn, drmmode_ptr drmmode) drmmode_clones_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
{ {
@ -1104,28 +1136,32 @@ drmmode_clones_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
drmmode_output = output->driver_private; drmmode_output = output->driver_private;
drmmode_output->enc_clone_mask = 0xff; drmmode_output->enc_clone_mask = 0xff;
/* and all the possible encoder clones for this output together */ /* and all the possible encoder clones for this output together */
for (j = 0; j < drmmode_output->mode_output->count_encoders; j++) for (j = 0; j < drmmode_output->mode_output->count_encoders; j++) {
{
int k; int k;
for (k = 0; k < drmmode->mode_res->count_encoders; k++) { for (k = 0; k < drmmode->mode_res->count_encoders; k++) {
if (drmmode->mode_res->encoders[k] == drmmode_output->mode_encoders[j]->encoder_id) if (drmmode->mode_res->encoders[k] ==
drmmode_output->mode_encoders[j]->encoder_id)
drmmode_output->enc_mask |= (1 << k); drmmode_output->enc_mask |= (1 << k);
} }
drmmode_output->enc_clone_mask &= drmmode_output->mode_encoders[j]->possible_clones; drmmode_output->enc_clone_mask &=
drmmode_output->mode_encoders[j]->possible_clones;
} }
} }
for (i = 0; i < xf86_config->num_output; i++) { for (i = 0; i < xf86_config->num_output; i++) {
xf86OutputPtr output = xf86_config->output[i]; xf86OutputPtr output = xf86_config->output[i];
output->possible_clones = find_clones(scrn, output); output->possible_clones = find_clones(scrn, output);
} }
} }
static Bool static Bool
drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height) drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
{ {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
drmmode_crtc_private_ptr drmmode_crtc_private_ptr
drmmode_crtc = xf86_config->crtc[0]->driver_private; drmmode_crtc = xf86_config->crtc[0]->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode; drmmode_ptr drmmode = drmmode_crtc->drmmode;
@ -1142,8 +1178,7 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
return TRUE; return TRUE;
xf86DrvMsg(scrn->scrnIndex, X_INFO, xf86DrvMsg(scrn->scrnIndex, X_INFO,
"Allocate new frame buffer %dx%d stride\n", "Allocate new frame buffer %dx%d stride\n", width, height);
width, height);
old_width = scrn->virtualX; old_width = scrn->virtualX;
old_height = scrn->virtualY; old_height = scrn->virtualY;
@ -1151,7 +1186,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
old_fb_id = drmmode->fb_id; old_fb_id = drmmode->fb_id;
old_front = drmmode->front_bo; old_front = drmmode->front_bo;
drmmode->front_bo = dumb_bo_create(drmmode->fd, width, height, scrn->bitsPerPixel); drmmode->front_bo =
dumb_bo_create(drmmode->fd, width, height, scrn->bitsPerPixel);
if (!drmmode->front_bo) if (!drmmode->front_bo)
goto fail; goto fail;
@ -1163,8 +1199,7 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
ret = drmModeAddFB(drmmode->fd, width, height, scrn->depth, ret = drmModeAddFB(drmmode->fd, width, height, scrn->depth,
scrn->bitsPerPixel, pitch, scrn->bitsPerPixel, pitch,
drmmode->front_bo->handle, drmmode->front_bo->handle, &drmmode->fb_id);
&drmmode->fb_id);
if (ret) if (ret)
goto fail; goto fail;
@ -1221,7 +1256,8 @@ static const xf86CrtcConfigFuncsRec drmmode_xf86crtc_config_funcs = {
drmmode_xf86crtc_resize drmmode_xf86crtc_resize
}; };
Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp) Bool
drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
{ {
int i, num_dvi = 0, num_hdmi = 0; int i, num_dvi = 0, num_hdmi = 0;
int ret; int ret;
@ -1230,7 +1266,8 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
/* check for dumb capability */ /* check for dumb capability */
ret = drmGetCap(drmmode->fd, DRM_CAP_DUMB_BUFFER, &value); ret = drmGetCap(drmmode->fd, DRM_CAP_DUMB_BUFFER, &value);
if (ret > 0 || value != 1) { if (ret > 0 || value != 1) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "KMS doesn't support dumb interface\n"); xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"KMS doesn't support dumb interface\n");
return FALSE; return FALSE;
} }
@ -1242,9 +1279,11 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
if (!drmmode->mode_res) if (!drmmode->mode_res)
return FALSE; return FALSE;
xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width, drmmode->mode_res->max_height); xf86CrtcSetSizeRange(pScrn, 320, 200, drmmode->mode_res->max_width,
drmmode->mode_res->max_height);
for (i = 0; i < drmmode->mode_res->count_crtcs; i++) for (i = 0; i < drmmode->mode_res->count_crtcs; i++)
if (!xf86IsEntityShared(pScrn->entityList[0]) || pScrn->confScreen->device->screen == i) if (!xf86IsEntityShared(pScrn->entityList[0]) ||
pScrn->confScreen->device->screen == i)
drmmode_crtc_init(pScrn, drmmode, i); drmmode_crtc_init(pScrn, drmmode, i);
for (i = 0; i < drmmode->mode_res->count_connectors; i++) for (i = 0; i < drmmode->mode_res->count_connectors; i++)
@ -1262,19 +1301,20 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
return TRUE; return TRUE;
} }
void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y) void
drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y)
{ {
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86OutputPtr output = config->output[config->compat_output]; xf86OutputPtr output = config->output[config->compat_output];
xf86CrtcPtr crtc = output->crtc; xf86CrtcPtr crtc = output->crtc;
if (crtc && crtc->enabled) { if (crtc && crtc->enabled) {
drmmode_set_mode_major(crtc, &crtc->mode, crtc->rotation, drmmode_set_mode_major(crtc, &crtc->mode, crtc->rotation, x, y);
x, y);
} }
} }
Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode) Bool
drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{ {
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
int c; int c;
@ -1294,11 +1334,9 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
if (config->output[config->compat_output]->crtc == crtc) if (config->output[config->compat_output]->crtc == crtc)
output = config->output[config->compat_output]; output = config->output[config->compat_output];
else else {
{
for (o = 0; o < config->num_output; o++) for (o = 0; o < config->num_output; o++)
if (config->output[o]->crtc == crtc) if (config->output[o]->crtc == crtc) {
{
output = config->output[o]; output = config->output[o];
break; break;
} }
@ -1309,9 +1347,9 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
/* Mark that we'll need to re-set the mode for sure */ /* Mark that we'll need to re-set the mode for sure */
memset(&crtc->mode, 0, sizeof(crtc->mode)); memset(&crtc->mode, 0, sizeof(crtc->mode));
if (!crtc->desiredMode.CrtcHDisplay) if (!crtc->desiredMode.CrtcHDisplay) {
{ DisplayModePtr mode =
DisplayModePtr mode = xf86OutputFindClosestMode (output, pScrn->currentMode); xf86OutputFindClosestMode(output, pScrn->currentMode);
if (!mode) if (!mode)
return FALSE; return FALSE;
@ -1321,15 +1359,17 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
crtc->desiredY = 0; crtc->desiredY = 0;
} }
if (!crtc->funcs->set_mode_major(crtc, &crtc->desiredMode, crtc->desiredRotation, if (!crtc->funcs->
set_mode_major(crtc, &crtc->desiredMode, crtc->desiredRotation,
crtc->desiredX, crtc->desiredY)) crtc->desiredX, crtc->desiredY))
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors, static void
int *indices, LOCO *colors, VisualPtr pVisual) drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
int *indices, LOCO * colors, VisualPtr pVisual)
{ {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
uint16_t lut_r[256], lut_g[256], lut_b[256]; uint16_t lut_r[256], lut_g[256], lut_b[256];
@ -1340,13 +1380,13 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
xf86CrtcPtr crtc = xf86_config->crtc[c]; xf86CrtcPtr crtc = xf86_config->crtc[c];
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
for (i = 0 ; i < 256; i++) { for (i = 0; i < 256; i++) {
lut_r[i] = drmmode_crtc->lut_r[i] << 6; lut_r[i] = drmmode_crtc->lut_r[i] << 6;
lut_g[i] = drmmode_crtc->lut_g[i] << 6; lut_g[i] = drmmode_crtc->lut_g[i] << 6;
lut_b[i] = drmmode_crtc->lut_b[i] << 6; lut_b[i] = drmmode_crtc->lut_b[i] << 6;
} }
switch(pScrn->depth) { switch (pScrn->depth) {
case 15: case 15:
for (i = 0; i < numColors; i++) { for (i = 0; i < numColors; i++) {
index = indices[i]; index = indices[i];
@ -1391,16 +1431,15 @@ static void drmmode_load_palette(ScrnInfoPtr pScrn, int numColors,
} }
} }
Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn) Bool
drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn)
{ {
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0, xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 0, "Initializing kms color map\n");
"Initializing kms color map\n");
if (!miCreateDefColormap(pScreen)) if (!miCreateDefColormap(pScreen))
return FALSE; return FALSE;
/* all radeons support 10 bit CLUTs */ /* all radeons support 10 bit CLUTs */
if (!xf86HandleColormaps(pScreen, 256, 10, if (!xf86HandleColormaps(pScreen, 256, 10,
drmmode_load_palette, NULL, drmmode_load_palette, NULL, CMAP_PALETTED_TRUECOLOR
CMAP_PALETTED_TRUECOLOR
#if 0 /* This option messes up text mode! (eich@suse.de) */ #if 0 /* This option messes up text mode! (eich@suse.de) */
| CMAP_LOAD_EVEN_IF_OFFSCREEN | CMAP_LOAD_EVEN_IF_OFFSCREEN
#endif #endif
@ -1416,6 +1455,7 @@ drmmode_handle_uevents(int fd, void *closure)
drmmode_ptr drmmode = closure; drmmode_ptr drmmode = closure;
ScrnInfoPtr scrn = drmmode->scrn; ScrnInfoPtr scrn = drmmode->scrn;
struct udev_device *dev; struct udev_device *dev;
dev = udev_monitor_receive_device(drmmode->uevent_monitor); dev = udev_monitor_receive_device(drmmode->uevent_monitor);
if (!dev) if (!dev)
return; return;
@ -1425,7 +1465,8 @@ drmmode_handle_uevents(int fd, void *closure)
} }
#endif #endif
void drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode) void
drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
{ {
#ifdef HAVE_UDEV #ifdef HAVE_UDEV
struct udev *u; struct udev *u;
@ -1451,18 +1492,19 @@ void drmmode_uevent_init(ScrnInfoPtr scrn, drmmode_ptr drmmode)
drmmode->uevent_handler = drmmode->uevent_handler =
xf86AddGeneralHandler(udev_monitor_get_fd(mon), xf86AddGeneralHandler(udev_monitor_get_fd(mon),
drmmode_handle_uevents, drmmode_handle_uevents, drmmode);
drmmode);
drmmode->uevent_monitor = mon; drmmode->uevent_monitor = mon;
#endif #endif
} }
void drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode) void
drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode)
{ {
#ifdef HAVE_UDEV #ifdef HAVE_UDEV
if (drmmode->uevent_handler) { if (drmmode->uevent_handler) {
struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor); struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor);
xf86RemoveGeneralHandler(drmmode->uevent_handler); xf86RemoveGeneralHandler(drmmode->uevent_handler);
udev_monitor_unref(drmmode->uevent_monitor); udev_monitor_unref(drmmode->uevent_monitor);
@ -1472,7 +1514,8 @@ void drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode)
} }
/* create front and cursor BOs */ /* create front and cursor BOs */
Bool drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode) Bool
drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{ {
modesettingPtr ms = modesettingPTR(pScrn); modesettingPtr ms = modesettingPTR(pScrn);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
@ -1496,12 +1539,15 @@ Bool drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
for (i = 0; i < xf86_config->num_crtc; i++) { for (i = 0; i < xf86_config->num_crtc; i++) {
xf86CrtcPtr crtc = xf86_config->crtc[i]; xf86CrtcPtr crtc = xf86_config->crtc[i];
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_crtc->cursor_bo = dumb_bo_create(drmmode->fd, width, height, bpp);
drmmode_crtc->cursor_bo =
dumb_bo_create(drmmode->fd, width, height, bpp);
} }
return TRUE; return TRUE;
} }
void *drmmode_map_front_bo(drmmode_ptr drmmode) void *
drmmode_map_front_bo(drmmode_ptr drmmode)
{ {
int ret; int ret;
@ -1516,7 +1562,8 @@ void *drmmode_map_front_bo(drmmode_ptr drmmode)
} }
void *drmmode_map_slave_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv) void *
drmmode_map_slave_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv)
{ {
int ret; int ret;
@ -1530,13 +1577,16 @@ void *drmmode_map_slave_bo(drmmode_ptr drmmode, msPixmapPrivPtr ppriv)
return ppriv->backing_bo->ptr; return ppriv->backing_bo->ptr;
} }
Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode) Bool
drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{ {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
int i, ret; int i, ret;
for (i = 0; i < xf86_config->num_crtc; i++) { for (i = 0; i < xf86_config->num_crtc; i++) {
xf86CrtcPtr crtc = xf86_config->crtc[i]; xf86CrtcPtr crtc = xf86_config->crtc[i];
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
ret = dumb_bo_map(drmmode->fd, drmmode_crtc->cursor_bo); ret = dumb_bo_map(drmmode->fd, drmmode_crtc->cursor_bo);
if (ret) if (ret)
return FALSE; return FALSE;
@ -1544,7 +1594,8 @@ Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
return TRUE; return TRUE;
} }
void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode) void
drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{ {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
int i; int i;
@ -1560,12 +1611,15 @@ void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
for (i = 0; i < xf86_config->num_crtc; i++) { for (i = 0; i < xf86_config->num_crtc; i++) {
xf86CrtcPtr crtc = xf86_config->crtc[i]; xf86CrtcPtr crtc = xf86_config->crtc[i];
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
dumb_bo_destroy(drmmode->fd, drmmode_crtc->cursor_bo); dumb_bo_destroy(drmmode->fd, drmmode_crtc->cursor_bo);
} }
} }
/* ugly workaround to see if we can create 32bpp */ /* ugly workaround to see if we can create 32bpp */
void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int *depth, int *bpp) void
drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int *depth,
int *bpp)
{ {
drmModeResPtr mode_res; drmModeResPtr mode_res;
uint64_t value; uint64_t value;
@ -1591,7 +1645,8 @@ void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int *depth,
if (mode_res->min_height == 0) if (mode_res->min_height == 0)
mode_res->min_height = 1; mode_res->min_height = 1;
/*create a bo */ /*create a bo */
bo = dumb_bo_create(drmmode->fd, mode_res->min_width, mode_res->min_height, 32); bo = dumb_bo_create(drmmode->fd, mode_res->min_width, mode_res->min_height,
32);
if (!bo) { if (!bo) {
*bpp = 24; *bpp = 24;
goto out; goto out;
@ -1610,7 +1665,7 @@ void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int *depth,
*bpp = 32; *bpp = 32;
dumb_bo_destroy(drmmode->fd, bo); dumb_bo_destroy(drmmode->fd, bo);
out: out:
drmModeFreeResources(mode_res); drmModeFreeResources(mode_res);
return; return;
} }

8
hw/xfree86/drivers/modesetting/drmmode_display.h
View File

@ -78,7 +78,6 @@ typedef struct {
Atom *atoms; Atom *atoms;
} drmmode_prop_rec, *drmmode_prop_ptr; } drmmode_prop_rec, *drmmode_prop_ptr;
typedef struct { typedef struct {
drmmode_ptr drmmode; drmmode_ptr drmmode;
int output_id; int output_id;
@ -97,8 +96,8 @@ typedef struct _msPixmapPriv {
struct dumb_bo *backing_bo; /* if this pixmap is backed by a dumb bo */ struct dumb_bo *backing_bo; /* if this pixmap is backed by a dumb bo */
} msPixmapPrivRec, *msPixmapPrivPtr; } msPixmapPrivRec, *msPixmapPrivPtr;
extern DevPrivateKeyRec msPixmapPrivateKeyRec; extern DevPrivateKeyRec msPixmapPrivateKeyRec;
#define msPixmapPrivateKey (&msPixmapPrivateKeyRec) #define msPixmapPrivateKey (&msPixmapPrivateKeyRec)
#define msGetPixmapPriv(drmmode, p) ((msPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, &(drmmode)->pixmapPrivateKeyRec)) #define msGetPixmapPriv(drmmode, p) ((msPixmapPrivPtr)dixGetPrivateAddr(&(p)->devPrivates, &(drmmode)->pixmapPrivateKeyRec))
@ -120,8 +119,8 @@ Bool drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void *drmmode_map_front_bo(drmmode_ptr drmmode); void *drmmode_map_front_bo(drmmode_ptr drmmode);
Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode); Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode); void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode, int *depth, int *bpp); void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode,
int *depth, int *bpp);
#ifndef DRM_CAP_DUMB_PREFERRED_DEPTH #ifndef DRM_CAP_DUMB_PREFERRED_DEPTH
#define DRM_CAP_DUMB_PREFERRED_DEPTH 3 #define DRM_CAP_DUMB_PREFERRED_DEPTH 3
@ -132,5 +131,4 @@ void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode, int *depth
#define MS_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) #define MS_ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
#endif #endif