diff options
| author | Gustavo Padovan | 2018-07-06 18:34:13 +0200 |
|---|---|---|
| committer | Gustavo Padovan | 2018-07-06 18:34:13 +0200 |
| commit | e22e953189f7b3a3bfc7efb511d2b1d1454adde5 (patch) | |
| tree | 87e56e966e1f676f2c9389c41aa5c37969f757f1 /drivers/gpu/drm/drm_atomic.c | |
| parent | drm/crc: Only report a single overflow when a CRC fd is opened (diff) | |
| parent | Merge commit 'refs/for-upstream/mali-dp' of git://linux-arm.org/linux-ld into... (diff) | |
| download | kernel-qcow2-linux-e22e953189f7b3a3bfc7efb511d2b1d1454adde5.tar.gz kernel-qcow2-linux-e22e953189f7b3a3bfc7efb511d2b1d1454adde5.tar.xz kernel-qcow2-linux-e22e953189f7b3a3bfc7efb511d2b1d1454adde5.zip | |
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.c | 4 |
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); } |