diff options
| author | Dave Airlie <[email protected]> | 2015-10-25 05:01:57 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2015-10-25 05:01:57 +1000 |
| commit | aef8cc903583c5a205b696fb0a51e1eca9117321 (patch) | |
| tree | a7e2aeeeae494633a98c0603b8cbfc757e4b0abb /drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |
| parent | 018155365dccecd9ea9f26e1b26fb0f960c1ee32 (diff) | |
| parent | c86f5ebfbd147d1a228ab89ee1658e18939bd7ad (diff) | |
Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux
Two regression fixes and a memory leak fix for amdgpu and radeon.
* 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux:
drm/amdgpu: don't try to recreate sysfs entries on resume
drm/radeon: don't try to recreate sysfs entries on resume
drm/amdgpu: stop leaking page flip fence
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); |