summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/drm_atomic.c
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.com>2018-07-06 19:34:13 +0300
committerGustavo Padovan <gustavo.padovan@collabora.com>2018-07-06 19:34:13 +0300
commite22e953189f7b3a3bfc7efb511d2b1d1454adde5 (patch)
tree87e56e966e1f676f2c9389c41aa5c37969f757f1 /drivers/gpu/drm/drm_atomic.c
parenta012024571d98e2e4bf29a9168fb7ddc44b7ab86 (diff)
parent4da1d4c751c9b1b713c13043bad7c4d27cd1418c (diff)
downloadlinux-e22e953189f7b3a3bfc7efb511d2b1d1454adde5.tar.xz
Merge drm-upstream/drm-next into drm-misc-next
Pull in the malidp writeback implementation for further work on writeback in drm-misc-next. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
-rw-r--r--drivers/gpu/drm/drm_atomic.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 7c55991170cc..e6062c779aaf 100644
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -1437,6 +1437,10 @@ static void drm_atomic_connector_print_state(struct drm_printer *p,
drm_printf(p, "connector[%u]: %s\n", connector->base.id, connector->name);
drm_printf(p, "\tcrtc=%s\n", state->crtc ? state->crtc->name : "(null)");
+ if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
+ if (state->writeback_job && state->writeback_job->fb)
+ drm_printf(p, "\tfb=%d\n", state->writeback_job->fb->base.id);
+
if (connector->funcs->atomic_print_state)
connector->funcs->atomic_print_state(p, state);
}