diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-26 06:49:44 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-26 06:49:44 +0200 |
| commit | 43106e25ab37580f54df99c512d1d66ae0fe1c67 (patch) | |
| tree | ff62b146f1c173d30e8cf767962cc87417edb71d /include/uapi | |
| parent | drm: Add four ioctls for managing drm mode object leases [v7] (diff) | |
| parent | drm/amd/amdgpu: Remove workaround for suspend/resume in uvd7 (diff) | |
| download | linux-43106e25ab37580f54df99c512d1d66ae0fe1c67.tar.xz linux-43106e25ab37580f54df99c512d1d66ae0fe1c67.zip | |
Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next
Just a few fixes for 4.15.
* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux:
drm/amd/amdgpu: Remove workaround for suspend/resume in uvd7
drm/amdgpu: don't flush the TLB before initializing GART
drm/amdgpu: minor cleanup for amdgpu_ttm_bind
drm/amdgpu/psp: prevent page fault by checking write_frame address(v4)
drm/amd/powerplay: retrieve the real-time coreClock values
drm/amd/powerplay: fix performance drop on Vega10
drm/amd/powerplay: add one smc message for Vega10
drm/amd/powerplay: fix amd_powerplay_reset()
amdgpu: add padding to the fence to handle ioctl.
drm/amdgpu:fix wb_clear
drm/amdgpu:fix vf_error_put
drm/amdgpu/sriov:now must reinit psp
drm/amdgpu: merge bios post checking functions
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/amdgpu_drm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index ff0181829f3d..919248fb4028 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h @@ -553,6 +553,7 @@ union drm_amdgpu_fence_to_handle { struct { struct drm_amdgpu_fence fence; __u32 what; + __u32 pad; } in; struct { __u32 handle; |