CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Thu Apr 18 23:33:15 UTC 2024

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_acpi.c

Log Message:
radeon_acpi.c: ifdef out unused function on NetBSD.

Should fix syzkaller build.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.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_acpi.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c:1.5	Tue Apr 16 14:34:02 2024
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c	Thu Apr 18 23:33:15 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_acpi.c,v 1.5 2024/04/16 14:34:02 riastradh Exp $	*/
+/*	$NetBSD: radeon_acpi.c,v 1.6 2024/04/18 23:33:15 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_acpi.c,v 1.5 2024/04/16 14:34:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_acpi.c,v 1.6 2024/04/18 23:33:15 riastradh Exp $");
 
 #include 
 #include 
@@ -50,11 +50,13 @@ ACPI_MODULE_NAME("radeon_acpi")
 #include 
 #endif
 
+#ifndef __NetBSD__		/* XXX radeon acpi */
 #if defined(CONFIG_VGA_SWITCHEROO)
 bool radeon_atpx_dgpu_req_power_for_displays(void);
 #else
 static inline bool radeon_atpx_dgpu_req_power_for_displays(void) { return false; }
 #endif
+#endif
 
 #define ACPI_AC_CLASS   "ac_adapter"
 

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Thu Apr 18 23:33:15 UTC 2024

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_acpi.c

Log Message:
radeon_acpi.c: ifdef out unused function on NetBSD.

Should fix syzkaller build.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Tobias Nygren]

Module Name:src
Committed By:   tnn
Date:   Mon Nov  6 14:33:51 UTC 2023

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c

Log Message:
radeon: fix and enable ACPI methods for getting ROM BIOS

The hacky way of getting the BIOS mapped only works on x86. ACPI
should be preferred if available. Makes BIOS reading though VFCT
work on aarch64 with EDK2. (But only if EDK2 has POSTed the GPU.)

XXX amdgpu should get the same treatment.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.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_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.12	Sat May 28 01:07:47 2022
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c	Mon Nov  6 14:33:51 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_bios.c,v 1.12 2022/05/28 01:07:47 manu Exp $	*/
+/*	$NetBSD: radeon_bios.c,v 1.13 2023/11/06 14:33:51 tnn Exp $	*/
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.12 2022/05/28 01:07:47 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.13 2023/11/06 14:33:51 tnn Exp $");
 
 #include 
 #include 
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_bios.
 #include "radeon_reg.h"
 
 #if defined(__NetBSD__) && NACPICA > 0
+#define CONFIG_ACPI
 #include 
 #define	_COMPONENT	ACPI_DISPLAY_COMPONENT
 ACPI_MODULE_NAME("radeon_acpi")
@@ -252,10 +253,15 @@ static bool radeon_atrm_get_bios(struct 
 	if (rdev->flags & RADEON_IS_IGP)
 		return false;
 
-	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
 #ifdef __NetBSD__
+	pdev = rdev->pdev;
+	while (pdev != NULL) {
 		dhandle = (pdev->pd_ad ? pdev->pd_ad->ad_handle : NULL);
+		pdev = NULL;
+		if (rdev->pdev->class != PCI_CLASS_DISPLAY_VGA)
+			continue;
 #else
+	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
 		dhandle = ACPI_HANDLE(>dev);
 #endif
 		if (!dhandle)
@@ -269,11 +275,16 @@ static bool radeon_atrm_get_bios(struct 
 	}
 
 	if (!found) {
-		while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
 #ifdef __NetBSD__
+		pdev = rdev->pdev;
+		while (pdev != NULL) {
 			dhandle = (pdev->pd_ad ? pdev->pd_ad->ad_handle
 			: NULL);
+			pdev = NULL;
+			if (rdev->pdev->class != PCI_CLASS_DISPLAY_OTHER)
+continue;
 #else
+		while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
 			dhandle = ACPI_HANDLE(>dev);
 #endif
 			if (!dhandle)

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Tobias Nygren]

Module Name:src
Committed By:   tnn
Date:   Mon Nov  6 14:33:51 UTC 2023

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c

Log Message:
radeon: fix and enable ACPI methods for getting ROM BIOS

The hacky way of getting the BIOS mapped only works on x86. ACPI
should be preferred if available. Makes BIOS reading though VFCT
work on aarch64 with EDK2. (But only if EDK2 has POSTed the GPU.)

XXX amdgpu should get the same treatment.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Jul 20 01:22:38 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c

Log Message:
drm: Ifdef out alpha-specific logic in radeon.

Guessing this is handled transparently by bus_space(9) when we ask
for prefetchable linear mappings.  Need an alpha wizard to review!


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Wed Jul 20 01:22:38 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c

Log Message:
drm: Ifdef out alpha-specific logic in radeon.

Guessing this is handled transparently by bus_space(9) when we ask
for prefetchable linear mappings.  Need an alpha wizard to review!


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.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_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.25 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.26
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.25	Sat May 21 17:50:21 2022
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c	Wed Jul 20 01:22:38 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_ttm.c,v 1.25 2022/05/21 17:50:21 riastradh Exp $	*/
+/*	$NetBSD: radeon_ttm.c,v 1.26 2022/07/20 01:22:38 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.25 2022/05/21 17:50:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.26 2022/07/20 01:22:38 riastradh Exp $");
 
 #include 
 #include 
@@ -453,6 +453,7 @@ static int radeon_ttm_io_mem_reserve(str
 			return -EINVAL;
 		mem->bus.base = rdev->mc.aper_base;
 		mem->bus.is_iomem = true;
+#ifndef __NetBSD__		/* alpha hose handled through bus_space(9) */
 #ifdef __alpha__
 		/*
 		 * Alpha: use bus.addr to hold the ioremap() return,
@@ -478,6 +479,7 @@ static int radeon_ttm_io_mem_reserve(str
 		mem->bus.base = (mem->bus.base & 0x0UL) +
 			rdev->ddev->hose->dense_mem_base;
 #endif
+#endif
 		KASSERTMSG((mem->bus.base & (PAGE_SIZE - 1)) == 0,
 		"mc aperture is not page-aligned: %" PRIx64 "",
 		(uint64_t)mem->bus.base);

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 06:42:08 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_btc_dpm.c
radeon_cypress_dpm.c

Log Message:
include the return value of rv770_restrict_performance_levels_before_switch()
in error messages.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_btc_dpm.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cypress_dpm.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_btc_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_btc_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_btc_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_btc_dpm.c:1.2	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_btc_dpm.c	Fri Jul 15 06:42:08 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_btc_dpm.c,v 1.2 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_btc_dpm.c,v 1.3 2022/07/15 06:42:08 mrg Exp $	*/
 
 /*
  * Copyright 2011 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_btc_dpm.c,v 1.2 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_btc_dpm.c,v 1.3 2022/07/15 06:42:08 mrg Exp $");
 
 #include 
 #include 
@@ -2316,7 +2316,7 @@ int btc_dpm_set_power_state(struct radeo
 	btc_set_boot_state_timing(rdev);
 	ret = rv770_restrict_performance_levels_before_switch(rdev);
 	if (ret) {
-		DRM_ERROR("rv770_restrict_performance_levels_before_switch failed\n");
+		DRM_ERROR("rv770_restrict_performance_levels_before_switch failed: %d\n", ret);
 		return ret;
 	}
 	if (eg_pi->pcie_performance_request)
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cypress_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cypress_dpm.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cypress_dpm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cypress_dpm.c:1.2	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cypress_dpm.c	Fri Jul 15 06:42:08 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_cypress_dpm.c,v 1.2 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_cypress_dpm.c,v 1.3 2022/07/15 06:42:08 mrg Exp $	*/
 
 /*
  * Copyright 2011 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_cypress_dpm.c,v 1.2 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_cypress_dpm.c,v 1.3 2022/07/15 06:42:08 mrg Exp $");
 
 #include 
 
@@ -1966,7 +1966,7 @@ int cypress_dpm_set_power_state(struct r
 
 	ret = rv770_restrict_performance_levels_before_switch(rdev);
 	if (ret) {
-		DRM_ERROR("rv770_restrict_performance_levels_before_switch failed\n");
+		DRM_ERROR("rv770_restrict_performance_levels_before_switch failed: %d\n", ret);
 		return ret;
 	}
 	if (eg_pi->pcie_performance_request)

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Jul 15 06:42:08 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_btc_dpm.c
radeon_cypress_dpm.c

Log Message:
include the return value of rv770_restrict_performance_levels_before_switch()
in error messages.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_btc_dpm.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cypress_dpm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Jun  2 06:51:48 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_r600_dma.c

Log Message:
add timeout period to timeout message.

seen on radeon 5450 on an asrock m/b with ryzen 5600g cpu.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600_dma.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_r600_dma.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600_dma.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600_dma.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600_dma.c:1.2	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600_dma.c	Thu Jun  2 06:51:48 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_r600_dma.c,v 1.2 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_r600_dma.c,v 1.3 2022/06/02 06:51:48 mrg Exp $	*/
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_r600_dma.c,v 1.2 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_r600_dma.c,v 1.3 2022/06/02 06:51:48 mrg Exp $");
 
 #include "radeon.h"
 #include "radeon_asic.h"
@@ -271,8 +271,8 @@ int r600_dma_ring_test(struct radeon_dev
 	if (i < rdev->usec_timeout) {
 		DRM_INFO("ring test on %d succeeded in %d usecs\n", ring->idx, i);
 	} else {
-		DRM_ERROR("radeon: ring %d test failed (0x%08X)\n",
-			  ring->idx, tmp);
+		DRM_ERROR("radeon: ring %d test failed (0x%08X) after %u usecs\n",
+			  ring->idx, tmp, rdev->usec_timeout);
 		r = -EINVAL;
 	}
 	return r;

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Thu Jun  2 06:51:48 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_r600_dma.c

Log Message:
add timeout period to timeout message.

seen on radeon 5450 on an asrock m/b with ryzen 5600g cpu.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600_dma.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Feb 27 14:23:17 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c

Log Message:
radeon: Make radeon_bios.c ACPI stuff build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.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_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.8 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.8	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c	Sun Feb 27 14:23:16 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_bios.c,v 1.8 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_bios.c,v 1.9 2022/02/27 14:23:16 riastradh Exp $	*/
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.8 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.9 2022/02/27 14:23:16 riastradh Exp $");
 
 #include 
 #include 
@@ -41,6 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_bios.
 #include "radeon.h"
 #include "radeon_reg.h"
 
+#include 
+
 /*
  * BIOS.
  */
@@ -183,7 +185,6 @@ static bool radeon_read_platform_bios(st
 #endif
 }
 
-/* XXX radeon acpi */
 #ifdef CONFIG_ACPI
 /* ATRM is used to get the BIOS on the discrete cards in
  * dual-gpu systems.
@@ -247,7 +248,11 @@ static bool radeon_atrm_get_bios(struct 
 		return false;
 
 	while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
+#ifdef __NetBSD__
+		dhandle = (pdev->pd_ad ? pdev->pd_ad->ad_handle : NULL);
+#else
 		dhandle = ACPI_HANDLE(>dev);
+#endif
 		if (!dhandle)
 			continue;
 
@@ -260,7 +265,12 @@ static bool radeon_atrm_get_bios(struct 
 
 	if (!found) {
 		while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
+#ifdef __NetBSD__
+			dhandle = (pdev->pd_ad ? pdev->pd_ad->ad_handle
+			: NULL);
+#else
 			dhandle = ACPI_HANDLE(>dev);
+#endif
 			if (!dhandle)
 continue;
 

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Feb 27 14:23:17 UTC 2022

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c

Log Message:
radeon: Make radeon_bios.c ACPI stuff build.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 12:23:58 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c

Log Message:
radeon: Fix dma_addressing_limited call.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.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_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.22 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.23
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.22	Sun Dec 19 09:57:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c	Sun Dec 19 12:23:58 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_ttm.c,v 1.22 2021/12/19 09:57:01 riastradh Exp $	*/
+/*	$NetBSD: radeon_ttm.c,v 1.23 2021/12/19 12:23:58 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.22 2021/12/19 09:57:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.23 2021/12/19 12:23:58 riastradh Exp $");
 
 #include 
 #include 
@@ -988,7 +988,7 @@ int radeon_ttm_init(struct radeon_device
 			   rdev->ddev->anon_inode->i_mapping,
 #endif
 			   rdev->ddev->vma_offset_manager,
-			   dma_addressing_limited(>pdev->pd_dev));
+			   dma_addressing_limited(pci_dev_dev(rdev->pdev)));
 	if (r) {
 		DRM_ERROR("failed initializing buffer object driver(%d).\n", r);
 		return r;

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 12:23:58 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c

Log Message:
radeon: Fix dma_addressing_limited call.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 12:02:20 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_device.c

Log Message:
radeon: Narrow diff a little bit.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.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_device.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.13 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.13	Sun Dec 19 11:52:38 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c	Sun Dec 19 12:02:20 2021
@@ -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 
-__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 
 #include 
@@ -1489,15 +1489,13 @@ int radeon_device_init(struct radeon_dev
 
 #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(>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 */

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 12:02:20 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_device.c

Log Message:
radeon: Narrow diff a little bit.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:52:38 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon.h radeon_device.c
radeon_fence.c

Log Message:
radeon: Reduce #ifdef __NetBSD__ around condvars.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.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.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h:1.10 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h:1.11
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h:1.10	Sat Dec 18 23:45:42 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h	Sun Dec 19 11:52:38 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon.h,v 1.10 2021/12/18 23:45:42 riastradh Exp $	*/
+/*	$NetBSD: radeon.h,v 1.11 2021/12/19 11:52:38 riastradh Exp $	*/
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -392,11 +392,7 @@ struct radeon_fence {
 	unsigned		ring;
 	bool			is_vm_update;
 
-#ifdef __NetBSD__
 	TAILQ_ENTRY(radeon_fence)	fence_check;
-#else
-	wait_queue_entry_t		fence_wake;
-#endif
 };
 
 int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring);
@@ -2435,13 +2431,9 @@ struct radeon_device {
 	struct radeon_doorbell		doorbell;
 	struct radeon_mman		mman;
 	struct radeon_fence_driver	fence_drv[RADEON_NUM_RINGS];
-#ifdef __NetBSD__
 	spinlock_t			fence_lock;
 	drm_waitqueue_t			fence_queue;
 	TAILQ_HEAD(, radeon_fence)	fence_check;
-#else
-	wait_queue_head_t		fence_queue;
-#endif
 	u64fence_context;
 	struct mutex			ring_lock;
 	struct radeon_ring		ring[RADEON_NUM_RINGS];

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.12	Sun Dec 19 11:26:26 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c	Sun Dec 19 11:52:38 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_device.c,v 1.12 2021/12/19 11:26:26 riastradh Exp $	*/
+/*	$NetBSD: radeon_device.c,v 1.13 2021/12/19 11:52:38 riastradh Exp $	*/
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.12 2021/12/19 11:26:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_device.c,v 1.13 2021/12/19 11:52:38 riastradh Exp $");
 
 #include 
 #include 
@@ -1430,12 +1430,8 @@ int radeon_device_init(struct radeon_dev
 	mutex_init(>srbm_mutex);
 	init_rwsem(>pm.mclk_lock);
 	init_rwsem(>exclusive_lock);
-#ifdef __NetBSD__
 	spin_lock_init(>irq.vblank_lock);
 	DRM_INIT_WAITQUEUE(>irq.vblank_queue, "radvblnk");
-#else
-	init_waitqueue_head(>irq.vblank_queue);
-#endif
 	r = radeon_gem_init(rdev);
 	if (r)
 		return r;
@@ -1710,12 +1706,10 @@ void radeon_device_fini(struct radeon_de
 	if (rdev->family >= CHIP_BONAIRE)
 		radeon_doorbell_fini(rdev);
 
-#ifdef __NetBSD__
 	DRM_DESTROY_WAITQUEUE(>irq.vblank_queue);
 	spin_lock_destroy(>irq.vblank_lock);
 	destroy_rwsem(>exclusive_lock);
 	destroy_rwsem(>pm.mclk_lock);
-#endif
 	mutex_destroy(>srbm_mutex);
 	mutex_destroy(>gpu_clock_mutex);
 	mutex_destroy(>pm.mutex);

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.21 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.22
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.21	Sun Dec 19 11:08:25 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c	Sun Dec 19 11:52:38 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_fence.c,v 1.21 2021/12/19 11:08:25 riastradh Exp $	*/
+/*	$NetBSD: radeon_fence.c,v 1.22 2021/12/19 11:52:38 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.21 2021/12/19 11:08:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.22 2021/12/19 11:52:38 riastradh Exp $");
 
 #include 
 #include 
@@ -171,20 +171,10 @@ int radeon_fence_emit(struct radeon_devi
  * for the fence locking itself, so unlocked variants are used for
  * fence_signal, and remove_wait_queue.
  */
-#ifdef __NetBSD__
 static int radeon_fence_check_signaled(struct radeon_fence *fence)
-#else
-static int radeon_fence_check_signaled(wait_queue_entry_t *wait, unsigned mode, int flags, void *key)
-#endif
 {
-#ifndef __NetBSD__
-	struct radeon_fence *fence;
-#endif
 	u64 seq;
 
-#ifndef __NetBSD__
-	fence = container_of(wait, struct radeon_fence, fence_wake);
-#endif
 	BUG_ON(!spin_is_locked(>rdev->fence_lock));
 
 	/*
@@ 

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:52:38 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon.h radeon_device.c
radeon_fence.c

Log Message:
radeon: Reduce #ifdef __NetBSD__ around condvars.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/drm/radeon/radeon.h
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

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 
-__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 
 #include 
@@ -1199,9 +1199,6 @@ static int dce4_crtc_do_set_base(struct 
 		radeon_bo_unreserve(rbo);
 	}
 
-	radeon_bo_get_tiling_flags(rbo, _flags, NULL);
-	radeon_bo_unreserve(rbo);
-
 	switch (target_fb->format->format) {
 	case DRM_FORMAT_C8:
 		fb_format = (EVERGREEN_GRPH_DEPTH(EVERGREEN_GRPH_DEPTH_8BPP) |

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

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.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:08:25 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c

Log Message:
radeon: Fix missing unlocks in radeon fence.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.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_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.20 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.21
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.20	Sun Dec 19 11:08:17 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c	Sun Dec 19 11:08:25 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_fence.c,v 1.20 2021/12/19 11:08:17 riastradh Exp $	*/
+/*	$NetBSD: radeon_fence.c,v 1.21 2021/12/19 11:08:25 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.20 2021/12/19 11:08:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.21 2021/12/19 11:08:25 riastradh Exp $");
 
 #include 
 #include 
@@ -326,6 +326,9 @@ static void radeon_fence_check_lockup(st
 	if (!down_read_trylock(>exclusive_lock)) {
 		/* just reschedule the check if a reset is going on */
 		radeon_fence_schedule_check(rdev, ring);
+#ifdef __NetBSD__
+		spin_unlock(>fence_lock);
+#endif
 		return;
 	}
 
@@ -524,6 +527,7 @@ bool radeon_fence_signaled(struct radeon
 		ret = dma_fence_signal_locked(>base);
 		if (!ret)
 			DMA_FENCE_TRACE(>base, "signaled from radeon_fence_signaled\n");
+		spin_unlock(>rdev->fence_lock);
 		return true;
 	}
 	spin_unlock(>rdev->fence_lock);

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:08:25 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c

Log Message:
radeon: Fix missing unlocks in radeon fence.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:08:17 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c

Log Message:
radeon: Use dma_fence_signal_locked when we already hold lock.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.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_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.19 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.20
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.19	Sun Dec 19 09:55:55 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c	Sun Dec 19 11:08:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_fence.c,v 1.19 2021/12/19 09:55:55 riastradh Exp $	*/
+/*	$NetBSD: radeon_fence.c,v 1.20 2021/12/19 11:08:17 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.19 2021/12/19 09:55:55 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.20 2021/12/19 11:08:17 riastradh Exp $");
 
 #include 
 #include 
@@ -521,7 +521,7 @@ bool radeon_fence_signaled(struct radeon
 	if (radeon_fence_seq_signaled(fence->rdev, fence->seq, fence->ring)) {
 		int ret;
 
-		ret = dma_fence_signal(>base);
+		ret = dma_fence_signal_locked(>base);
 		if (!ret)
 			DMA_FENCE_TRACE(>base, "signaled from radeon_fence_signaled\n");
 		return true;

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 11:08:17 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c

Log Message:
radeon: Use dma_fence_signal_locked when we already hold lock.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:56:53 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c

Log Message:
'r' is just for us, so let's declare it

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.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_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.20 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.21
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.20	Sun Dec 19 09:56:45 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c	Sun Dec 19 09:56:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_ttm.c,v 1.20 2021/12/19 09:56:45 riastradh Exp $	*/
+/*	$NetBSD: radeon_ttm.c,v 1.21 2021/12/19 09:56:53 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.20 2021/12/19 09:56:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.21 2021/12/19 09:56:53 riastradh Exp $");
 
 #include 
 #include 
@@ -812,7 +812,7 @@ static int radeon_ttm_tt_populate(struct
 
 	if (slave && ttm->sg) {
 #ifdef __NetBSD__
-		r = drm_prime_bus_dmamap_load_sgt(ttm->bdev->dmat,
+		int r = drm_prime_bus_dmamap_load_sgt(ttm->bdev->dmat,
 		gtt->ttm.dma_address, ttm->sg);
 		if (r)
 			return r;

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:56:53 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c

Log Message:
'r' is just for us, so let's declare it

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:56:45 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c

Log Message:
match the 'else' case here to get vma_node

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.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_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.19 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.20
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.19	Sun Dec 19 01:50:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c	Sun Dec 19 09:56:45 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_ttm.c,v 1.19 2021/12/19 01:50:00 riastradh Exp $	*/
+/*	$NetBSD: radeon_ttm.c,v 1.20 2021/12/19 09:56:45 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.19 2021/12/19 01:50:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.20 2021/12/19 09:56:45 riastradh Exp $");
 
 #include 
 #include 
@@ -204,7 +204,7 @@ static int radeon_verify_access(struct t
 		return -EPERM;
 #ifdef __NetBSD__
 	struct drm_file *drm_file = filp->f_data;
-	return drm_vma_node_verify_access(>gem_base.vma_node, drm_file);
+	return drm_vma_node_verify_access(>tbo.base.vma_node, drm_file);
 #else
 	return drm_vma_node_verify_access(>tbo.base.vma_node,
 	  filp->private_data);

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:56:45 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c

Log Message:
match the 'else' case here to get vma_node

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:56:36 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_si_dpm.c

Log Message:
ifdef out pcie_get_speed_cap for now

(You're not seeing double, it appears twice.)

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.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_si_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.6 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.6	Sun Dec 19 01:50:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c	Sun Dec 19 09:56:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_si_dpm.c,v 1.6 2021/12/19 01:50:00 riastradh Exp $	*/
+/*	$NetBSD: radeon_si_dpm.c,v 1.7 2021/12/19 09:56:36 riastradh Exp $	*/
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.6 2021/12/19 01:50:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.7 2021/12/19 09:56:36 riastradh Exp $");
 
 #include 
 #include 
@@ -6907,8 +6907,8 @@ int si_dpm_init(struct radeon_device *rd
 	struct ni_power_info *ni_pi;
 	struct si_power_info *si_pi;
 	struct atom_clock_dividers dividers;
-#ifndef __NetBSD__		/* XXX radeon pcie */
 	enum pci_bus_speed speed_cap = PCI_SPEED_UNKNOWN;
+#ifdef __linux__		/* XXX radeon pcie */
 	struct pci_dev *root = rdev->pdev->bus->self;
 #endif
 	int ret;
@@ -6921,8 +6921,10 @@ int si_dpm_init(struct radeon_device *rd
 	eg_pi = _pi->eg;
 	pi = _pi->rv7xx;
 
+#ifdef __linux__
 	if (!pci_is_root_bus(rdev->pdev->bus))
 		speed_cap = pcie_get_speed_cap(root);
+#endif
 	if (speed_cap == PCI_SPEED_UNKNOWN) {
 		si_pi->sys_pcie_mask = 0;
 	} else {

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:56:36 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_si_dpm.c

Log Message:
ifdef out pcie_get_speed_cap for now

(You're not seeing double, it appears twice.)

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:56:27 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_si.c

Log Message:
constify

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si.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_si.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si.c:1.3	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si.c	Sun Dec 19 09:56:27 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_si.c,v 1.3 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_si.c,v 1.4 2021/12/19 09:56:27 riastradh Exp $	*/
 
 /*
  * Copyright 2011 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_si.c,v 1.3 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_si.c,v 1.4 2021/12/19 09:56:27 riastradh Exp $");
 
 #include 
 #include 
@@ -1585,7 +1585,7 @@ int si_mc_load_microcode(struct radeon_d
 	const __be32 *fw_data = NULL;
 	const __le32 *new_fw_data = NULL;
 	u32 running;
-	u32 *io_mc_regs = NULL;
+	const u32 *io_mc_regs = NULL;
 	const __le32 *new_io_mc_regs = NULL;
 	int i, regs_size, ucode_size;
 

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:56:27 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_si.c

Log Message:
constify

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:55:55 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c

Log Message:
We want to use a driver-global lock, not a queue-specific one.

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.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_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.18 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.19
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.18	Sun Dec 19 01:50:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c	Sun Dec 19 09:55:55 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_fence.c,v 1.18 2021/12/19 01:50:00 riastradh Exp $	*/
+/*	$NetBSD: radeon_fence.c,v 1.19 2021/12/19 09:55:55 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.18 2021/12/19 01:50:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.19 2021/12/19 09:55:55 riastradh Exp $");
 
 #include 
 #include 
@@ -155,7 +155,7 @@ int radeon_fence_emit(struct radeon_devi
 	(*fence)->ring = ring;
 	(*fence)->is_vm_update = false;
 	dma_fence_init(&(*fence)->base, _fence_ops,
-		   >fence_queue.lock,
+		   >fence_lock,
 		   rdev->fence_context + ring,
 		   seq);
 	radeon_fence_ring_emit(rdev, ring, *fence);

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:55:55 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c

Log Message:
We want to use a driver-global lock, not a queue-specific one.

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:55:48 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fb.c

Log Message:
sort out no fb_info diffs

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.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_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.12	Sun Dec 19 01:50:00 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c	Sun Dec 19 09:55:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_fb.c,v 1.12 2021/12/19 01:50:00 riastradh Exp $	*/
+/*	$NetBSD: radeon_fb.c,v 1.13 2021/12/19 09:55:48 riastradh Exp $	*/
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.12 2021/12/19 01:50:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.13 2021/12/19 09:55:48 riastradh Exp $");
 
 #include 
 #include 
@@ -59,6 +59,7 @@ struct radeon_fbdev {
 	struct radeon_device *rdev;
 };
 
+#ifndef __NetBSD__
 static int
 radeonfb_open(struct fb_info *info, int user)
 {
@@ -84,7 +85,6 @@ radeonfb_release(struct fb_info *info, i
 	return 0;
 }
 
-#ifndef __NetBSD__
 static const struct fb_ops radeonfb_ops = {
 	.owner = THIS_MODULE,
 	DRM_FB_HELPER_DEFAULT_OPS,
@@ -356,8 +356,9 @@ static int radeon_fbdev_destroy(struct d
 {
 #ifdef __NetBSD__
 	int ret;
-#endif
+#else
 	struct drm_framebuffer *fb = >fb;
+#endif
 
 #ifdef __NetBSD__
 	/* XXX errno NetBSD->Linux */

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:55:48 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fb.c

Log Message:
sort out no fb_info diffs

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:54:57 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_dp_mst.c

Log Message:
Mark unused

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_dp_mst.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_dp_mst.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_dp_mst.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_dp_mst.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_dp_mst.c:1.4	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_dp_mst.c	Sun Dec 19 09:54:57 2021
@@ -1,9 +1,9 @@
-/*	$NetBSD: radeon_dp_mst.c,v 1.4 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_dp_mst.c,v 1.5 2021/12/19 09:54:57 riastradh Exp $	*/
 
 // SPDX-License-Identifier: MIT
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_dp_mst.c,v 1.4 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_dp_mst.c,v 1.5 2021/12/19 09:54:57 riastradh Exp $");
 
 #include 
 #include 
@@ -395,7 +395,7 @@ radeon_mst_encoder_dpms(struct drm_encod
 	struct radeon_connector *radeon_connector;
 	struct drm_crtc *crtc;
 	struct radeon_crtc *radeon_crtc;
-	int ret, slots;
+	int ret __unused, slots;
 	s64 fixed_pbn, fixed_pbn_per_slot, avg_time_slots_per_mtp;
 	if (!ASIC_IS_DCE5(rdev)) {
 		DRM_ERROR("got mst dpms on non-DCE5\n");

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:54:57 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_dp_mst.c

Log Message:
Mark unused

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_dp_mst.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:54:48 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ci_dpm.c

Log Message:
ifdef out pcie_get_speed_cap for now

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.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_ci_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c:1.4	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c	Sun Dec 19 09:54:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_ci_dpm.c,v 1.4 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_ci_dpm.c,v 1.5 2021/12/19 09:54:48 riastradh Exp $	*/
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_ci_dpm.c,v 1.4 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ci_dpm.c,v 1.5 2021/12/19 09:54:48 riastradh Exp $");
 
 #include 
 #include 
@@ -5687,7 +5687,9 @@ int ci_dpm_init(struct radeon_device *rd
 	u8 frev, crev;
 	struct ci_power_info *pi;
 	enum pci_bus_speed speed_cap = PCI_SPEED_UNKNOWN;
+#ifdef __linux__
 	struct pci_dev *root = rdev->pdev->bus->self;
+#endif
 	int ret;
 
 	pi = kzalloc(sizeof(struct ci_power_info), GFP_KERNEL);
@@ -5695,8 +5697,10 @@ int ci_dpm_init(struct radeon_device *rd
 		return -ENOMEM;
 	rdev->pm.dpm.priv = pi;
 
+#ifdef __linux__
 	if (!pci_is_root_bus(rdev->pdev->bus))
 		speed_cap = pcie_get_speed_cap(root);
+#endif
 	if (speed_cap == PCI_SPEED_UNKNOWN) {
 		pi->sys_pcie_mask = 0;
 	} else {

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:54:48 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ci_dpm.c

Log Message:
ifdef out pcie_get_speed_cap for now

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:54:20 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_cik.c

Log Message:
Avoid discarding const qualifier

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.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_cik.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c:1.5	Sun Dec 19 01:47:14 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c	Sun Dec 19 09:54:20 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_cik.c,v 1.5 2021/12/19 01:47:14 riastradh Exp $	*/
+/*	$NetBSD: radeon_cik.c,v 1.6 2021/12/19 09:54:20 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_cik.c,v 1.5 2021/12/19 01:47:14 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_cik.c,v 1.6 2021/12/19 09:54:20 riastradh Exp $");
 
 #include 
 #include 
@@ -1888,7 +1888,7 @@ int ci_mc_load_microcode(struct radeon_d
 	const __be32 *fw_data = NULL;
 	const __le32 *new_fw_data = NULL;
 	u32 running, tmp;
-	u32 *io_mc_regs = NULL;
+	const u32 *io_mc_regs = NULL;
 	const __le32 *new_io_mc_regs = NULL;
 	int i, regs_size, ucode_size;
 

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 09:54:20 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_cik.c

Log Message:
Avoid discarding const qualifier

Author: Maya Rashish 


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 01:50:00 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fb.c radeon_fence.c
radeon_si_dpm.c radeon_ttm.c

Log Message:
Fix up radeon.

Enough to make it compile.  (Next up: make it link.)


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.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_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.11 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.11	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c	Sun Dec 19 01:50:00 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_fb.c,v 1.11 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_fb.c,v 1.12 2021/12/19 01:50:00 riastradh Exp $	*/
 
 /*
  * Copyright © 2007 David Airlie
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.11 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fb.c,v 1.12 2021/12/19 01:50:00 riastradh Exp $");
 
 #include 
 #include 
@@ -258,10 +258,10 @@ static int radeonfb_create(struct drm_fb
 	rbo = gem_to_radeon_bo(gobj);
 
 #ifdef __NetBSD__
-	ret = radeon_framebuffer_init(rdev->ddev, >rfb, _cmd, gobj);
+	ret = radeon_framebuffer_init(rdev->ddev, >fb, _cmd, gobj);
 	if (ret) {
 		DRM_ERROR("failed to initialize framebuffer %d\n", ret);
-		goto out_unref;
+		goto out;
 	}
 
 	(void)memset(rbo->kptr, 0, radeon_bo_size(rbo));
@@ -279,10 +279,10 @@ static int radeonfb_create(struct drm_fb
 	CFARGS(.iattr = "radeonfbbus"));
 	if (helper->fbdev == NULL) {
 		DRM_ERROR("failed to attach genfb\n");
-		goto out_unref;
+		goto out;
 	}
 }
-	fb = >rfb.base;
+	fb = >fb;
 	rfbdev->helper.fb = fb;
 #else
 	/* okay we have an object now allocate the framebuffer */

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.17 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.18
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c:1.17	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c	Sun Dec 19 01:50:00 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_fence.c,v 1.17 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_fence.c,v 1.18 2021/12/19 01:50:00 riastradh Exp $	*/
 
 /*
  * Copyright 2009 Jerome Glisse.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.17 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_fence.c,v 1.18 2021/12/19 01:50:00 riastradh Exp $");
 
 #include 
 #include 
@@ -1188,7 +1188,7 @@ static inline bool radeon_test_signaled(
 #ifdef __NetBSD__
 
 static void
-radeon_fence_wakeup_cb(struct fence *fence, struct fence_cb *cb)
+radeon_fence_wakeup_cb(struct dma_fence *fence, struct dma_fence_cb *cb)
 {
 	struct radeon_fence *rfence = to_radeon_fence(fence);
 	struct radeon_device *rdev = rfence->rdev;
@@ -1198,14 +1198,14 @@ radeon_fence_wakeup_cb(struct fence *fen
 }
 
 static signed long
-radeon_fence_default_wait(struct fence *f, bool intr, signed long timo)
+radeon_fence_default_wait(struct dma_fence *f, bool intr, signed long timo)
 {
-	struct fence_cb fcb;
+	struct dma_fence_cb fcb;
 	struct radeon_fence *fence = to_radeon_fence(f);
 	struct radeon_device *rdev = fence->rdev;
 	int r;
 
-	r = fence_add_callback(f, , radeon_fence_wakeup_cb);
+	r = dma_fence_add_callback(f, , radeon_fence_wakeup_cb);
 	if (r)			/* fence is done already */
 		return timo;
 
@@ -1221,7 +1221,7 @@ radeon_fence_default_wait(struct fence *
 	}
 	spin_unlock(>fence_lock);
 
-	(void)fence_remove_callback(f, );
+	(void)dma_fence_remove_callback(f, );
 
 	return r;
 }

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.6
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c:1.5	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c	Sun Dec 19 01:50:00 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_si_dpm.c,v 1.5 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_si_dpm.c,v 1.6 2021/12/19 01:50:00 riastradh Exp $	*/
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_si_dpm.c,v 1.5 2021/12/18 23:45:43 riastradh Exp 

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 01:50:00 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fb.c radeon_fence.c
radeon_si_dpm.c radeon_ttm.c

Log Message:
Fix up radeon.

Enough to make it compile.  (Next up: make it link.)


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 01:47:15 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_cik.c

Log Message:
Reduce diff.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.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_cik.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c:1.4	Sun Dec 19 01:47:01 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c	Sun Dec 19 01:47:14 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_cik.c,v 1.4 2021/12/19 01:47:01 riastradh Exp $	*/
+/*	$NetBSD: radeon_cik.c,v 1.5 2021/12/19 01:47:14 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_cik.c,v 1.4 2021/12/19 01:47:01 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_cik.c,v 1.5 2021/12/19 01:47:14 riastradh Exp $");
 
 #include 
 #include 
@@ -2020,7 +2020,7 @@ static int cik_init_microcode(struct rad
 		mc_req_size = BONAIRE_MC_UCODE_SIZE * 4;
 		mc2_req_size = BONAIRE_MC2_UCODE_SIZE * 4;
 		sdma_req_size = CIK_SDMA_UCODE_SIZE * 4;
-		smc_req_size = ALIGN(BONAIRE_SMC_UCODE_SIZE, 4);
+		smc_req_size = round_up(BONAIRE_SMC_UCODE_SIZE, 4);
 		num_fw = 8;
 		break;
 	case CHIP_HAWAII:
@@ -2036,7 +2036,7 @@ static int cik_init_microcode(struct rad
 		mc_req_size = HAWAII_MC_UCODE_SIZE * 4;
 		mc2_req_size = HAWAII_MC2_UCODE_SIZE * 4;
 		sdma_req_size = CIK_SDMA_UCODE_SIZE * 4;
-		smc_req_size = ALIGN(HAWAII_SMC_UCODE_SIZE, 4);
+		smc_req_size = round_up(HAWAII_SMC_UCODE_SIZE, 4);
 		num_fw = 8;
 		break;
 	case CHIP_KAVERI:

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 01:47:15 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_cik.c

Log Message:
Reduce diff.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 01:47:01 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_cik.c

Log Message:
ALIGN -> round_up


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.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_cik.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c:1.3	Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c	Sun Dec 19 01:47:01 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_cik.c,v 1.3 2021/12/18 23:45:43 riastradh Exp $	*/
+/*	$NetBSD: radeon_cik.c,v 1.4 2021/12/19 01:47:01 riastradh Exp $	*/
 
 /*
  * Copyright 2012 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_cik.c,v 1.3 2021/12/18 23:45:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_cik.c,v 1.4 2021/12/19 01:47:01 riastradh Exp $");
 
 #include 
 #include 
@@ -8398,7 +8398,7 @@ static int cik_startup(struct radeon_dev
 		}
 	}
 	rdev->rlc.cs_data = ci_cs_data;
-	rdev->rlc.cp_table_size = ALIGN(CP_ME_TABLE_SIZE * 5 * 4, 2048); /* CP JT */
+	rdev->rlc.cp_table_size = round_up(CP_ME_TABLE_SIZE * 5 * 4, 2048); /* CP JT */
 	rdev->rlc.cp_table_size += 64 * 1024; /* GDS */
 	r = sumo_rlc_init(rdev);
 	if (r) {

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

Module Name:src
Committed By:   riastradh
Date:   Sun Dec 19 01:47:01 UTC 2021

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_cik.c

Log Message:
ALIGN -> round_up


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Re: CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Izumi Tsutsui]

> Module Name:  src
> Committed By: tsutsui
> Date: Mon Apr 27 16:57:31 UTC 2020
> 
> Modified Files:
>   src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c
> 
> Log Message:
> Fix possible bus_dmamap_load(9) leak.  PR/55127
> 
> "Looks good to me" from riastradh@.
> Note it was also commented "that code path is likely to be reached"

Mis-quoted, it should be "not likely".

> so maybe pullups are not necessary.

---
Izumi Tsutsui

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Oct  4 12:29:05 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_evergreen.c

Log Message:
add missing break.  upstream already has it in 5.1.2.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.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_evergreen.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.2	Sat Aug 17 15:49:13 2019
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c	Fri Oct  4 12:29:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_evergreen.c,v 1.2 2019/08/17 15:49:13 msaitoh Exp $	*/
+/*	$NetBSD: radeon_evergreen.c,v 1.3 2019/10/04 12:29:05 mrg Exp $	*/
 
 /*
  * Copyright 2010 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  * Authors: Alex Deucher
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen.c,v 1.2 2019/08/17 15:49:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen.c,v 1.3 2019/10/04 12:29:05 mrg Exp $");
 
 #include 
 #include 
@@ -5468,6 +5468,7 @@ restart_ih:
 DRM_ERROR("Unhandled interrupt: %d %d\n", src_id, src_data);
 break;
 			}
+			break;
 		case 96:
 			DRM_ERROR("SRBM_READ_ERROR: 0x%x\n", RREG32(SRBM_READ_ERROR));
 			WREG32(SRBM_INT_ACK, 0x1);

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Fri Oct  4 12:29:05 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_evergreen.c

Log Message:
add missing break.  upstream already has it in 5.1.2.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sun Aug 18 02:42:40 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: sid.h

Log Message:
Use unsigned to avoid undefined behavior. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/radeon/sid.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sun Aug 18 02:42:40 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: sid.h

Log Message:
Use unsigned to avoid undefined behavior. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/radeon/sid.h

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/sid.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/sid.h:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/sid.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/sid.h:1.3	Fri Aug  9 06:27:21 2019
+++ src/sys/external/bsd/drm2/dist/drm/radeon/sid.h	Sun Aug 18 02:42:40 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: sid.h,v 1.3 2019/08/09 06:27:21 msaitoh Exp $	*/
+/*	$NetBSD: sid.h,v 1.4 2019/08/18 02:42:40 msaitoh Exp $	*/
 
 /*
  * Copyright 2011 Advanced Micro Devices, Inc.
@@ -781,10 +781,10 @@
 #   define DESCRIPTION17(x)  (((x) & 0xff) << 8)
 
 #define AZ_F0_CODEC_PIN_CONTROL_HOT_PLUG_CONTROL 0x54
-#   define AUDIO_ENABLED (1 << 31)
+#   define AUDIO_ENABLED (1U << 31)
 
 #define AZ_F0_CODEC_PIN_CONTROL_RESPONSE_CONFIGURATION_DEFAULT  0x56
-#define		PORT_CONNECTIVITY_MASK(3 << 30)
+#define		PORT_CONNECTIVITY_MASK(3U << 30)
 #define		PORT_CONNECTIVITY_SHIFT30
 
 #define	DC_LB_MEMORY_SPLIT	0x6b0c

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Aug 17 17:03:32 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: evergreend.h
radeon_rv770_smc.c rv730d.h

Log Message:
Use unsigned to avoid undefined behavior. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/evergreend.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_rv770_smc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/radeon/rv730d.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Aug 17 16:02:55 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_r600.c

Log Message:
 Set "enabled" value only when hpd.hpd is not RADEON_HPD_NONE(== 0xff) to
avoid 1 << 255. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.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_r600.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.2	Sat Aug 17 15:50:05 2019
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c	Sat Aug 17 16:02:55 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_r600.c,v 1.2 2019/08/17 15:50:05 msaitoh Exp $	*/
+/*	$NetBSD: radeon_r600.c,v 1.3 2019/08/17 16:02:55 msaitoh Exp $	*/
 
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
  *  Jerome Glisse
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_r600.c,v 1.2 2019/08/17 15:50:05 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_r600.c,v 1.3 2019/08/17 16:02:55 msaitoh Exp $");
 
 #include 
 #include 
@@ -1008,7 +1008,8 @@ void r600_hpd_init(struct radeon_device 
 break;
 			}
 		}
-		enable |= 1 << radeon_connector->hpd.hpd;
+		if (radeon_connector->hpd.hpd != RADEON_HPD_NONE)
+			enable |= 1 << radeon_connector->hpd.hpd;
 		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
 	}
 	radeon_irq_kms_enable_hpd(rdev, enable);

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Aug 17 16:02:55 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_r600.c

Log Message:
 Set "enabled" value only when hpd.hpd is not RADEON_HPD_NONE(== 0xff) to
avoid 1 << 255. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Aug 17 15:50:05 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: r600d.h radeon_r600.c
radeon_uvd_v1_0.c

Log Message:
 Use unsigned to avoid undefined behavior. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/radeon/r600d.h \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.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/r600d.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/r600d.h:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/r600d.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/r600d.h:1.2	Mon Aug 27 04:58:36 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/r600d.h	Sat Aug 17 15:50:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: r600d.h,v 1.2 2018/08/27 04:58:36 riastradh Exp $	*/
+/*	$NetBSD: r600d.h,v 1.3 2019/08/17 15:50:05 msaitoh Exp $	*/
 
 /*
  * Copyright 2009 Advanced Micro Devices, Inc.
@@ -198,7 +198,7 @@
 #define		RB_BUFSZ(x)	((x) << 0)
 #define		RB_BLKSZ(x)	((x) << 8)
 #define		RB_NO_UPDATE	(1 << 27)
-#define		RB_RPTR_WR_ENA	(1 << 31)
+#define		RB_RPTR_WR_ENA	(1U << 31)
 #define		BUF_SWAP_32BIT	(2 << 16)
 #define	CP_RB_RPTR	0x8700
 #define	CP_RB_RPTR_ADDR	0xC10C
@@ -292,7 +292,7 @@
 #   define GRBM_READ_TIMEOUT(x) ((x) << 0)
 #define	GRBM_STATUS	0x8010
 #define		CMDFIFO_AVAIL_MASK0x001F
-#define		GUI_ACTIVE	(1<<31)
+#define		GUI_ACTIVE	(1U<<31)
 #define	GRBM_STATUS2	0x8014
 #define	GRBM_SOFT_RESET	0x8020
 #define		SOFT_RESET_CP	(1<<0)
@@ -665,7 +665,7 @@
 #   define IH_WPTR_WRITEBACK_ENABLE   (1 << 8)
 #   define IH_WPTR_WRITEBACK_TIMER(x) ((x) << 9) /* log2 */
 #   define IH_WPTR_OVERFLOW_ENABLE(1 << 16)
-#   define IH_WPTR_OVERFLOW_CLEAR (1 << 31)
+#   define IH_WPTR_OVERFLOW_CLEAR (1U << 31)
 #define IH_RB_BASE0x3e04
 #define IH_RB_RPTR0x3e08
 #define IH_RB_WPTR0x3e0c
@@ -720,7 +720,7 @@
 #   define TIME_STAMP_INT_ENABLE  (1 << 26)
 #   define IB2_INT_ENABLE (1 << 29)
 #   define IB1_INT_ENABLE (1 << 30)
-#   define RB_INT_ENABLE  (1 << 31)
+#   define RB_INT_ENABLE  (1U << 31)
 #define CP_INT_STATUS 0xc128
 #   define SCRATCH_INT_STAT   (1 << 25)
 #   define TIME_STAMP_INT_STAT(1 << 26)
@@ -935,7 +935,7 @@
 #   define JACK_DETECTION_ENABLE  (1 << 4)
 #   define UNSOLICITED_RESPONSE_ENABLE (1 << 8)
 #   define CODEC_HOT_PLUG_ENABLE  (1 << 12)
-#   define AUDIO_ENABLED  (1 << 31)
+#   define AUDIO_ENABLED  (1U << 31)
 /* DCE3 adds */
 #   define PIN0_JACK_DETECTION_ENABLE (1 << 4)
 #   define PIN1_JACK_DETECTION_ENABLE (1 << 5)
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c:1.2	Fri Aug  9 06:27:21 2019
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c	Sat Aug 17 15:50:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_uvd_v1_0.c,v 1.2 2019/08/09 06:27:21 msaitoh Exp $	*/
+/*	$NetBSD: radeon_uvd_v1_0.c,v 1.3 2019/08/17 15:50:05 msaitoh Exp $	*/
 
 /*
  * Copyright 2013 Advanced Micro Devices, Inc.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_uvd_v1_0.c,v 1.2 2019/08/09 06:27:21 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_uvd_v1_0.c,v 1.3 2019/08/17 15:50:05 msaitoh Exp $");
 
 #include 
 #include 
@@ -144,7 +144,7 @@ int uvd_v1_0_resume(struct radeon_device
 
 	/* bits 32-39 */
 	addr = (rdev->uvd.gpu_addr >> 32) & 0xFF;
-	WREG32(UVD_LMI_EXT40_ADDR, addr | (0x9 << 16) | (0x1 << 31));
+	WREG32(UVD_LMI_EXT40_ADDR, addr | (0x9 << 16) | (0x1U << 31));
 
 	WREG32(UVD_FW_START, *((uint32_t*)rdev->uvd.cpu_addr));
 

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c:1.1	Mon Aug 27 14:38:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c	Sat Aug 17 15:50:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_r600.c,v 1.1 

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Aug 17 15:50:05 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: r600d.h radeon_r600.c
radeon_uvd_v1_0.c

Log Message:
 Use unsigned to avoid undefined behavior. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/radeon/r600d.h \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Aug 17 15:49:13 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_evergreen.c

Log Message:
 Set "enabled" value only when hpd.hpd is not RADEON_HPD_NONE(== 0xff) to
avoid 1 << 255. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Sat Aug 17 15:49:13 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_evergreen.c

Log Message:
 Set "enabled" value only when hpd.hpd is not RADEON_HPD_NONE(== 0xff) to
avoid 1 << 255. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.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_evergreen.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c:1.1	Mon Aug 27 14:38:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c	Sat Aug 17 15:49:13 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_evergreen.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $	*/
+/*	$NetBSD: radeon_evergreen.c,v 1.2 2019/08/17 15:49:13 msaitoh Exp $	*/
 
 /*
  * Copyright 2010 Advanced Micro Devices, Inc.
@@ -24,7 +24,7 @@
  * Authors: Alex Deucher
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen.c,v 1.2 2019/08/17 15:49:13 msaitoh Exp $");
 
 #include 
 #include 
@@ -1872,7 +1872,8 @@ void evergreen_hpd_init(struct radeon_de
 			break;
 		}
 		radeon_hpd_set_polarity(rdev, radeon_connector->hpd.hpd);
-		enabled |= 1 << radeon_connector->hpd.hpd;
+		if (radeon_connector->hpd.hpd != RADEON_HPD_NONE)
+			enabled |= 1 << radeon_connector->hpd.hpd;
 	}
 	radeon_irq_kms_enable_hpd(rdev, enabled);
 }

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug  9 06:27:21 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: cikd.h evergreend.h nid.h
radeon_mode.h radeon_reg.h radeon_si_smc.c radeon_uvd_v1_0.c
radeon_uvd_v2_2.c radeon_uvd_v4_2.c sid.h

Log Message:
 Use unsigned to avoid undefined behavior. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/radeon/cikd.h \
src/sys/external/bsd/drm2/dist/drm/radeon/evergreend.h \
src/sys/external/bsd/drm2/dist/drm/radeon/nid.h \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_reg.h \
src/sys/external/bsd/drm2/dist/drm/radeon/sid.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_smc.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v2_2.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v4_2.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/cikd.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/cikd.h:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/cikd.h:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/cikd.h:1.2	Mon Aug 27 04:58:35 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/cikd.h	Fri Aug  9 06:27:21 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: cikd.h,v 1.2 2018/08/27 04:58:35 riastradh Exp $	*/
+/*	$NetBSD: cikd.h,v 1.3 2019/08/09 06:27:21 msaitoh Exp $	*/
 
 /*
  * Copyright 2012 Advanced Micro Devices, Inc.
@@ -809,7 +809,7 @@
 #   define IH_WPTR_WRITEBACK_ENABLE   (1 << 8)
 #   define IH_WPTR_WRITEBACK_TIMER(x) ((x) << 9) /* log2 */
 #   define IH_WPTR_OVERFLOW_ENABLE(1 << 16)
-#   define IH_WPTR_OVERFLOW_CLEAR (1 << 31)
+#   define IH_WPTR_OVERFLOW_CLEAR (1U << 31)
 #define IH_RB_BASE0x3e04
 #define IH_RB_RPTR0x3e08
 #define IH_RB_WPTR0x3e0c
@@ -1308,7 +1308,7 @@
 #define		RB_BLKSZ(x)	((x) << 8)
 #define		BUF_SWAP_32BIT	(2 << 16)
 #define		RB_NO_UPDATE	(1 << 27)
-#define		RB_RPTR_WR_ENA	(1 << 31)
+#define		RB_RPTR_WR_ENA	(1U << 31)
 
 #define	CP_RB0_RPTR_ADDR0xC10C
 #define		RB_RPTR_SWAP_32BIT(2 << 0)
@@ -1357,7 +1357,7 @@
 #define CP_CPF_DEBUG0xC200
 
 #define CP_PQ_WPTR_POLL_CNTL0xC20C
-#define		WPTR_POLL_EN  			(1 << 31)
+#define		WPTR_POLL_EN  			(1U << 31)
 
 #define CP_ME1_PIPE0_INT_CNTL   0xC214
 #define CP_ME1_PIPE1_INT_CNTL   0xC218
@@ -1518,7 +1518,7 @@
 #define		DOORBELL_SOURCE  			(1 << 28)
 #define		DOORBELL_SCHD_HIT  			(1 << 29)
 #define		DOORBELL_EN  			(1 << 30)
-#define		DOORBELL_HIT  			(1 << 31)
+#define		DOORBELL_HIT  			(1U << 31)
 #define CP_HQD_PQ_WPTR0xC954
 #define CP_HQD_PQ_CONTROL 0xC958
 #define		QUEUE_SIZE(x)((x) << 0)
@@ -1530,7 +1530,7 @@
 #define		UNORD_DISPATCH  			(1 << 28)
 #define		ROQ_PQ_IB_FLIP  			(1 << 29)
 #define		PRIV_STATE  			(1 << 30)
-#define		KMD_QUEUE  (1 << 31)
+#define		KMD_QUEUE  (1U << 31)
 
 #define CP_HQD_IB_BASE_ADDR0xC95Cu
 #define CP_HQD_IB_BASE_ADDR_HI			0xC960u
@@ -1634,7 +1634,7 @@
 #define		SE_INDEX(x) 			((x) << 16)
 #define		SH_BROADCAST_WRITES  		(1 << 29)
 #define		INSTANCE_BROADCAST_WRITES  		(1 << 30)
-#define		SE_BROADCAST_WRITES  		(1 << 31)
+#define		SE_BROADCAST_WRITES  		(1U << 31)
 
 #define	VGT_ESGS_RING_SIZE0x30900
 #define	VGT_GSVS_RING_SIZE0x30904
@@ -1661,8 +1661,8 @@
 #define		CGTS_OVERRIDE(1 << 21)
 #define		CGTS_LS_OVERRIDE			(1 << 22)
 #define		ON_MONITOR_ADD_EN			(1 << 23)
-#define		ON_MONITOR_ADD(x)			((x) << 24)
-#define		ON_MONITOR_ADD_MASK			(0xff << 24)
+#define		ON_MONITOR_ADD(x)			((uint32_t)(x) << 24)
+#define		ON_MONITOR_ADD_MASK			(0xffU << 24)
 
 #define	CGTS_TCC_DISABLE0x3c00c
 #define	CGTS_USER_TCC_DISABLE0x3c010
@@ -1674,10 +1674,10 @@
 /*
  * PM4
  */
-#define	PACKET_TYPE0	0
-#define	PACKET_TYPE1	1
-#define	PACKET_TYPE2	2
-#define	PACKET_TYPE3	3
+#define	PACKET_TYPE0	0U
+#define	PACKET_TYPE1	1U
+#define	PACKET_TYPE2	2U
+#define	PACKET_TYPE3	3U
 
 #define CP_PACKET_GET_TYPE(h) (((h) >> 30) & 3)
 #define CP_PACKET_GET_COUNT(h) (((h) >> 16) & 0x3FFF)
Index: src/sys/external/bsd/drm2/dist/drm/radeon/evergreend.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/evergreend.h:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/evergreend.h:1.3
--- 

CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Fri Aug  9 06:27:21 UTC 2019

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: cikd.h evergreend.h nid.h
radeon_mode.h radeon_reg.h radeon_si_smc.c radeon_uvd_v1_0.c
radeon_uvd_v2_2.c radeon_uvd_v4_2.c sid.h

Log Message:
 Use unsigned to avoid undefined behavior. Found by kUBSan.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/dist/drm/radeon/cikd.h \
src/sys/external/bsd/drm2/dist/drm/radeon/evergreend.h \
src/sys/external/bsd/drm2/dist/drm/radeon/nid.h \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_reg.h \
src/sys/external/bsd/drm2/dist/drm/radeon/sid.h
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_mode.h
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_si_smc.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v1_0.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v2_2.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_uvd_v4_2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

re: CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[matthew green]

Taylor R Campbell writes:
 Module Name:  src
 Committed By: riastradh
 Date: Tue Mar  3 13:57:20 UTC 2015
 
 Modified Files:
   src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c
 
 Log Message:
 radeon_fence_wait returns 0, not positive, on success.

i haven't confirmed yet, but i suspect this change breaks
radeondrmkms.

latest kernels are no longer enabling DRM in X for me, and we end
up with no KMS enabled, and really really slow access.. the console
seems fine, and the Xorg.0.log file is identical upto the point it
says direct rendering isn't working and gives up:

[75.407] drmOpenByBusid: drmGetBusid reports pci:0001:02:00.0
[75.408] (II) RADEON(0): GPU accel disabled or not working, using shadowfb 
for KMS
[75.408] (II) Loading sub module shadow

the next line is normally:

[68.095] (II) Loading sub module dri2

i'll test which exact change broke things this evening.


.mrg.

Re: CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[Taylor R Campbell]

   Date: Wed, 04 Mar 2015 09:24:22 +1100
   from: matthew green m...@eterna.com.au

   Taylor R Campbell writes:
Module Name:   src
Committed By:  riastradh
Date:  Tue Mar  3 13:57:20 UTC 2015

Modified Files:
   src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c

Log Message:
radeon_fence_wait returns 0, not positive, on success.

   i haven't confirmed yet, but i suspect this change breaks
   radeondrmkms.

It does, and that breakage should be fixed by:

https://mail-index.netbsd.org/source-changes/2015/03/03/msg063651.html

re: CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[matthew green]

Taylor R Campbell writes:
Date: Wed, 04 Mar 2015 09:24:22 +1100
from: matthew green m...@eterna.com.au
 
Taylor R Campbell writes:
 Module Name: src
 Committed By:riastradh
 Date:Tue Mar  3 13:57:20 UTC 2015
 
 Modified Files:
  src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c
 
 Log Message:
 radeon_fence_wait returns 0, not positive, on success.
 
i haven't confirmed yet, but i suspect this change breaks
radeondrmkms.
 
 It does, and that breakage should be fixed by:
 
 https://mail-index.netbsd.org/source-changes/2015/03/03/msg063651.html

indeed, this fixes it for me.  i thought i had tested it but
i only had rev 1.7.

thanks, and sorry for the noise!


.mrg.

re: CVS commit: src/sys/external/bsd/drm2/dist/drm/radeon

[matthew green]

Taylor R Campbell writes:
 Module Name:  src
 Committed By: riastradh
 Date: Mon Mar  2 17:53:00 UTC 2015
 
 Modified Files:
   src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fence.c
 
 Log Message:
 Return the error if there is one in radeon_fence_wait_seq.
 
 Don't just always say we succeeded!
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.5 -r1.6 \
 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c

this is infact the problem change -- reverting back to
radeon_fence.c 1.5 gives me (mostly) working drm again.


.mrg.