[PATCH xf86-video-amdgpu 01/10] Remove drmmode_crtc->scanout_destroy[] array

[Michel Dänzer]

From: Michel Dänzer <michel.daen...@amd.com>

No longer necessary since we're reference counting framebuffers.

(Ported from radeon commit 3f120fa1d5d921656a367751bc079e020e9ab105)

Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
---
 src/drmmode_display.c | 22 ++++------------------
 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 552bff896..108fb6803 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 ca556f254..7071a748e 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;
-- 
2.14.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx