diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-25 03:55:43 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-25 03:55:57 +0300 |
| commit | 535f6f5d7b7f7b3127c1c8172ff0504260d14f45 (patch) | |
| tree | d4e8c8cdb35fd4eb488ddbdc29b80a1a8191b901 /drivers/gpu/drm/drm_atomic_helper.c | |
| parent | b9e687fc0aa40307af873dbd4ccb66bd95989ae5 (diff) | |
| parent | 12e32f554d8ddd121f17aaaa9cda25d0be612af9 (diff) | |
| download | linux-535f6f5d7b7f7b3127c1c8172ff0504260d14f45.tar.xz | |
Merge tag 'du-next-20190318' of git://linuxtv.org/pinchartl/media into drm-next
Renesas display drivers changes for v5.2:
- Display writeback (includes VSP changes and DRM/KMS API changes)
(All v4l patches acked by Mauro)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190318153613.GE12707@pendragon.ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/drm_atomic_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic_helper.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 3b7eb58817f0..dc8ae98071b4 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2261,10 +2261,21 @@ EXPORT_SYMBOL(drm_atomic_helper_commit_cleanup_done); int drm_atomic_helper_prepare_planes(struct drm_device *dev, struct drm_atomic_state *state) { + struct drm_connector *connector; + struct drm_connector_state *new_conn_state; struct drm_plane *plane; struct drm_plane_state *new_plane_state; int ret, i, j; + for_each_new_connector_in_state(state, connector, new_conn_state, i) { + if (!new_conn_state->writeback_job) + continue; + + ret = drm_writeback_prepare_job(new_conn_state->writeback_job); + if (ret < 0) + return ret; + } + for_each_new_plane_in_state(state, plane, new_plane_state, i) { const struct drm_plane_helper_funcs *funcs; |