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 revert the upsteam portion of...
details: https://anonhg.NetBSD.org/src/rev/300729e04a2c
branches: trunk
changeset: 839413:300729e04a2c
user: christos <christos%NetBSD.org@localhost>
date: Tue Feb 19 00:30:16 2019 +0000
description:
revert the upsteam portion of previous; we don't want to patch upstream
fallthrough/breaks.
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 +++----
4 files changed, 9 insertions(+), 22 deletions(-)
diffs (158 lines):
diff -r 301004d5d335 -r 300729e04a2c sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c Tue Feb 19 00:26:57 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c Tue Feb 19 00:30:16 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_ddi.c,v 1.9 2019/02/18 23:23:41 christos Exp $ */
+/* $NetBSD: intel_ddi.c,v 1.10 2019/02/19 00:30:16 christos Exp $ */
/*
* Copyright © 2012 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.9 2019/02/18 23:23:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_ddi.c,v 1.10 2019/02/19 00:30:16 christos Exp $");
#include <linux/math64.h>
@@ -2228,7 +2228,6 @@
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 301004d5d335 -r 300729e04a2c sys/external/bsd/drm2/dist/drm/i915/intel_display.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Tue Feb 19 00:26:57 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Tue Feb 19 00:30:16 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display.c,v 1.25 2019/02/18 23:23:41 christos Exp $ */
+/* $NetBSD: intel_display.c,v 1.26 2019/02/19 00:30:16 christos Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.25 2019/02/18 23:23:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.26 2019/02/19 00:30:16 christos Exp $");
#include <linux/dmi.h>
#include <linux/module.h>
@@ -5318,7 +5318,6 @@
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:
@@ -5353,7 +5352,6 @@
* 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);
@@ -6924,7 +6922,6 @@
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:
@@ -9960,7 +9957,6 @@
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;
@@ -12252,7 +12248,6 @@
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 301004d5d335 -r 300729e04a2c sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Tue Feb 19 00:26:57 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Tue Feb 19 00:30:16 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_sdvo.c,v 1.11 2019/02/18 23:23:41 christos Exp $ */
+/* $NetBSD: intel_sdvo.c,v 1.12 2019/02/19 00:30:16 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.11 2019/02/18 23:23:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sdvo.c,v 1.12 2019/02/19 00:30:16 christos Exp $");
#include <linux/i2c.h>
#include <linux/slab.h>
@@ -1278,7 +1278,6 @@
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;
@@ -2229,19 +2228,14 @@
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 301004d5d335 -r 300729e04a2c sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c Tue Feb 19 00:26:57 2019 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/nouveau_bo.c Tue Feb 19 00:30:16 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nouveau_bo.c,v 1.14 2019/02/18 23:23:41 christos Exp $ */
+/* $NetBSD: nouveau_bo.c,v 1.15 2019/02/19 00:30:16 christos Exp $ */
/*
* Copyright 2007 Dave Airlied
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_bo.c,v 1.14 2019/02/18 23:23:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_bo.c,v 1.15 2019/02/19 00:30:16 christos Exp $");
#include <linux/dma-mapping.h>
#include <linux/swiotlb.h>
@@ -1469,8 +1469,7 @@
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);
Home |
Main Index |
Thread Index |
Old Index