Merge remote-tracking branch 'drm-intel/for-linux-next'

[karo-tx-linux.git] / drivers / gpu / drm / i915 / i915_irq.c

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 5d8ec7a818314afc5b55b7efdd99266ca243cc10..c7347d531a1e5b743a5b2453c3df40d2935c3c41 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -653,7 +653,7 @@ static void i915_enable_asle_pipestat(struct drm_device *dev)
  *   of horizontal active on the first line of vertical active
  */
 
  *   of horizontal active on the first line of vertical active
  */
 

-static u32 i8xx_get_vblank_counter(struct drm_device *dev, int pipe)
+static u32 i8xx_get_vblank_counter(struct drm_device *dev, unsigned int pipe)

 {
        /* Gen2 doesn't have a hardware frame counter */
        return 0;
 {
        /* Gen2 doesn't have a hardware frame counter */
        return 0;


@@ -662,7 +662,7 @@ static u32 i8xx_get_vblank_counter(struct drm_device *dev, int pipe)
 /* Called from drm generic code, passed a 'crtc', which
  * we use as a pipe index
  */
 /* Called from drm generic code, passed a 'crtc', which
  * we use as a pipe index
  */

-static u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)
+static u32 i915_get_vblank_counter(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long high_frame;
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long high_frame;


@@ -710,7 +710,7 @@ static u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)
        return (((high1 << 8) | low) + (pixel >= vbl_start)) & 0xffffff;
 }
 
        return (((high1 << 8) | low) + (pixel >= vbl_start)) & 0xffffff;
 }
 

-static u32 g4x_get_vblank_counter(struct drm_device *dev, int pipe)
+static u32 g4x_get_vblank_counter(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
 
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
 


@@ -770,7 +770,7 @@ static int __intel_get_crtc_scanline(struct intel_crtc *crtc)
        return (position + crtc->scanline_offset) % vtotal;
 }
 
        return (position + crtc->scanline_offset) % vtotal;
 }
 

-static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,
+static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,

                                    unsigned int flags, int *vpos, int *hpos,
                                    ktime_t *stime, ktime_t *etime,
                                    const struct drm_display_mode *mode)
                                    unsigned int flags, int *vpos, int *hpos,
                                    ktime_t *stime, ktime_t *etime,
                                    const struct drm_display_mode *mode)


@@ -907,27 +907,27 @@ int intel_get_crtc_scanline(struct intel_crtc *crtc)
        return position;
 }
 
        return position;
 }
 

-static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe,
+static int i915_get_vblank_timestamp(struct drm_device *dev, unsigned int pipe,

                              int *max_error,
                              struct timeval *vblank_time,
                              unsigned flags)
 {
        struct drm_crtc *crtc;
 
                              int *max_error,
                              struct timeval *vblank_time,
                              unsigned flags)
 {
        struct drm_crtc *crtc;
 

-       if (pipe < 0 || pipe >= INTEL_INFO(dev)->num_pipes) {
-               DRM_ERROR("Invalid crtc %d\n", pipe);
+       if (pipe >= INTEL_INFO(dev)->num_pipes) {
+               DRM_ERROR("Invalid crtc %u\n", pipe);

                return -EINVAL;
        }
 
        /* Get drm_crtc to timestamp: */
        crtc = intel_get_crtc_for_pipe(dev, pipe);
        if (crtc == NULL) {
                return -EINVAL;
        }
 
        /* Get drm_crtc to timestamp: */
        crtc = intel_get_crtc_for_pipe(dev, pipe);
        if (crtc == NULL) {

-               DRM_ERROR("Invalid crtc %d\n", pipe);
+               DRM_ERROR("Invalid crtc %u\n", pipe);

                return -EINVAL;
        }
 
        if (!crtc->hwmode.crtc_clock) {
                return -EINVAL;
        }
 
        if (!crtc->hwmode.crtc_clock) {

-               DRM_DEBUG_KMS("crtc %d is disabled\n", pipe);
+               DRM_DEBUG_KMS("crtc %u is disabled\n", pipe);

                return -EBUSY;
        }
 
                return -EBUSY;
        }
 


@@ -2619,7 +2619,7 @@ void i915_handle_error(struct drm_device *dev, bool wedged,
 /* Called from drm generic code, passed 'crtc' which
  * we use as a pipe index
  */
 /* Called from drm generic code, passed 'crtc' which
  * we use as a pipe index
  */

-static int i915_enable_vblank(struct drm_device *dev, int pipe)
+static int i915_enable_vblank(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;


@@ -2636,7 +2636,7 @@ static int i915_enable_vblank(struct drm_device *dev, int pipe)
        return 0;
 }
 
        return 0;
 }
 

-static int ironlake_enable_vblank(struct drm_device *dev, int pipe)
+static int ironlake_enable_vblank(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;


@@ -2650,7 +2650,7 @@ static int ironlake_enable_vblank(struct drm_device *dev, int pipe)
        return 0;
 }
 
        return 0;
 }
 

-static int valleyview_enable_vblank(struct drm_device *dev, int pipe)
+static int valleyview_enable_vblank(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;


@@ -2663,7 +2663,7 @@ static int valleyview_enable_vblank(struct drm_device *dev, int pipe)
        return 0;
 }
 
        return 0;
 }
 

-static int gen8_enable_vblank(struct drm_device *dev, int pipe)
+static int gen8_enable_vblank(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;


@@ -2679,7 +2679,7 @@ static int gen8_enable_vblank(struct drm_device *dev, int pipe)
 /* Called from drm generic code, passed 'crtc' which
  * we use as a pipe index
  */
 /* Called from drm generic code, passed 'crtc' which
  * we use as a pipe index
  */

-static void i915_disable_vblank(struct drm_device *dev, int pipe)
+static void i915_disable_vblank(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;


@@ -2691,7 +2691,7 @@ static void i915_disable_vblank(struct drm_device *dev, int pipe)
        spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 
        spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 

-static void ironlake_disable_vblank(struct drm_device *dev, int pipe)
+static void ironlake_disable_vblank(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;


@@ -2703,7 +2703,7 @@ static void ironlake_disable_vblank(struct drm_device *dev, int pipe)
        spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 
        spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 

-static void valleyview_disable_vblank(struct drm_device *dev, int pipe)
+static void valleyview_disable_vblank(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;


@@ -2714,7 +2714,7 @@ static void valleyview_disable_vblank(struct drm_device *dev, int pipe)
        spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 
        spin_unlock_irqrestore(&dev_priv->irq_lock, irqflags);
 }
 

-static void gen8_disable_vblank(struct drm_device *dev, int pipe)
+static void gen8_disable_vblank(struct drm_device *dev, unsigned int pipe)

 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        unsigned long irqflags;