linux-next: manual merge of the drm-misc tree with the drm-intel tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi all,

Today's linux-next merge of the drm-misc tree got a conflict in:

  drivers/gpu/drm/i915/i915_irq.c

between commit:

  fd8f507c0de9 ("drm/i915: s/PIPE_FRMCOUNT_GM45/PIPE_FRMCOUNT_G4X/ etc.")

from the drm-intel tree and commit:

  88e72717c2de ("drm/irq: Use unsigned int pipe in public API")

from the drm-misc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/i915_irq.c
index e24378ee7eda,bc732eb52b50..000000000000
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@@ -710,11 -611,12 +710,11 @@@ static u32 i915_get_vblank_counter(stru
  	return (((high1 << 8) | low) + (pixel >= vbl_start)) & 0xffffff;
  }
  
- static u32 g4x_get_vblank_counter(struct drm_device *dev, int pipe)
 -static u32 gm45_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
++static u32 g4x_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
 -	int reg = PIPE_FRMCOUNT_GM45(pipe);
  
 -	return I915_READ(reg);
 +	return I915_READ(PIPE_FRMCOUNT_G4X(pipe));
  }
  
  /* raw reads, only for fast reads of display block, no need for forcewake etc. */