summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2017-03-02 17:13:06 +0900
committerMichel Dänzer <michel@daenzer.net>2017-03-03 16:11:12 +0900
commita6d363008e2b55f0aa6151be1a99f01b97870e91 (patch)
tree19b9091584048e3df13b1edb1658aeaa8ba5bc7e
parent53926db2355de0a324c205703a0377b498136f65 (diff)
Don't destroy current FB if drmModeAddFB fails
It would probably result in a black screen. (Ported from radeon commit 1351e48efe7a2c28eab447e16f36a00fbd02ae48) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--src/drmmode_display.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index bc7b9c3..463759b 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2679,7 +2679,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(pAMDGPUEnt->fd, drmmode->fb_id);
drmmode->fb_id = flipdata->old_fb_id;
}