Merge tag 'drm/tegra/for-3.15-rc2' of git://anongit.freedesktop.org/tegra/linux into...
authorDave Airlie <airlied@redhat.com>
Fri, 18 Apr 2014 02:54:58 +0000 (12:54 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 18 Apr 2014 02:54:58 +0000 (12:54 +1000)
commit95c7d351e1ccc2c381f0a60eaca9dd962d2aff6d
treea2b8ccf430b91c5a9ea13449f6f05cd26dc5657d
parent5df5242d34c131d049359e01b9ce928659885c4b
parentcbfbbabb89b37f6bad05f478d906a385149f288d
Merge tag 'drm/tegra/for-3.15-rc2' of git://anongit.freedesktop.org/tegra/linux into drm-next

drm/tegra: Fixes for v3.15-rc2

This contains a fix for the host1x driver writing to non-existent syncpt
registers.

A second commit removes an excess pad field in the parameter structure
for the DRM_TEGRA_SUBMIT IOCTL. Archeaology on earlier versions of this
file indicates that this was once there to pad an uneven number of u32
u32 fields, of which one was subsequently removed. Unfortunately nobody
remembered to get rid of the padding when that happened.

Both of these commits are Cc: stable because they fix issues that were
introduced back in v3.10.

* tag 'drm/tegra/for-3.15-rc2' of git://anongit.freedesktop.org/tegra/linux:
  drm/tegra: Remove gratuitous pad field
  gpu: host1x: handle the correct # of syncpt regs