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

Revert "Replace huge argument list in xf86CrtcSetModeTransform with struct" 

This reverts commit 8b35118c03.
This commit is contained in:
Keith Packard 2011-02-23 11:18:35 -08:00
parent 7030c82648
commit b833f9b924
3 changed files with 65 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
hw/xfree86/modes/xf86Crtc.c
View File

@ -247,14 +247,15 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen)
* Sets the given video mode on the given crtc * Sets the given video mode on the given crtc
*/ */
Bool Bool
xf86CrtcSet(xf86CrtcPtr crtc, xf86CrtcSetRec *set) xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
RRTransformPtr transform, int x, int y)
{ {
ScrnInfoPtr scrn = crtc->scrn; ScrnInfoPtr scrn = crtc->scrn;
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
int i; int i;
Bool ret = FALSE; Bool ret = FALSE;
Bool didLock = FALSE; Bool didLock = FALSE;
DisplayModePtr adjusted_mode = NULL; DisplayModePtr adjusted_mode;
DisplayModeRec saved_mode; DisplayModeRec saved_mode;
int saved_x, saved_y; int saved_x, saved_y;
Rotation saved_rotation; Rotation saved_rotation;
@ -271,9 +272,8 @@ xf86CrtcSet(xf86CrtcPtr crtc, xf86CrtcSetRec *set)
return TRUE; return TRUE;
} }
/* See if nothing has changed */ adjusted_mode = xf86DuplicateMode(mode);
if (!set->flags)
return TRUE;
saved_mode = crtc->mode; saved_mode = crtc->mode;
saved_x = crtc->x; saved_x = crtc->x;
@ -288,44 +288,21 @@ xf86CrtcSet(xf86CrtcPtr crtc, xf86CrtcSetRec *set)
/* Update crtc values up front so the driver can rely on them for mode /* Update crtc values up front so the driver can rely on them for mode
* setting. * setting.
*/ */
if (set->flags & XF86CrtcSetMode) crtc->mode = *mode;
crtc->mode = *set->mode; crtc->x = x;
if (set->flags & XF86CrtcSetOrigin) { crtc->y = y;
crtc->x = set->x; crtc->rotation = rotation;
crtc->y = set->y; if (transform) {
} RRTransformCopy (&crtc->transform, transform);
if (set->flags & XF86CrtcSetRotation) crtc->transformPresent = TRUE;
crtc->rotation = set->rotation; } else
crtc->transformPresent = FALSE;
if (set->flags & XF86CrtcSetTransform) {
if (set->transform) {
RRTransformCopy (&crtc->transform, set->transform);
crtc->transformPresent = TRUE;
} else
crtc->transformPresent = FALSE;
}
if (crtc->funcs->set) {
ret = crtc->funcs->set(crtc, set->flags);
goto done;
}
if (set->flags == XF86CrtcSetOrigin && crtc->funcs->set_origin) {
ret = xf86CrtcRotate(crtc);
if (ret)
crtc->funcs->set_origin(crtc, crtc->x, crtc->y);
goto done;
}
if (crtc->funcs->set_mode_major) { if (crtc->funcs->set_mode_major) {
ret = crtc->funcs->set_mode_major(crtc, &crtc->mode, ret = crtc->funcs->set_mode_major(crtc, mode, rotation, x, y);
crtc->rotation,
crtc->x, crtc->y);
goto done; goto done;
} }
adjusted_mode = xf86DuplicateMode(&crtc->mode);
didLock = crtc->funcs->lock (crtc); didLock = crtc->funcs->lock (crtc);
/* Pass our mode to the outputs and the CRTC to give them a chance to /* Pass our mode to the outputs and the CRTC to give them a chance to
* adjust it according to limitations or output properties, and also * adjust it according to limitations or output properties, and also
@ -337,12 +314,12 @@ xf86CrtcSet(xf86CrtcPtr crtc, xf86CrtcSetRec *set)
if (output->crtc != crtc) if (output->crtc != crtc)
continue; continue;
if (!output->funcs->mode_fixup(output, &crtc->mode, adjusted_mode)) { if (!output->funcs->mode_fixup(output, mode, adjusted_mode)) {
goto done; goto done;
} }
} }
if (!crtc->funcs->mode_fixup(crtc, &crtc->mode, adjusted_mode)) { if (!crtc->funcs->mode_fixup(crtc, mode, adjusted_mode)) {
goto done; goto done;
} }
@ -365,12 +342,12 @@ xf86CrtcSet(xf86CrtcPtr crtc, xf86CrtcSetRec *set)
/* Set up the DPLL and any output state that needs to adjust or depend /* Set up the DPLL and any output state that needs to adjust or depend
* on the DPLL. * on the DPLL.
*/ */
crtc->funcs->mode_set(crtc, &crtc->mode, adjusted_mode, crtc->x, crtc->y); crtc->funcs->mode_set(crtc, mode, adjusted_mode, crtc->x, crtc->y);
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];
if (output->crtc == crtc) if (output->crtc == crtc)
output->funcs->mode_set(output, &crtc->mode, adjusted_mode); output->funcs->mode_set(output, mode, adjusted_mode);
} }
/* Only upload when needed, to avoid unneeded delays. */ /* Only upload when needed, to avoid unneeded delays. */
@ -406,10 +383,8 @@ done:
crtc->transformPresent = saved_transform_present; crtc->transformPresent = saved_transform_present;
} }
if (adjusted_mode) { free(adjusted_mode->name);
free(adjusted_mode->name); free(adjusted_mode);
free(adjusted_mode);
}
if (didLock) if (didLock)
crtc->funcs->unlock (crtc); crtc->funcs->unlock (crtc);
@ -417,20 +392,36 @@ done:
return ret; return ret;
} }
/**
* Sets the given video mode on the given crtc, but without providing
* a transform
*/
Bool
xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
int x, int y)
{
return xf86CrtcSetModeTransform (crtc, mode, rotation, NULL, x, y);
}
/** /**
* Pans the screen, does not change the mode * Pans the screen, does not change the mode
*/ */
void void
xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y) xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)
{ {
xf86CrtcSetRec set; ScrnInfoPtr scrn = crtc->scrn;
if (x != crtc->x || y != crtc->y) { crtc->x = x;
set.x = x; crtc->y = y;
set.y = y; if (crtc->funcs->set_origin) {
set.flags = XF86CrtcSetOrigin; if (!xf86CrtcRotate (crtc))
(void) xf86CrtcSet(crtc, &set); return;
crtc->funcs->set_origin (crtc, x, y);
if (scrn->ModeSet)
scrn->ModeSet(scrn);
} }
else
xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);
} }
/* /*
@ -2621,7 +2612,6 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
for (c = 0; c < config->num_crtc; c++) for (c = 0; c < config->num_crtc; c++)
{ {
xf86OutputPtr output = NULL; xf86OutputPtr output = NULL;
xf86CrtcSetRec set;
int o; int o;
RRTransformPtr transform; RRTransformPtr transform;
@ -2665,15 +2655,8 @@ xf86SetDesiredModes (ScrnInfoPtr scrn)
transform = &crtc->desiredTransform; transform = &crtc->desiredTransform;
else else
transform = NULL; transform = NULL;
set.mode = &crtc->desiredMode; if (!xf86CrtcSetModeTransform (crtc, &crtc->desiredMode, crtc->desiredRotation,
set.rotation = crtc->desiredRotation; transform, crtc->desiredX, crtc->desiredY))
set.transform = transform;
set.x = crtc->desiredX;
set.y = crtc->desiredY;
set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |
XF86CrtcSetOrigin | XF86CrtcSetTransform |
XF86CrtcSetRotation);
if (!xf86CrtcSet(crtc, &set))
return FALSE; return FALSE;
} }
@ -2777,7 +2760,6 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
xf86CrtcPtr crtc = config->crtc[c]; xf86CrtcPtr crtc = config->crtc[c];
DisplayModePtr crtc_mode = NULL; DisplayModePtr crtc_mode = NULL;
int o; int o;
xf86CrtcSetRec set;
if (!crtc->enabled) if (!crtc->enabled)
continue; continue;
@ -2805,15 +2787,7 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation)
crtc->enabled = FALSE; crtc->enabled = FALSE;
continue; continue;
} }
set.mode = crtc_mode; if (!xf86CrtcSetModeTransform (crtc, crtc_mode, rotation, NULL, 0, 0))
set.rotation = rotation;
set.transform = NULL;
set.x = 0;
set.y = 0;
set.flags = (XF86CrtcSetMode | XF86CrtcSetOutput |
XF86CrtcSetOrigin | XF86CrtcSetTransform |
XF86CrtcSetRotation);
if (!xf86CrtcSet (crtc, &set))
ok = FALSE; ok = FALSE;
else else
{ {

33
hw/xfree86/modes/xf86Crtc.h
View File

@ -72,23 +72,6 @@ typedef enum _xf86OutputStatus {
XF86OutputStatusUnknown XF86OutputStatusUnknown
} xf86OutputStatus; } xf86OutputStatus;
typedef enum _xf86CrtcSetFlags {
XF86CrtcSetMode = 1, /* mode */
XF86CrtcSetOutput = 2, /* outputs */
XF86CrtcSetOrigin = 4, /* x/y */
XF86CrtcSetTransform = 8, /* transform */
XF86CrtcSetRotation = 16, /* rotation */
XF86CrtcSetProperty = 32, /* output property */
} xf86CrtcSetFlags;
typedef struct _xf86CrtcSet {
xf86CrtcSetFlags flags;
DisplayModePtr mode;
Rotation rotation;
RRTransformPtr transform;
int x, y;
} xf86CrtcSetRec;
typedef struct _xf86CrtcFuncs { typedef struct _xf86CrtcFuncs {
/** /**
* Turns the crtc on/off, or sets intermediate power levels if available. * Turns the crtc on/off, or sets intermediate power levels if available.
@ -238,12 +221,6 @@ typedef struct _xf86CrtcFuncs {
void void
(*set_origin)(xf86CrtcPtr crtc, int x, int y); (*set_origin)(xf86CrtcPtr crtc, int x, int y);
/**
* General mode setting entry point that does everything
*/
Bool
(*set)(xf86CrtcPtr crtc, xf86CrtcSetFlags flags);
} xf86CrtcFuncsRec, *xf86CrtcFuncsPtr; } xf86CrtcFuncsRec, *xf86CrtcFuncsPtr;
#define XF86_CRTC_VERSION 3 #define XF86_CRTC_VERSION 3
@ -761,12 +738,18 @@ xf86CrtcCreate (ScrnInfoPtr scrn,
extern _X_EXPORT void extern _X_EXPORT void
xf86CrtcDestroy (xf86CrtcPtr crtc); xf86CrtcDestroy (xf86CrtcPtr crtc);
/** /**
* Change a crtc configuration (modes, outputs, etc) * Sets the given video mode on the given crtc
*/ */
extern _X_EXPORT Bool extern _X_EXPORT Bool
xf86CrtcSet (xf86CrtcPtr crtc, xf86CrtcSetRec *set); xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
RRTransformPtr transform, int x, int y);
extern _X_EXPORT Bool
xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
int x, int y);
extern _X_EXPORT void extern _X_EXPORT void
xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y); xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y);

29
hw/xfree86/modes/xf86RandR12.c
View File

@ -1133,7 +1133,7 @@ xf86RandR12CrtcSet (ScreenPtr pScreen,
xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
xf86CrtcPtr crtc = randr_crtc->devPrivate; xf86CrtcPtr crtc = randr_crtc->devPrivate;
RRTransformPtr transform; RRTransformPtr transform;
xf86CrtcSetFlags flags = 0; Bool changed = FALSE;
int o, ro; int o, ro;
xf86CrtcPtr *save_crtcs; xf86CrtcPtr *save_crtcs;
Bool save_enabled = crtc->enabled; Bool save_enabled = crtc->enabled;
@ -1143,22 +1143,22 @@ xf86RandR12CrtcSet (ScreenPtr pScreen,
save_crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr)); save_crtcs = malloc(config->num_output * sizeof (xf86CrtcPtr));
if ((randr_mode != NULL) != crtc->enabled) if ((randr_mode != NULL) != crtc->enabled)
flags |= XF86CrtcSetMode; changed = TRUE;
else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode)) else if (randr_mode && !xf86RandRModeMatches (randr_mode, &crtc->mode))
flags |= XF86CrtcSetMode; changed = TRUE;
if (rotation != crtc->rotation) if (rotation != crtc->rotation)
flags |= XF86CrtcSetRotation; changed = TRUE;
transform = RRCrtcGetTransform (randr_crtc); transform = RRCrtcGetTransform (randr_crtc);
if ((transform != NULL) != crtc->transformPresent) if ((transform != NULL) != crtc->transformPresent)
flags |= XF86CrtcSetTransform; changed = TRUE;
else if (transform && memcmp (&transform->transform, &crtc->transform.transform, else if (transform && memcmp (&transform->transform, &crtc->transform.transform,
sizeof (transform->transform)) != 0) sizeof (transform->transform)) != 0)
flags |= XF86CrtcSetTransform; changed = TRUE;
if (x != crtc->x || y != crtc->y) if (x != crtc->x || y != crtc->y)
flags |= XF86CrtcSetOrigin; changed = TRUE;
for (o = 0; o < config->num_output; o++) for (o = 0; o < config->num_output; o++)
{ {
xf86OutputPtr output = config->output[o]; xf86OutputPtr output = config->output[o];
@ -1178,16 +1178,16 @@ xf86RandR12CrtcSet (ScreenPtr pScreen,
} }
if (new_crtc != output->crtc) if (new_crtc != output->crtc)
{ {
flags |= XF86CrtcSetOutput; changed = TRUE;
output->crtc = new_crtc; output->crtc = new_crtc;
} }
} }
for (ro = 0; ro < num_randr_outputs; ro++) for (ro = 0; ro < num_randr_outputs; ro++)
if (randr_outputs[ro]->pendingProperties) if (randr_outputs[ro]->pendingProperties)
flags |= XF86CrtcSetProperty; changed = TRUE;
/* XXX need device-independent mode setting code through an API */ /* XXX need device-independent mode setting code through an API */
if (flags) if (changed)
{ {
crtc->enabled = randr_mode != NULL; crtc->enabled = randr_mode != NULL;
@ -1195,16 +1195,9 @@ xf86RandR12CrtcSet (ScreenPtr pScreen,
{ {
DisplayModeRec mode; DisplayModeRec mode;
RRTransformPtr transform = RRCrtcGetTransform (randr_crtc); RRTransformPtr transform = RRCrtcGetTransform (randr_crtc);
xf86CrtcSetRec set;
xf86RandRModeConvert (pScrn, randr_mode, &mode); xf86RandRModeConvert (pScrn, randr_mode, &mode);
set.mode = &mode; if (!xf86CrtcSetModeTransform (crtc, &mode, rotation, transform, x, y))
set.rotation = rotation;
set.transform = transform;
set.x = x;
set.y = y;
set.flags = flags;
if (!xf86CrtcSet(crtc, &set))
{ {
crtc->enabled = save_enabled; crtc->enabled = save_enabled;
for (o = 0; o < config->num_output; o++) for (o = 0; o < config->num_output; o++)