[git,pull] drm fixes

Submitted by Dave Airlie on Feb. 26, 2016, 2:20 a.m.

Details

Message ID alpine.DEB.2.00.1602260216130.32193@skynet.skynet.ie
State New
Headers show

Not browsing as part of any series.

Pull-request download mbox

git pull git://people.freedesktop.org/~airlied/linux drm-fixes

Commit Message

Dave Airlie Feb. 26, 2016, 2:20 a.m.
Hi Linus,

This is a bit larger than Id like, but I asked the Intel guys to pull in 
some Skylake fixes in the possibly vain hope that Skylake might be more 
functional now that I'm seeing production hardware shipping.

For i915, it's mostly the same patch in a few places, making sure the hw
doesn't turn off when we are programming it.

Apart from that are two nouveau fixes, one for a module defer bug, and
one for using nouveau on new Lenovo P50 models.

Then there are a bunch of AMDGPU fixes, one is a fix for v4.4
vblank regressions, and some PM fixes.

Dave.


The following changes since commit 84e54c46b2f440a365a5224f1e5f173a462b7cca:

  Merge tag 'dm-4.5-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm (2016-02-23 19:03:43 -0800)

are available in the git repository at:

  git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to 3772e72720c6bfe1c1fc592ac3d6270559b4ce09:

  Merge branch 'linux-4.5' of git://github.com/skeggsb/linux into drm-fixes (2016-02-25 13:17:50 +1000)

----------------------------------------------------------------
Alex Deucher (5):
      drm/amdgpu/gfx8: fix priv reg interrupt enable
      drm/amdgpu: fix locking in force performance level
      drm/amdgpu/pm: add some checks for PX
      drm/amdgpu/pm: adjust display configuration after powerstate
      drm/radeon/pm: adjust display configuration after powerstate

Ben Skeggs (1):
      drm/nouveau/disp/dp: ensure sink is powered up before attempting link training

Bradley Pankow (1):
      amdgpu: fix NULL pointer dereference at tonga_check_states_equal

Christian K├Ânig (1):
      drm/amdgpu: disable direct VM updates when vm_debug is set

Dave Airlie (3):
      Merge branch 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
      Merge tag 'drm-intel-fixes-2016-02-22' of git://anongit.freedesktop.org/drm-intel into drm-fixes
      Merge branch 'linux-4.5' of git://github.com/skeggsb/linux into drm-fixes

Imre Deak (13):
      drm/i915: Add helper to get a display power ref if it was already enabled
      drm/i915: Ensure the HW is powered during display pipe HW readout
      drm/i915/ibx: Ensure the HW is powered during PLL HW readout
      drm/i915: Ensure the HW is powered when disabling VGA
      drm/i915: Ensure the HW is powered during HW access in assert_pipe
      drm/i915/crt: Ensure the HW is powered during HW state readout
      drm/i915/ddi: Ensure the HW is powered during HW state readout
      drm/i915: Ensure the HW is powered when accessing the CRC HW block
      drm/i915/dp: Ensure the HW is powered during HW state readout
      drm/i915/dsi: Ensure the HW is powered during HW state readout
      drm/i915/hdmi: Ensure the HW is powered during HW state readout
      drm/i915/lvds: Ensure the HW is powered during HW state readout
      drm/i915/skl: Ensure HW is powered during DDB HW state readout

Mario Kleiner (2):
      drm/radeon: Don't hang in radeon_flip_work_func on disabled crtc. (v2)
      drm/amdgpu: Don't hang in amdgpu_flip_work_func on disabled crtc.

Mika Kuoppala (1):
      drm/i915/gen9: Verify and enforce dc6 state writes

Patrik Jakobsson (1):
      drm/i915/gen9: Check for DC state mismatch

Thierry Reding (1):
      drm/nouveau: platform: Fix deferred probe

 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |  18 ++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |   3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c             |  29 +++-
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              |   2 +-
 drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c  |   4 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  28 +++-
 drivers/gpu/drm/i915/i915_drv.h                    |   1 +
 drivers/gpu/drm/i915/intel_crt.c                   |  13 +-
 drivers/gpu/drm/i915/intel_csr.c                   |   2 +
 drivers/gpu/drm/i915/intel_ddi.c                   | 112 +++++++++++-----
 drivers/gpu/drm/i915/intel_display.c               |  86 ++++++++----
 drivers/gpu/drm/i915/intel_dp.c                    |  18 ++-
 drivers/gpu/drm/i915/intel_drv.h                   |   3 +
 drivers/gpu/drm/i915/intel_dsi.c                   |  13 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |  14 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |  14 +-
 drivers/gpu/drm/i915/intel_pm.c                    |   7 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            | 149 +++++++++++++++++++--
 drivers/gpu/drm/nouveau/nouveau_platform.c         |   2 +-
 drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c |  40 ++++--
 drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c   |  10 ++
 drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.h   |   6 +
 drivers/gpu/drm/radeon/radeon_display.c            |  17 ++-
 drivers/gpu/drm/radeon/radeon_pm.c                 |   5 +-
 24 files changed, 475 insertions(+), 121 deletions(-)

Comments

On Thu, Feb 25, 2016 at 6:20 PM, Dave Airlie <airlied@linux.ie> wrote:
>
> This is a bit larger than Id like, but I asked the Intel guys to pull in
> some Skylake fixes in the possibly vain hope that Skylake might be more
> functional now that I'm seeing production hardware shipping.
>
> For i915, it's mostly the same patch in a few places, making sure the hw
> doesn't turn off when we are programming it.
>
> Apart from that are two nouveau fixes, one for a module defer bug, and
> one for using nouveau on new Lenovo P50 models.
>
> Then there are a bunch of AMDGPU fixes, one is a fix for v4.4
> vblank regressions, and some PM fixes.

Ok, pulled.

But I have to ask: what the hell have you done to the _real_ Dave Airlie?

I'm seeing sentences with proper capitalization. I'm even seeing
paragraph breaks. I didn't do a single edit on your pull request
message when using it to make the merge commit log.

If somebody is holding a gun to your head, blink once.

             Linus
On 26 February 2016 at 13:04, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Thu, Feb 25, 2016 at 6:20 PM, Dave Airlie <airlied@linux.ie> wrote:
>>
>> This is a bit larger than Id like, but I asked the Intel guys to pull in
>> some Skylake fixes in the possibly vain hope that Skylake might be more
>> functional now that I'm seeing production hardware shipping.
>>
>> For i915, it's mostly the same patch in a few places, making sure the hw
>> doesn't turn off when we are programming it.
>>
>> Apart from that are two nouveau fixes, one for a module defer bug, and
>> one for using nouveau on new Lenovo P50 models.
>>
>> Then there are a bunch of AMDGPU fixes, one is a fix for v4.4
>> vblank regressions, and some PM fixes.
>
> Ok, pulled.
>
> But I have to ask: what the hell have you done to the _real_ Dave Airlie?
>
> I'm seeing sentences with proper capitalization. I'm even seeing
> paragraph breaks. I didn't do a single edit on your pull request
> message when using it to make the merge commit log.
>
> If somebody is holding a gun to your head, blink once.

<blink>.

Oh wait, that's a baby. It's possible a lack of sleep has made me more careful
in my pull request writing. As the year tends towards Kernel Summit I'll make
sure to tend towards less editing, so you have something to complain about.
Unless someone breaks userspace and tries to weasel out of it before then.

Dave.