diff options
| author | Dave Airlie <[email protected]> | 2016-05-10 05:07:50 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-05-10 05:07:50 +0000 |
| commit | 19ea5da07a1f315191212e094ec44fb1caec9580 (patch) | |
| tree | c1fa2de3639215cdb9f714ed6db27625a983058e /drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |
| parent | Merge tag 'mediatek-drm-2016-05-09' of git://git.pengutronix.de/git/pza/linux... (diff) | |
| parent | drm/etnaviv: fix mmap operations for userptr and dma-buf objects (diff) | |
| download | kernel-19ea5da07a1f315191212e094ec44fb1caec9580.tar.gz kernel-19ea5da07a1f315191212e094ec44fb1caec9580.zip | |
Merge branch 'drm-etnaviv-next' of git://git.pengutronix.de:/git/lst/linux into drm-next
not much new stuff this time. A (micro-)optimization to allow the
hangcheck timer to be coalesced with other wakeups in the system and a
fix to handle mmaping of prime imported and userptr buffers correctly. I
don't think we have seen any actual issues going back to this yet, so I
figured it's safer to get this in via drm-next rather than smashing it
into fixes.
* 'drm-etnaviv-next' of git://git.pengutronix.de:/git/lst/linux:
drm/etnaviv: fix mmap operations for userptr and dma-buf objects
drm/etnaviv: take etnaviv_gem_obj in etnaviv_gem_mmap_obj
drm/etnaviv: use deferrable timer for hangcheck handler
timer: add setup_deferrable_timer macro
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c')
0 files changed, 0 insertions, 0 deletions