Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/drm2/dist/drm add failthrough and break as ...
details: https://anonhg.NetBSD.org/src/rev/a8d7fa3e7183
branches: trunk
changeset: 449013:a8d7fa3e7183
user: christos <christos%NetBSD.org@localhost>
date: Mon Feb 18 23:23:41 2019 +0000
description:
add failthrough and break as appropriate.
diffstat:
sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c | 5 +++--
sys/external/bsd/drm2/dist/drm/i915/intel_display.c | 9 +++++++--
sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c | 10 ++++++++--
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c | 7 ++++---
sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.c | 5 +++--
5 files changed, 25 insertions(+), 11 deletions(-)
diffs (184 lines):
diff -r c849e0041b6d -r a8d7fa3e7183 sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c Mon Feb 18 23:19:36 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c Mon Feb 18 23:23:41 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_ddi.c,v 1.8 2018/09/13 08:25:55 mrg Exp $ */
+/* $NetBSD: intel_ddi.c,v 1.9 2019/02/18 23:23:41 christos Exp $ */
/*
* Copyright © 2012 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.8 2018/09/13 08:25:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.9 2019/02/18 23:23:41 christos Exp $");
#include <linux/math64.h>
@@ -2228,6 +2228,7 @@
default:
DRM_DEBUG_KMS("Unsupported voltage swing/pre-emphasis level: 0x%x\n",
signal_levels);
+ /*FALLTHROUGH*/
case DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_0:
level = 0;
break;
diff -r c849e0041b6d -r a8d7fa3e7183 sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Mon Feb 18 23:19:36 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Mon Feb 18 23:23:41 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display.c,v 1.24 2018/09/24 00:42:34 christos Exp $ */
+/* $NetBSD: intel_display.c,v 1.25 2019/02/18 23:23:41 christos Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.24 2018/09/24 00:42:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.25 2019/02/18 23:23:41 christos Exp $");
#include <linux/dmi.h>
#include <linux/module.h>
@@ -5318,6 +5318,7 @@
case INTEL_OUTPUT_UNKNOWN:
/* Only DDI platforms should ever use this output type */
WARN_ON_ONCE(!HAS_DDI(dev));
+ /*FALLTHROUGH*/
case INTEL_OUTPUT_DISPLAYPORT:
case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_EDP:
@@ -5352,6 +5353,7 @@
* run the DP detection too.
*/
WARN_ON_ONCE(!HAS_DDI(dev));
+ /*FALLTHROUGH*/
case INTEL_OUTPUT_DISPLAYPORT:
case INTEL_OUTPUT_EDP:
intel_dig_port = enc_to_dig_port(&intel_encoder->base);
@@ -6922,6 +6924,7 @@
return 200000;
default:
DRM_ERROR("Unknown pnv display core clock 0x%04x\n", gcfgc);
+ /*FALLTHROUGH*/
case GC_DISPLAY_CLOCK_133_MHZ_PNV:
return 133333;
case GC_DISPLAY_CLOCK_167_MHZ_PNV:
@@ -9957,6 +9960,7 @@
switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {
default:
WARN(1, "unknown pipe linked to edp transcoder\n");
+ /*FALLTHROUGH*/
case TRANS_DDI_EDP_INPUT_A_ONOFF:
case TRANS_DDI_EDP_INPUT_A_ON:
trans_edp_pipe = PIPE_A;
@@ -12248,6 +12252,7 @@
case INTEL_OUTPUT_UNKNOWN:
if (WARN_ON(!HAS_DDI(dev)))
break;
+ /*FALLTHROUGH*/
case INTEL_OUTPUT_DISPLAYPORT:
case INTEL_OUTPUT_HDMI:
case INTEL_OUTPUT_EDP:
diff -r c849e0041b6d -r a8d7fa3e7183 sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Mon Feb 18 23:19:36 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Mon Feb 18 23:23:41 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_sdvo.c,v 1.10 2018/08/27 06:16:50 riastradh Exp $ */
+/* $NetBSD: intel_sdvo.c,v 1.11 2019/02/18 23:23:41 christos Exp $ */
/*
* Copyright 2006 Dave Airlie <airlied%linux.ie@localhost>
@@ -28,7 +28,7 @@
* Eric Anholt <eric%anholt.net@localhost>
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.10 2018/08/27 06:16:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.11 2019/02/18 23:23:41 christos Exp $");
#include <linux/i2c.h>
#include <linux/slab.h>
@@ -1278,6 +1278,7 @@
switch (crtc->config->pixel_multiplier) {
default:
WARN(1, "unknown pixel multiplier specified\n");
+ /*FALLTHROUGH*/
case 1: rate = SDVO_CLOCK_RATE_MULT_1X; break;
case 2: rate = SDVO_CLOCK_RATE_MULT_2X; break;
case 4: rate = SDVO_CLOCK_RATE_MULT_4X; break;
@@ -2228,14 +2229,19 @@
switch (sdvo->controlled_output) {
case SDVO_OUTPUT_LVDS1:
mask |= SDVO_OUTPUT_LVDS1;
+ /*FALLTHROUGH*/
case SDVO_OUTPUT_LVDS0:
mask |= SDVO_OUTPUT_LVDS0;
+ /*FALLTHROUGH*/
case SDVO_OUTPUT_TMDS1:
mask |= SDVO_OUTPUT_TMDS1;
+ /*FALLTHROUGH*/
case SDVO_OUTPUT_TMDS0:
mask |= SDVO_OUTPUT_TMDS0;
+ /*FALLTHROUGH*/
case SDVO_OUTPUT_RGB1:
mask |= SDVO_OUTPUT_RGB1;
+ /*FALLTHROUGH*/
case SDVO_OUTPUT_RGB0:
mask |= SDVO_OUTPUT_RGB0;
break;
diff -r c849e0041b6d -r a8d7fa3e7183 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c Mon Feb 18 23:19:36 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c Mon Feb 18 23:23:41 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_bo.c,v 1.13 2018/10/08 17:58:52 christos Exp $ */
+/* $NetBSD: nouveau_bo.c,v 1.14 2019/02/18 23:23:41 christos Exp $ */
/*
* Copyright 2007 Dave Airlied
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_bo.c,v 1.13 2018/10/08 17:58:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_bo.c,v 1.14 2019/02/18 23:23:41 christos Exp $");
#include <linux/dma-mapping.h>
#include <linux/swiotlb.h>
@@ -1469,7 +1469,8 @@
if (drm->device.info.family < NV_DEVICE_INFO_V0_TESLA || !node->memtype)
/* untiled */
break;
- /* fallthrough, tiled memory */
+ /* FALLTHROUGH */
+ /* tiled memory */
case TTM_PL_VRAM:
mem->bus.offset = mem->start << PAGE_SHIFT;
mem->bus.base = device->func->resource_addr(device, 1);
diff -r c849e0041b6d -r a8d7fa3e7183 sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.c Mon Feb 18 23:19:36 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_usif.c Mon Feb 18 23:23:41 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_usif.c,v 1.6 2018/12/21 07:51:17 maya Exp $ */
+/* $NetBSD: nouveau_usif.c,v 1.7 2019/02/18 23:23:41 christos Exp $ */
/*
* Copyright 2014 Red Hat Inc.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_usif.c,v 1.6 2018/12/21 07:51:17 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_usif.c,v 1.7 2019/02/18 23:23:41 christos Exp $");
#include "nouveau_drm.h"
#include "nouveau_usif.h"
@@ -374,6 +374,7 @@
case NVIF_IOCTL_V0_MAP_NETBSD:
/* Kernel-only kludge. */
ret = -EINVAL;
+ break;
default:
ret = nvif_client_ioctl(client, argv, argc);
break;
Home |
Main Index |
Thread Index |
Old Index