diff options
| author | Ingo Molnar <[email protected]> | 2015-10-28 13:17:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2015-10-28 13:17:20 +0100 |
| commit | e4340bbb07dd38339c0773543dd928886e512a57 (patch) | |
| tree | f38d9d2f929037325362328415b2a1e7bfe52a15 /drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |
| parent | c13dc31adb04c3f85d54d2fa13e34206f25742eb (diff) | |
| parent | a22c4d7e34402ccdf3414f64c50365436eba7b93 (diff) | |
Merge branch 'linus' into core/rcu, to fix up a semantic conflict
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index dc29ed8145c2..6c9e0902a414 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -184,10 +184,6 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc, goto cleanup; } - fence_get(work->excl); - for (i = 0; i < work->shared_count; ++i) - fence_get(work->shared[i]); - amdgpu_bo_get_tiling_flags(new_rbo, &tiling_flags); amdgpu_bo_unreserve(new_rbo); |