[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 pipe -> i915_pipe

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4c1cf179ca2b
branches:  trunk
changeset: 365954:4c1cf179ca2b
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:23:10 2018 +0000

description:
pipe -> i915_pipe

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 25b9dfa00b4d -r 4c1cf179ca2b sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c  Mon Aug 27 07:22:59 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c  Mon Aug 27 07:23:10 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_hdmi.c,v 1.6 2018/08/27 04:58:24 riastradh Exp $ */
+/*     $NetBSD: intel_hdmi.c,v 1.7 2018/08/27 07:23:10 riastradh Exp $ */
 
 /*
  * Copyright 2006 Dave Airlie <airlied%linux.ie@localhost>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.6 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.7 2018/08/27 07:23:10 riastradh Exp $");
 
 #include <linux/i2c.h>
 #include <linux/slab.h>
@@ -1043,7 +1043,7 @@
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
        struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&encoder->base);
-       enum pipe pipe = crtc->pipe;
+       enum i915_pipe pipe = crtc->pipe;
        u32 temp;
 
        temp = I915_READ(intel_hdmi->hdmi_reg);
@@ -1628,7 +1628,7 @@
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
        enum dpio_channel ch = vlv_dport_to_channel(enc_to_dig_port(&encoder->base));
        struct intel_crtc *crtc = to_intel_crtc(encoder->base.crtc);
-       enum pipe pipe = crtc->pipe;
+       enum i915_pipe pipe = crtc->pipe;
        uint32_t val;
 
        val = vlv_dpio_read(dev_priv, pipe, VLV_PCS01_DW0(ch));
@@ -1674,7 +1674,7 @@
        struct intel_crtc *intel_crtc =
                to_intel_crtc(encoder->base.crtc);
        enum dpio_channel ch = vlv_dport_to_channel(dport);
-       enum pipe pipe = intel_crtc->pipe;
+       enum i915_pipe pipe = intel_crtc->pipe;
        u32 val;
 
        intel_hdmi_prepare(encoder);
@@ -1748,7 +1748,7 @@
 static void chv_hdmi_post_pll_disable(struct intel_encoder *encoder)
 {
        struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
-       enum pipe pipe = to_intel_crtc(encoder->base.crtc)->pipe;
+       enum i915_pipe pipe = to_intel_crtc(encoder->base.crtc)->pipe;
        u32 val;
 
        mutex_lock(&dev_priv->sb_lock);