xf86-video-ati: Branch 'master' - 3 commits
Michel Dänzer
daenzer at kemper.freedesktop.org
Wed Jul 8 19:00:15 PDT 2015
src/drmmode_display.c | 19 ++++++++++--
src/drmmode_display.h | 3 ++
src/radeon_present.c | 74 ++++++++++++++++++++++++++++++++++++--------------
3 files changed, 72 insertions(+), 24 deletions(-)
New commits:
commit 95f5d09e3667ded027ae648c97eb4737d8bf67c5
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Thu May 28 11:24:42 2015 +0900
present: Handle DPMS off in radeon_present_get_ust_msc
The DRM_IOCTL_WAIT_VBLANK ioctl may return an error during DPMS off,
which would trigger an error message in drmmode_crtc_get_ust_msc.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/radeon_present.c b/src/radeon_present.c
index 49acb23..bd4d8f2 100644
--- a/src/radeon_present.c
+++ b/src/radeon_present.c
@@ -87,7 +87,13 @@ radeon_present_get_crtc(WindowPtr window)
static int
radeon_present_get_ust_msc(RRCrtcPtr crtc, CARD64 *ust, CARD64 *msc)
{
- return drmmode_crtc_get_ust_msc(crtc->devPrivate, ust, msc);
+ xf86CrtcPtr xf86_crtc = crtc->devPrivate;
+ drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
+
+ if (drmmode_crtc->dpms_mode != DPMSModeOn)
+ return BadAlloc;
+
+ return drmmode_crtc_get_ust_msc(xf86_crtc, ust, msc);
}
/*
commit 211862b777d0be251a4662f5dd24f2d400544c09
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri May 1 18:20:01 2015 +0900
present: Look at all CRTCs to determine if we can flip
Inspired by modesetting driver change by Kenneth Graunke.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/radeon_present.c b/src/radeon_present.c
index bc1053e..49acb23 100644
--- a/src/radeon_present.c
+++ b/src/radeon_present.c
@@ -229,6 +229,9 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap,
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
RADEONInfoPtr info = RADEONPTR(scrn);
PixmapPtr screen_pixmap;
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+ int num_crtcs_on;
+ int i;
if (!scrn->vtSema)
return FALSE;
@@ -250,17 +253,20 @@ radeon_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap,
radeon_present_get_pixmap_tiling_flags(info, screen_pixmap))
return FALSE;
- if (crtc) {
- xf86CrtcPtr xf86_crtc = crtc->devPrivate;
- drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;
+ for (i = 0, num_crtcs_on = 0; i < config->num_crtc; i++) {
+ drmmode_crtc_private_ptr drmmode_crtc = config->crtc[i]->driver_private;
+
+ if (!config->crtc[i]->enabled)
+ continue;
- if (!drmmode_crtc ||
- drmmode_crtc->rotate.bo != NULL ||
- drmmode_crtc->dpms_mode != DPMSModeOn)
+ if (!drmmode_crtc || drmmode_crtc->rotate.bo != NULL)
return FALSE;
+
+ if (drmmode_crtc->dpms_mode == DPMSModeOn)
+ num_crtcs_on++;
}
- return TRUE;
+ return num_crtcs_on > 0;
}
/*
commit 802d33e474a82262d9cdf11b03568b0c4929cd0d
Author: Michel Dänzer <michel.daenzer at amd.com>
Date: Fri May 1 18:54:16 2015 +0900
present: Fall back to modeset for unflip operation
It's not always possible to use the page flip ioctl for this, e.g.
during DPMS off. We were previously just skipping the unflip in that
case, which could result in hangs when setting DPMS off while a
fullscreen Present app is running, e.g. at the GNOME3 lock screen.
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 8483909..ad2f48b 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -769,6 +769,9 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
if (crtc->scrn->pScreen)
xf86CrtcSetScreenSubpixelOrder(crtc->scrn->pScreen);
+
+ drmmode_crtc->need_modeset = FALSE;
+
/* go through all the outputs and force DPMS them back on? */
for (i = 0; i < xf86_config->num_output; i++) {
xf86OutputPtr output = xf86_config->output[i];
@@ -1153,20 +1156,28 @@ static void
drmmode_output_dpms(xf86OutputPtr output, int mode)
{
drmmode_output_private_ptr drmmode_output = output->driver_private;
+ xf86CrtcPtr crtc = output->crtc;
drmModeConnectorPtr koutput = drmmode_output->mode_output;
drmmode_ptr drmmode = drmmode_output->drmmode;
if (!koutput)
return;
- if (mode != DPMSModeOn && output->crtc)
- drmmode_do_crtc_dpms(output->crtc, mode);
+ if (mode != DPMSModeOn && crtc)
+ drmmode_do_crtc_dpms(crtc, mode);
drmModeConnectorSetProperty(drmmode->fd, koutput->connector_id,
drmmode_output->dpms_enum_id, mode);
- if (mode == DPMSModeOn && output->crtc)
- drmmode_do_crtc_dpms(output->crtc, mode);
+ if (mode == DPMSModeOn && crtc) {
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+
+ if (drmmode_crtc->need_modeset)
+ drmmode_set_mode_major(crtc, &crtc->mode, crtc->rotation, crtc->x,
+ crtc->y);
+ else
+ drmmode_do_crtc_dpms(crtc, mode);
+ }
}
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index ca42c7d..ab6c590 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -99,6 +99,9 @@ typedef struct {
uint32_t interpolated_vblanks;
uint16_t lut_r[256], lut_g[256], lut_b[256];
int prime_pixmap_x;
+
+ /* Modeset needed for DPMS on */
+ Bool need_modeset;
} drmmode_crtc_private_rec, *drmmode_crtc_private_ptr;
typedef struct {
diff --git a/src/radeon_present.c b/src/radeon_present.c
index c48df13..bc1053e 100644
--- a/src/radeon_present.c
+++ b/src/radeon_present.c
@@ -341,30 +341,52 @@ radeon_present_unflip(ScreenPtr screen, uint64_t event_id)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
RADEONInfoPtr info = RADEONPTR(scrn);
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
struct radeon_present_vblank_event *event;
PixmapPtr pixmap = screen->GetScreenPixmap(screen);
uint32_t handle;
- Bool ret;
+ int i;
if (!radeon_present_check_flip(NULL, screen->root, pixmap, TRUE))
- return;
+ goto modeset;
- if (!radeon_get_pixmap_handle(pixmap, &handle))
- return;
+ if (!radeon_get_pixmap_handle(pixmap, &handle)) {
+ ErrorF("%s: radeon_get_pixmap_handle failed, display might freeze\n",
+ __func__);
+ goto modeset;
+ }
event = calloc(1, sizeof(struct radeon_present_vblank_event));
- if (!event)
- return;
+ if (!event) {
+ ErrorF("%s: calloc failed, display might freeze\n", __func__);
+ goto modeset;
+ }
event->event_id = event_id;
- ret = radeon_do_pageflip(scrn, RADEON_DRM_QUEUE_CLIENT_DEFAULT, handle,
- event_id, event, -1, radeon_present_flip_event,
- radeon_present_flip_abort);
- if (!ret) {
- xf86DrvMsg(scrn->scrnIndex, X_ERROR, "present unflip failed\n");
- info->drmmode.present_flipping = FALSE;
+ if (radeon_do_pageflip(scrn, RADEON_DRM_QUEUE_CLIENT_DEFAULT, handle,
+ event_id, event, -1, radeon_present_flip_event,
+ radeon_present_flip_abort))
+ return;
+
+modeset:
+ for (i = 0; i < config->num_crtc; i++) {
+ xf86CrtcPtr crtc = config->crtc[i];
+ drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
+
+ if (!crtc->enabled)
+ continue;
+
+ if (drmmode_crtc->dpms_mode == DPMSModeOn)
+ crtc->funcs->set_mode_major(crtc, &crtc->mode, crtc->rotation,
+ crtc->x, crtc->y);
+ else
+ drmmode_crtc->need_modeset = TRUE;
}
+
+ present_event_notify(event_id, 0, 0);
+
+ info->drmmode.present_flipping = FALSE;
}
static present_screen_info_rec radeon_present_screen_info = {
More information about the xorg-commit
mailing list