CVS commit: src/sys/external/bsd/drm2/dist/drm/i915

[Taylor R Campbell]

Module Name:    src
Committed By:   riastradh
Date:           Mon Aug 27 07:30:13 UTC 2018

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/i915: intel_runtime_pm.c

Log Message:
enum pipe -> enum i915_pipe


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.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_runtime_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c:1.2 src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c:1.2	Mon Aug 27 04:58:24 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_runtime_pm.c	Mon Aug 27 07:30:13 2018
@@ -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 bool vlv_power_well_enabled(struc
 
 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_enab
 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 @@ static void chv_dpio_cmn_power_well_enab
 					   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 chv_dpio_cmn_power_well_disa
 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 @@ void chv_phy_powergate_lanes(struct inte
 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 @@ static void chv_set_pipe_power_well(stru
 				    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;