diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-06-16 10:04:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-06-16 10:04:14 +1000 |
| commit | 202dfa086dfa9a250d9ad0ec393251a8e23248d6 (patch) | |
| tree | 3566a2e4880cb8195c3d3e820d916d518b23c73a /drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | |
| parent | 7249e3d64ee512521087de802d3f3ad504258535 (diff) | |
| parent | fa5b4114202de0c1a7a64fd407af0b81ca529419 (diff) | |
Merge branch 'drm/next/du' of git://linuxtv.org/pinchartl/media into drm-next
The series interleaves DRM and V4L2 patches due to dependencies between the R-
Car DU and VSP drivers. Mauro has acked all the V4L2 patches to go through
your tree, and they don't conflict with anything queued for v4.13 in his tree.
If I need to send any conflicting patches through Mauro's tree for v4.13, I'll
make sure to base them on this branch.
* 'drm/next/du' of git://linuxtv.org/pinchartl/media:
drm: rcar-du: Map memory through the VSP device
v4l: vsp1: Add API to map and unmap DRM buffers through the VSP
v4l: vsp1: Map the DL and video buffers through the proper bus master
v4l: rcar-fcp: Add an API to retrieve the FCP device
v4l: rcar-fcp: Don't get/put module reference
drm: rcar-du: Register a completion callback with VSP1
v4l: vsp1: Extend VSP1 module API to allow DRM callbacks
v4l: vsp1: Postpone frame end handling in event of display list race
drm: rcar-du: Arm the page flip event after queuing the page flip
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c')
0 files changed, 0 insertions, 0 deletions