summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2015-10-21 17:18:44 +0900
committerMichel Dänzer <michel@daenzer.net>2015-10-21 17:18:44 +0900
commit9c8b7ebe15eec7abd5dc10ad6ccecbc57225494a (patch)
treec06e4bb2c9c39785c498220306d131141e0fc5ab /src
parent0a6ba4bf50128464a30951721b0c72e748fb89bc (diff)
Revert "Handle RandR CRTC transforms properly"
This reverts commit 175251645fec1a3d19f498e1cd1e655374c67801. I accidentally pushed this patch.
Diffstat (limited to 'src')
-rw-r--r--src/drmmode_display.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 8393499..4193be4 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -607,6 +607,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
crtc->x = x;
crtc->y = y;
crtc->rotation = rotation;
+ crtc->transformPresent = FALSE;
output_ids = calloc(sizeof(uint32_t), xf86_config->num_output);
if (!output_ids) {
@@ -777,15 +778,6 @@ static void drmmode_load_cursor_argb(xf86CrtcPtr crtc, CARD32 * image)
}
}
-static Bool drmmode_load_cursor_argb_check(xf86CrtcPtr crtc, CARD32 * image)
-{
- if (crtc->transformPresent)
- return FALSE;
-
- drmmode_load_cursor_argb(crtc, image);
- return TRUE;
-}
-
static void drmmode_hide_cursor(xf86CrtcPtr crtc)
{
ScrnInfoPtr pScrn = crtc->scrn;
@@ -933,7 +925,6 @@ static xf86CrtcFuncsRec drmmode_crtc_funcs = {
.show_cursor = drmmode_show_cursor,
.hide_cursor = drmmode_hide_cursor,
.load_cursor_argb = drmmode_load_cursor_argb,
- .load_cursor_argb_check = drmmode_load_cursor_argb_check,
.gamma_set = drmmode_crtc_gamma_set,
.shadow_create = drmmode_crtc_shadow_create,