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 <sys/cdefs.h>
-__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;
