diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-25 10:55:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-25 10:55:57 +1000 |
| commit | 535f6f5d7b7f7b3127c1c8172ff0504260d14f45 (patch) | |
| tree | d4e8c8cdb35fd4eb488ddbdc29b80a1a8191b901 /drivers/gpu/drm/arm/malidp_mw.c | |
| parent | b9e687fc0aa40307af873dbd4ccb66bd95989ae5 (diff) | |
| parent | 12e32f554d8ddd121f17aaaa9cda25d0be612af9 (diff) | |
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/arm/malidp_mw.c')
| -rw-r--r-- | drivers/gpu/drm/arm/malidp_mw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/arm/malidp_mw.c b/drivers/gpu/drm/arm/malidp_mw.c index 041a64dc7167..87627219ce3b 100644 --- a/drivers/gpu/drm/arm/malidp_mw.c +++ b/drivers/gpu/drm/arm/malidp_mw.c @@ -252,8 +252,7 @@ void malidp_mw_atomic_commit(struct drm_device *drm, &mw_state->addrs[0], mw_state->format); - drm_writeback_queue_job(mw_conn, conn_state->writeback_job); - conn_state->writeback_job = NULL; + drm_writeback_queue_job(mw_conn, conn_state); hwdev->hw->enable_memwrite(hwdev, mw_state->addrs, mw_state->pitches, mw_state->n_planes, fb->width, fb->height, mw_state->format, |