[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon radeon: Fix merge botc...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d26a256fd4b0
branches:  trunk
changeset: 1028479:d26a256fd4b0
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:08:32 2021 +0000

description:
radeon: Fix merge botch -- don't unreserve twice.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c |  7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r f1f1a85224f3 -r d26a256fd4b0 sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c      Sun Dec 19 11:08:25 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c      Sun Dec 19 11:08:32 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_atombios_crtc.c,v 1.2 2021/12/18 23:45:43 riastradh Exp $       */
+/*     $NetBSD: radeon_atombios_crtc.c,v 1.3 2021/12/19 11:08:32 riastradh Exp $       */
 
 /*
  * Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_atombios_crtc.c,v 1.2 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_atombios_crtc.c,v 1.3 2021/12/19 11:08:32 riastradh Exp $");
 
 #include <drm/drm_crtc_helper.h>
 #include <drm/drm_fb_helper.h>
@@ -1199,9 +1199,6 @@
                radeon_bo_unreserve(rbo);
        }
 
-       radeon_bo_get_tiling_flags(rbo, &tiling_flags, NULL);
-       radeon_bo_unreserve(rbo);
-
        switch (target_fb->format->format) {
        case DRM_FORMAT_C8:
                fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_8BPP) |