diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-09-14 13:42:11 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-09-14 13:42:11 -0700 |
| commit | 7168e947291f0ead07e5638b4599fb7845288b69 (patch) | |
| tree | b39cdf02f6d2282eeb91696d4a1c7ddb6afb0e38 /drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c | |
| parent | 21b430d23d233c67e6589ea5054d18392e15a28e (diff) | |
| parent | 60fdcb8863d9b4a8b6c6b367886fadb50d4c0b07 (diff) | |
| download | talos-op-linux-7168e947291f0ead07e5638b4599fb7845288b69.tar.gz talos-op-linux-7168e947291f0ead07e5638b4599fb7845288b69.zip | |
Merge branch 'fixes-rc1' into omap-for-v4.3/fixes
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c index d6d41a42ab65..ff3ca52ec6fe 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_semaphore.c @@ -87,7 +87,7 @@ bool amdgpu_semaphore_emit_wait(struct amdgpu_ring *ring, void amdgpu_semaphore_free(struct amdgpu_device *adev, struct amdgpu_semaphore **semaphore, - struct amdgpu_fence *fence) + struct fence *fence) { if (semaphore == NULL || *semaphore == NULL) { return; |
