diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2017-08-18 14:56:10 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel.daenzer@amd.com> | 2017-08-18 14:56:10 +0900 |
| commit | 87a1f577f1de62f6b628bbe221cd8d551531e708 (patch) | |
| tree | c7599d8d23064c1fcf85dc3a47981fca5cba1595 /src | |
| parent | e15b23663cd1a6f85394253b3fb566b55828b1c5 (diff) | |
Remove drmmode_crtc->scanout_destroy[] array
No longer necessary since we're reference counting framebuffers.
(Ported from radeon commit 3f120fa1d5d921656a367751bc079e020e9ab105)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/drmmode_display.c | 22 | ||||
| -rw-r--r-- | src/drmmode_display.h | 1 |
2 files changed, 4 insertions, 19 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 552bff8..108fb68 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -457,19 +457,10 @@ drmmode_crtc_scanout_destroy(drmmode_ptr drmmode, static void drmmode_crtc_scanout_free(drmmode_crtc_private_ptr drmmode_crtc) { - if (drmmode_crtc->flip_pending) { - drmmode_crtc->scanout_destroy[0] = drmmode_crtc->scanout[0]; - drmmode_crtc->scanout[0].pixmap = NULL; - drmmode_crtc->scanout[0].bo = NULL; - drmmode_crtc->scanout_destroy[1] = drmmode_crtc->scanout[1]; - drmmode_crtc->scanout[1].pixmap = NULL; - drmmode_crtc->scanout[1].bo = NULL; - } else { - drmmode_crtc_scanout_destroy(drmmode_crtc->drmmode, - &drmmode_crtc->scanout[0]); - drmmode_crtc_scanout_destroy(drmmode_crtc->drmmode, - &drmmode_crtc->scanout[1]); - } + drmmode_crtc_scanout_destroy(drmmode_crtc->drmmode, + &drmmode_crtc->scanout[0]); + drmmode_crtc_scanout_destroy(drmmode_crtc->drmmode, + &drmmode_crtc->scanout[1]); if (drmmode_crtc->scanout_damage) DamageDestroy(drmmode_crtc->scanout_damage); @@ -2238,11 +2229,6 @@ drmmode_clear_pending_flip(xf86CrtcPtr crtc) drmmode_crtc_dpms(crtc, drmmode_crtc->pending_dpms_mode); } - - drmmode_crtc_scanout_destroy(drmmode_crtc->drmmode, - &drmmode_crtc->scanout_destroy[0]); - drmmode_crtc_scanout_destroy(drmmode_crtc->drmmode, - &drmmode_crtc->scanout_destroy[1]); } static void diff --git a/src/drmmode_display.h b/src/drmmode_display.h index ca556f2..7071a74 100644 --- a/src/drmmode_display.h +++ b/src/drmmode_display.h @@ -79,7 +79,6 @@ typedef struct { struct amdgpu_buffer *cursor_buffer; struct drmmode_scanout rotate; struct drmmode_scanout scanout[2]; - struct drmmode_scanout scanout_destroy[2]; DamagePtr scanout_damage; RegionRec scanout_last_region; unsigned scanout_id; |