Merge tag 'topic/drm-misc-2015-10-08' of git://anongit.freedesktop.org/drm-intel...

Another round of drm-misc. Unfortunately the DRM_UNLOCKED removal for
DRIVER_MODESET isn't complete yet for lack of review on 1-2 patches.
Otherwise just various stuff all over.

* tag 'topic/drm-misc-2015-10-08' of git://anongit.freedesktop.org/drm-intel:
  drm: Stop using drm_vblank_count() as the hw frame counter
  drm/irq: Use unsigned int pipe in public API
  drm: Use DRM_ROTATE_MASK and DRM_REFLECT_MASK
  drm: Add DRM_ROTATE_MASK and DRM_REFLECT_MASK
  vga_switcheroo: Add missing locking
  vgaarb: use kzalloc in vga_arbiter_add_pci_device()
  drm: Don't zero vblank timestamps from the irq handler
  drm: Hack around CONFIG_AGP=m build failures
  drm/i915: Remove setparam ioctl
  drm: Remove dummy agp ioctl wrappers
  drm/vmwgfx: Stop checking for DRM_UNLOCKED
  drm/drm_ioctl.c: kerneldoc
  drm: Define a drm_invalid_op ioctl implementation
  drm: Remove __OS_HAS_AGP
  drm/doc: Update docs about device instance setup

diff --cc Documentation/DocBook/drm.tmpl
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
Simple merge

diff --cc drivers/gpu/drm/armada/armada_drv.c
index 3f1396e673dde448c86099c948ab065a27ec28cb,f91a496fcdcb95c7e3ca9009b7f986e06f403dee..63d909e5f63b11e0f6d8d6603898696980fe5983
--- 1/drivers/gpu/drm/armada/armada_drv.c
--- 2/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@@ -148,11 -230,34 +148,11 @@@ static int armada_drm_unload(struct drm
        return 0;
  }
  
 -void armada_drm_vbl_event_add(struct armada_crtc *dcrtc,
 -      struct armada_vbl_event *evt)
 -{
 -      unsigned long flags;
 -
 -      spin_lock_irqsave(&dcrtc->irq_lock, flags);
 -      if (list_empty(&evt->node)) {
 -              list_add_tail(&evt->node, &dcrtc->vbl_list);
 -
 -              drm_vblank_get(dcrtc->crtc.dev, dcrtc->num);
 -      }
 -      spin_unlock_irqrestore(&dcrtc->irq_lock, flags);
 -}
 -
 -void armada_drm_vbl_event_remove(struct armada_crtc *dcrtc,
 -      struct armada_vbl_event *evt)
 -{
 -      if (!list_empty(&evt->node)) {
 -              list_del_init(&evt->node);
 -              drm_vblank_put(dcrtc->crtc.dev, dcrtc->num);
 -      }
 -}
 -
  /* These are called under the vbl_lock. */
- static int armada_drm_enable_vblank(struct drm_device *dev, int crtc)
+ static int armada_drm_enable_vblank(struct drm_device *dev, unsigned int pipe)
  {
        struct armada_private *priv = dev->dev_private;
-       armada_drm_crtc_enable_irq(priv->dcrtc[crtc], VSYNC_IRQ_ENA);
+       armada_drm_crtc_enable_irq(priv->dcrtc[pipe], VSYNC_IRQ_ENA);
        return 0;
  }
  

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_fence.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_irq.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_kms.c
Simple merge