From 3f413371843dc8c1869693ecb473055ca6b5f55f Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Fri, 8 Feb 2019 04:11:53 +0000
Subject: [PATCH] add missing break for CP_COHER_BASE case. convert fallthru
 comments.

---
 .../bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c        | 5 +++--
 sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c       | 8 ++++----
 sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c       | 5 +++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c
index ad8391e7dff1..a28b60b89adf 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen_cs.c
@@ -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(struct radeon_cs_parser *p, u32 reg, u32 idx)
 			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;
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c
index 3528119ed406..6ce4e2e81cde 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_r300.c
@@ -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 radeon_cs_parser *p,
 					  ((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 radeon_cs_parser *p,
 				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;
diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c
index 1ad2f11a42d0..e56357a3a775 100644
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_r420.c
@@ -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_device *rdev)
 	default:
 		/* force to 1 pipe */
 		num_pipes = 1;
+		/* FALLTHROUGH */
 	case 1:
 		tmp = (0 << 1);
 		break;