diff options
author | Dave Airlie <airlied@redhat.com> | 2017-12-19 12:37:24 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-12-19 12:37:24 +0100 |
commit | 6b7dcb536e3535444c39286333f10d06d2f44fb5 (patch) | |
tree | 6a4c1e30e5900626e506d46b100d21a2fcd59003 /drivers/media/platform/vsp1 | |
parent | Merge tag 'drm-misc-next-2017-12-14' of git://anongit.freedesktop.org/drm/drm... (diff) | |
parent | Linux 4.15-rc4 (diff) | |
download | linux-6b7dcb536e3535444c39286333f10d06d2f44fb5.tar.xz linux-6b7dcb536e3535444c39286333f10d06d2f44fb5.zip |
BackMerge tag 'v4.15-rc4' into drm-next
Linux 4.15-rc4
Daniel requested it to fix some messy conflicts.
Diffstat (limited to 'drivers/media/platform/vsp1')
-rw-r--r-- | drivers/media/platform/vsp1/vsp1_dl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c index 8b5cbb6b7a70..4257451f1bd8 100644 --- a/drivers/media/platform/vsp1/vsp1_dl.c +++ b/drivers/media/platform/vsp1/vsp1_dl.c @@ -70,6 +70,7 @@ struct vsp1_dl_body { * @dma: DMA address for the header * @body0: first display list body * @fragments: list of extra display list bodies + * @has_chain: if true, indicates that there's a partition chain * @chain: entry in the display list partition chain */ struct vsp1_dl_list { |