diff options
author | Dave Airlie <airlied@redhat.com> | 2018-07-06 03:02:10 +0300 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-07-06 03:02:13 +0300 |
commit | 4da1d4c751c9b1b713c13043bad7c4d27cd1418c (patch) | |
tree | cbb3cbcc28faffe2d56a483913d825603eb2bf59 /drivers/gpu/drm/drm_atomic.c | |
parent | a1c3b49523aeb89a7f5ffa852c29db9c4e5ac8dd (diff) | |
parent | e368fc75c190a4ad5853e4ec5a0c8acf86bd5119 (diff) | |
download | linux-4da1d4c751c9b1b713c13043bad7c4d27cd1418c.tar.xz |
Merge commit 'refs/for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
"mali-dp driver changes for drm-next, includes the driver implementation
for writeback, improvements for power management handling in the driver
and a debugfs entry for reporting possible internal errors. Please pull
at your earliest convenience.
Boris Brezillon is also interested in this pull as he is going to change
slightly the parameter for the writeback connector's atomic_commit() and
he needs to fix the mali-dp driver in his series."
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180705144408.GH15340@e110455-lin.cambridge.arm.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 d5cefb1cb2a2..4215be9a9fc5 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1436,6 +1436,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); } |