From: Dave Airlie <airlied@redhat.com>
Date: Tue, 2 Jun 2015 08:10:50 +0000 (+1000)
Subject: Merge tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm... 
X-Git-Tag: v4.13~4907^2~43
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3e8d222f2a95e9d30f13107bf4e48778f79e73b8;p=mirror_ubuntu-bionic-kernel.git

Merge tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm-intel into drm-next

Fixes for 4.2. Nothing too serious (given that it's still pre merge
window). With that it's off for 2 weeks of vacation for me and taking care
of 4.2 fixes for Jani.

* tag 'drm-intel-next-fixes-2015-05-29' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: limit PPGTT size to 2GB in 32-bit platforms
  drm/i915: Another fbdev hack to avoid PSR on fbcon.
  drm/i915: Return the frontbuffer flip to enable intel_crtc_enable_planes.
  drm/i915: disable IPS while getting the sink CRCs
  drm/i915: Disable 12bpc hdmi for now
  drm/i915: Adjust sideband locking a bit for CHV/VLV
  drm/i915: s/dpio_lock/sb_lock/
  drm/i915: Kill intel_flush_primary_plane()
  drm/i915: Throw out WIP CHV power well definitions
  drm/i915: Use the default 600ns LDO programming sequence delay
  drm/i915: Remove unnecessary null check in execlists_context_unqueue
  drm/i915: Use spinlocks for checking when to waitboost
  drm/i915: Fix the confusing comment about the ioctl limits
  Revert "drm/i915: Force clean compilation with -Werror"
---

3e8d222f2a95e9d30f13107bf4e48778f79e73b8