Merge tag 'drm-vc4-next-2016-11-16' of https://github.com/anholt/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 16 Nov 2016 23:43:56 +0000 (09:43 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 16 Nov 2016 23:43:56 +0000 (09:43 +1000)
commitb7c0e47d98249c2ddf21ea197b651093c6aaee00
tree2209b84a346d987d65332016738a488ef1501b82
parent25bfe018c1c57955e763ebfa2c1fa54283e426e9
parentc778cc5df944291dcdb1ca7a6bb781fbc22550c5
Merge tag 'drm-vc4-next-2016-11-16' of https://github.com/anholt/linux into drm-next

This pull request brings in fragment shader threading and ETC1 support
for vc4.
drivers/gpu/drm/vc4/vc4_drv.c