Module Name: src
Committed By: christos
Date: Mon Sep 24 00:42:34 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c
Log Message:
Add more casts to make clang happy.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.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/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.23 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.24
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.23 Thu Sep 13 04:25:55 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Sun Sep 23 20:42:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display.c,v 1.23 2018/09/13 08:25:55 mrg Exp $ */
+/* $NetBSD: intel_display.c,v 1.24 2018/09/24 00:42:34 christos Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.23 2018/09/13 08:25:55 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.24 2018/09/24 00:42:34 christos Exp $");
#include <linux/dmi.h>
#include <linux/module.h>
@@ -2039,7 +2039,7 @@ static void lpt_enable_pch_transcoder(st
/* FDI must be feeding us bits for PCH ports */
assert_fdi_tx_enabled(dev_priv, (enum i915_pipe) cpu_transcoder);
- assert_fdi_rx_enabled(dev_priv, TRANSCODER_A);
+ assert_fdi_rx_enabled(dev_priv, (enum i915_pipe) TRANSCODER_A);
/* Workaround: set timing override bit. */
val = I915_READ(TRANS_CHICKEN2(PIPE_A));
@@ -2132,7 +2132,7 @@ static void intel_enable_pipe(struct int
assert_sprites_disabled(dev_priv, pipe);
if (HAS_PCH_LPT(dev_priv->dev))
- pch_transcoder = TRANSCODER_A;
+ pch_transcoder = (enum i915_pipe)TRANSCODER_A;
else
pch_transcoder = pipe;
@@ -4307,7 +4307,7 @@ static void lpt_pch_enable(struct drm_cr
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
enum transcoder cpu_transcoder = intel_crtc->config->cpu_transcoder;
- assert_pch_transcoder_disabled(dev_priv, TRANSCODER_A);
+ assert_pch_transcoder_disabled(dev_priv, (enum i915_pipe) TRANSCODER_A);
lpt_program_iclkip(crtc);
