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

formatting fixes

This commit is contained in:
Alan Hourihane 2008-06-26 22:25:17 +01:00
parent 47969d7928
commit 2a45c28712
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/xfree86/drivers/modesetting/crtc.c
View File

@ -47,7 +47,8 @@
#define DPMS_SERVER
#include <X11/extensions/dpms.h>
struct crtc_private {
struct crtc_private
{
drmModeCrtcPtr drm_crtc;
/* hwcursor */
@ -122,6 +123,8 @@ crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
drm_mode.hskew = mode->HSkew;
drm_mode.vscan = mode->VScan;
drm_mode.vrefresh = mode->VRefresh;
if (!mode->name)
xf86SetModeDefaultName(mode);
strncpy(drm_mode.name, mode->name, DRM_DISPLAY_MODE_LEN);
drmModeSetCrtc(ms->fd, drm_crtc->crtc_id, ms->fb_id, x, y,
@ -176,7 +179,7 @@ crtc_destroy(xf86CrtcPtr crtc)
}
static void
crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
crtc_load_cursor_argb(xf86CrtcPtr crtc, CARD32 * image)
{
unsigned char *ptr;
modesettingPtr ms = modesettingPTR(crtc->scrn);
@ -189,16 +192,17 @@ crtc_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
DRM_BO_FLAG_MEM_VRAM,
DRM_BO_HINT_DONT_FENCE, &crtcp->cursor_bo);
drmBOMap(ms->fd, &crtcp->cursor_bo, DRM_BO_FLAG_WRITE, DRM_BO_HINT_DONT_FENCE, (void **)&ptr);
drmBOMap(ms->fd, &crtcp->cursor_bo, DRM_BO_FLAG_WRITE,
DRM_BO_HINT_DONT_FENCE, (void **)&ptr);
if (ptr)
memcpy (ptr, image, 64 * 64 * 4);
memcpy(ptr, image, 64 * 64 * 4);
drmBOUnmap(ms->fd, &crtcp->cursor_bo);
}
static void
crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
crtc_set_cursor_position(xf86CrtcPtr crtc, int x, int y)
{
modesettingPtr ms = modesettingPTR(crtc->scrn);
struct crtc_private *crtcp = crtc->driver_private;
@ -207,17 +211,18 @@ crtc_set_cursor_position (xf86CrtcPtr crtc, int x, int y)
}
static void
crtc_show_cursor (xf86CrtcPtr crtc)
crtc_show_cursor(xf86CrtcPtr crtc)
{
modesettingPtr ms = modesettingPTR(crtc->scrn);
struct crtc_private *crtcp = crtc->driver_private;
if (crtcp->cursor_bo.handle)
drmModeSetCursor(ms->fd, crtcp->drm_crtc->crtc_id, crtcp->cursor_bo.handle, 64, 64);
drmModeSetCursor(ms->fd, crtcp->drm_crtc->crtc_id,
crtcp->cursor_bo.handle, 64, 64);
}
static void
crtc_hide_cursor (xf86CrtcPtr crtc)
crtc_hide_cursor(xf86CrtcPtr crtc)
{
modesettingPtr ms = modesettingPTR(crtc->scrn);
struct crtc_private *crtcp = crtc->driver_private;