diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-04-18 12:54:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-04-18 12:54:58 +1000 |
| commit | 95c7d351e1ccc2c381f0a60eaca9dd962d2aff6d (patch) | |
| tree | a2b8ccf430b91c5a9ea13449f6f05cd26dc5657d /include/uapi | |
| parent | 5df5242d34c131d049359e01b9ce928659885c4b (diff) | |
| parent | cbfbbabb89b37f6bad05f478d906a385149f288d (diff) | |
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
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/tegra_drm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h index b042b48495d9..b75482112428 100644 --- a/include/uapi/drm/tegra_drm.h +++ b/include/uapi/drm/tegra_drm.h @@ -120,7 +120,6 @@ struct drm_tegra_submit { __u32 num_waitchks; __u32 waitchk_mask; __u32 timeout; - __u32 pad; __u64 syncpts; __u64 cmdbufs; __u64 relocs; |