Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon radeon: Narrow diff a ...



details:   https://anonhg.NetBSD.org/src/rev/62dd994ac665
branches:  trunk
changeset: 1028792:62dd994ac665
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 12:02:20 2021 +0000

description:
radeon: Narrow diff a little bit.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r e030ccd90ef7 -r 62dd994ac665 sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c     Sun Dec 19 12:02:13 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c     Sun Dec 19 12:02:20 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: radeon_device.c,v 1.13 2021/12/19 11:52:38 riastradh Exp $     */
+/*     $NetBSD: radeon_device.c,v 1.14 2021/12/19 12:02:20 riastradh Exp $     */
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.13 2021/12/19 11:52:38 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.14 2021/12/19 12:02:20 riastradh Exp $");
 
 #include <linux/console.h>
 #include <linux/efi.h>
@@ -1489,15 +1489,13 @@
 
 #ifdef __NetBSD__
        r = drm_limit_dma_space(rdev->ddev, 0, __BITS(dma_bits - 1, 0));
-       if (r)
-               DRM_ERROR("No suitable DMA available.\n");
 #else
        r = dma_set_mask_and_coherent(&rdev->pdev->dev, DMA_BIT_MASK(dma_bits));
+#endif
        if (r) {
                pr_warn("radeon: No suitable DMA available\n");
                return r;
        }
-#endif
        rdev->need_swiotlb = drm_need_swiotlb(dma_bits);
 
        /* Registers mapping */



Home | Main Index | Thread Index | Old Index