From 1351e48efe7a2c28eab447e16f36a00fbd02ae48 Mon Sep 17 00:00:00 2001
From: Michel Dänzer <michel.daenzer@amd.com>
Date: Tue, 7 Feb 2017 18:43:56 +0900
Subject: Don't destroy current FB if drmModeAddFB fails

It would probably result in a black screen.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
 src/drmmode_display.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 9f787203..2258e7a6 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2895,7 +2895,8 @@ flip_error:
 		   strerror(errno));
 
 error:
-	if (flipdata && flipdata->flip_count <= 1) {
+	if (flipdata && flipdata->flip_count <= 1 &&
+	    drmmode->fb_id != flipdata->old_fb_id) {
 		drmModeRmFB(drmmode->fd, drmmode->fb_id);
 		drmmode->fb_id = flipdata->old_fb_id;
 	}
-- 
cgit v1.2.3