]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'drm-vc4-next-2016-07-15' of https://github.com/anholt/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Sat, 16 Jul 2016 01:25:11 +0000 (11:25 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 16 Jul 2016 01:25:11 +0000 (11:25 +1000)
commitc1de380c36d103b548d70640485a8f5dc2ab12af
tree7c213ddcc190bb32b14daa20451c4703bcd8ab4a
parentc456160d9d9673ac97c09eea856cd5fc956dd89e
parentc6871b4a1f9125c252aae0943537d0d673f85da7
Merge tag 'drm-vc4-next-2016-07-15' of https://github.com/anholt/linux into drm-next

This pull request brings in vc4 shader validation for branching,
allowing GLSL shaders with non-unrolled loops.

* tag 'drm-vc4-next-2016-07-15' of https://github.com/anholt/linux:
  drm/vc4: Fix a "the the" typo in a comment.
  drm/vc4: Fix definition of QPU_R_MS_REV_FLAGS
  drm/vc4: Add a getparam to signal support for branches.
  drm/vc4: Add support for branching in shader validation.
  drm/vc4: Add a bitmap of branch targets during shader validation.
  drm/vc4: Move validation's current/max ip into the validation struct.
  drm/vc4: Add a getparam ioctl for getting the V3D identity regs.
drivers/gpu/drm/vc4/vc4_drv.c
drivers/gpu/drm/vc4/vc4_drv.h