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

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

details:   https://anonhg.NetBSD.org/src/rev/a77645561a6d
branches:  trunk
changeset: 835069:a77645561a6d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:30:13 2018 +0000

description:
enum pipe -> enum i915_pipe

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 5486d6eb47a9 -r a77645561a6d sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c    Mon Aug 27 07:30:00 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c    Mon Aug 27 07:30:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_runtime_pm.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $   */
+/*     $NetBSD: intel_runtime_pm.c,v 1.3 2018/08/27 07:30:13 riastradh Exp $   */
 
 /*
  * Copyright © 2012-2014 Intel Corporation
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_runtime_pm.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_runtime_pm.c,v 1.3 2018/08/27 07:30:13 riastradh Exp $");
 
 #include <linux/pm_runtime.h>
 #include <linux/vgaarb.h>
@@ -868,7 +868,7 @@
 
 static void vlv_display_power_well_init(struct drm_i915_private *dev_priv)
 {
-       enum pipe pipe;
+       enum i915_pipe pipe;
 
        /*
         * Enable the CRI clock source so we can get at the
@@ -960,7 +960,7 @@
 static void vlv_dpio_cmn_power_well_disable(struct drm_i915_private *dev_priv,
                                            struct i915_power_well *power_well)
 {
-       enum pipe pipe;
+       enum i915_pipe pipe;
 
        WARN_ON_ONCE(power_well->data != PUNIT_POWER_WELL_DPIO_CMN_BC);
 
@@ -1101,7 +1101,7 @@
                                           struct i915_power_well *power_well)
 {
        enum dpio_phy phy;
-       enum pipe pipe;
+       enum i915_pipe pipe;
        uint32_t tmp;
 
        WARN_ON_ONCE(power_well->data != PUNIT_POWER_WELL_DPIO_CMN_BC &&
@@ -1191,7 +1191,7 @@
 static void assert_chv_phy_powergate(struct drm_i915_private *dev_priv, enum dpio_phy phy,
                                     enum dpio_channel ch, bool override, unsigned int mask)
 {
-       enum pipe pipe = phy == DPIO_PHY0 ? PIPE_A : PIPE_C;
+       enum i915_pipe pipe = phy == DPIO_PHY0 ? PIPE_A : PIPE_C;
        u32 reg, val, expected, actual;
 
        /*
@@ -1314,7 +1314,7 @@
 static bool chv_pipe_power_well_enabled(struct drm_i915_private *dev_priv,
                                        struct i915_power_well *power_well)
 {
-       enum pipe pipe = power_well->data;
+       enum i915_pipe pipe = power_well->data;
        bool enabled;
        u32 state, ctrl;
 
@@ -1344,7 +1344,7 @@
                                    struct i915_power_well *power_well,
                                    bool enable)
 {
-       enum pipe pipe = power_well->data;
+       enum i915_pipe pipe = power_well->data;
        u32 state;
        u32 ctrl;