Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:08:32 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_atombios_crtc.c
Log Message:
radeon: Fix merge botch -- don't unreserve twice.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c:1.2 Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_atombios_crtc.c Sun Dec 19 11:08:32 2021
@@ -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 @@ static int dce4_crtc_do_set_base(struct
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) |
