[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/10c9b8abf5b3
branches:  trunk
changeset: 992677:10c9b8abf5b3
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:28:04 2018 +0000

description:
enum pipe -> enum i915_pipe

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_psr.c    |  20 ++++++++++----------
 sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c |  10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diffs (135 lines):

diff -r 42587cd5a7e3 -r 10c9b8abf5b3 sys/external/bsd/drm2/dist/drm/i915/intel_psr.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c   Mon Aug 27 07:27:51 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_psr.c   Mon Aug 27 07:28:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_psr.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $  */
+/*     $NetBSD: intel_psr.c,v 1.3 2018/08/27 07:28:04 riastradh Exp $  */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -54,7 +54,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_psr.c,v 1.2 2018/08/27 04:58:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_psr.c,v 1.3 2018/08/27 07:28:04 riastradh Exp $");
 
 #include <drm/drmP.h>
 
@@ -114,7 +114,7 @@
        struct drm_device *dev = intel_dig_port->base.base.dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_crtc *crtc = intel_dig_port->base.base.crtc;
-       enum pipe pipe = to_intel_crtc(crtc)->pipe;
+       enum i915_pipe pipe = to_intel_crtc(crtc)->pipe;
        uint32_t val;
 
        /* VLV auto-generate VSC package as per EDP 1.3 spec, Table 3.10 */
@@ -226,7 +226,7 @@
        struct drm_device *dev = dig_port->base.base.dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_crtc *crtc = dig_port->base.base.crtc;
-       enum pipe pipe = to_intel_crtc(crtc)->pipe;
+       enum i915_pipe pipe = to_intel_crtc(crtc)->pipe;
 
        /* Transition from PSR_state 0 to PSR_state 1, i.e. PSR Inactive */
        I915_WRITE(VLV_PSRCTL(pipe),
@@ -241,7 +241,7 @@
        struct drm_device *dev = dig_port->base.base.dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_crtc *crtc = dig_port->base.base.crtc;
-       enum pipe pipe = to_intel_crtc(crtc)->pipe;
+       enum i915_pipe pipe = to_intel_crtc(crtc)->pipe;
 
        /* Let's do the transition from PSR_state 1 to PSR_state 2
         * that is PSR transition to active - static frame transmission.
@@ -520,7 +520,7 @@
                container_of(work, typeof(*dev_priv), psr.work.work);
        struct intel_dp *intel_dp = dev_priv->psr.enabled;
        struct drm_crtc *crtc = dp_to_dig_port(intel_dp)->base.base.crtc;
-       enum pipe pipe = to_intel_crtc(crtc)->pipe;
+       enum i915_pipe pipe = to_intel_crtc(crtc)->pipe;
 
        /* We have to make sure PSR is ready for re-enable
         * otherwise it keeps disabled until next full enable/disable cycle.
@@ -564,7 +564,7 @@
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_dp *intel_dp = dev_priv->psr.enabled;
        struct drm_crtc *crtc = dp_to_dig_port(intel_dp)->base.base.crtc;
-       enum pipe pipe = to_intel_crtc(crtc)->pipe;
+       enum i915_pipe pipe = to_intel_crtc(crtc)->pipe;
        u32 val;
 
        if (!dev_priv->psr.active)
@@ -618,7 +618,7 @@
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_crtc *crtc;
-       enum pipe pipe;
+       enum i915_pipe pipe;
        u32 val;
 
        /*
@@ -666,7 +666,7 @@
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_crtc *crtc;
-       enum pipe pipe;
+       enum i915_pipe pipe;
 
        mutex_lock(&dev_priv->psr.lock);
        if (!dev_priv->psr.enabled) {
@@ -704,7 +704,7 @@
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_crtc *crtc;
-       enum pipe pipe;
+       enum i915_pipe pipe;
        int delay_ms = HAS_DDI(dev) ? 100 : 500;
 
        mutex_lock(&dev_priv->psr.lock);
diff -r 42587cd5a7e3 -r 10c9b8abf5b3 sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c        Mon Aug 27 07:27:51 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c        Mon Aug 27 07:28:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_sprite.c,v 1.4 2018/08/27 06:16:50 riastradh Exp $       */
+/*     $NetBSD: intel_sprite.c,v 1.5 2018/08/27 07:28:04 riastradh Exp $       */
 
 /*
  * Copyright © 2011 Intel Corporation
@@ -32,7 +32,7 @@
  * support.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.4 2018/08/27 06:16:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_sprite.c,v 1.5 2018/08/27 07:28:04 riastradh Exp $");
 
 #include <drm/drmP.h>
 #include <drm/drm_crtc.h>
@@ -87,7 +87,7 @@
 {
        struct drm_device *dev = crtc->base.dev;
        const struct drm_display_mode *adjusted_mode = &crtc->config->base.adjusted_mode;
-       enum pipe pipe = crtc->pipe;
+       enum i915_pipe pipe = crtc->pipe;
        long timeout = msecs_to_jiffies_timeout(1);
        int scanline, min, max, vblank_start;
 #ifdef __NetBSD__
@@ -170,7 +170,7 @@
 void intel_pipe_update_end(struct intel_crtc *crtc)
 {
        struct drm_device *dev = crtc->base.dev;
-       enum pipe pipe = crtc->pipe;
+       enum i915_pipe pipe = crtc->pipe;
        int scanline_end = intel_get_crtc_scanline(crtc);
        u32 end_vbl_count = dev->driver->get_vblank_counter(dev, pipe);
        ktime_t end_vbl_time = ktime_get();
@@ -505,7 +505,7 @@
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_plane *intel_plane = to_intel_plane(plane);
        struct drm_i915_gem_object *obj = intel_fb_obj(fb);
-       enum pipe pipe = intel_plane->pipe;
+       enum i915_pipe pipe = intel_plane->pipe;
        u32 sprctl, sprscale = 0;
        unsigned long sprsurf_offset, linear_offset;
        int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0);