Module Name: src
Committed By: mrg
Date: Fri Feb 8 04:11:53 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_evergreen_cs.c
radeon_r300.c radeon_r420.c
Log Message:
add missing break for CP_COHER_BASE case.
convert fallthru comments.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.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_cs.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c:1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c:1.1 Mon Aug 27 14:38:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c Fri Feb 8 04:11:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_evergreen_cs.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $ */
+/* $NetBSD: radeon_evergreen_cs.c,v 1.2 2019/02/08 04:11:53 mrg Exp $ */
/*
* Copyright 2010 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen_cs.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_evergreen_cs.c,v 1.2 2019/02/08 04:11:53 mrg Exp $");
#include <drm/drmP.h>
#include "radeon.h"
@@ -1335,6 +1335,7 @@ static int evergreen_cs_handle_reg(struc
return -EINVAL;
}
ib[idx] += (u32)((reloc->gpu_offset >> 8) & 0xffffffff);
+ break;
case CB_TARGET_MASK:
track->cb_target_mask = radeon_get_ib_value(p, idx);
track->cb_dirty = true;
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c:1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c:1.1 Mon Aug 27 14:38:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c Fri Feb 8 04:11:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_r300.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $ */
+/* $NetBSD: radeon_r300.c,v 1.2 2019/02/08 04:11:53 mrg Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_r300.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_r300.c,v 1.2 2019/02/08 04:11:53 mrg Exp $");
#include <linux/seq_file.h>
#include <linux/slab.h>
@@ -846,7 +846,7 @@ static int r300_packet0_check(struct rad
((idx_value >> 21) & 0xF));
return -EINVAL;
}
- /* Pass through. */
+ /* FALLTHROUGH */
case 6:
track->cb[i].cpp = 4;
break;
@@ -997,7 +997,7 @@ static int r300_packet0_check(struct rad
return -EINVAL;
}
/* The same rules apply as for DXT3/5. */
- /* Pass through. */
+ /* FALLTHROUGH */
case R300_TX_FORMAT_DXT3:
case R300_TX_FORMAT_DXT5:
track->textures[i].cpp = 1;
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c:1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c:1.1 Mon Aug 27 14:38:20 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c Fri Feb 8 04:11:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_r420.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $ */
+/* $NetBSD: radeon_r420.c,v 1.2 2019/02/08 04:11:53 mrg Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -28,7 +28,7 @@
* Jerome Glisse
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_r420.c,v 1.1 2018/08/27 14:38:20 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_r420.c,v 1.2 2019/02/08 04:11:53 mrg Exp $");
#include <linux/seq_file.h>
#include <linux/slab.h>
@@ -115,6 +115,7 @@ void r420_pipes_init(struct radeon_devic
default:
/* force to 1 pipe */
num_pipes = 1;
+ /* FALLTHROUGH */
case 1:
tmp = (0 << 1);
break;
