[git pull] drm radeon and nouveau fixes

[git pull] drm radeon and nouveau fixes

[Dave Airlie]

Hi Linus,

This is just a set of nouveau and radeon fixes, the nouveau ones fix some 
suspend/resume regressions since use of copy engines and some fixes for Z 
compression on some newer chipsets.

I've got another pull request for some new AMD radeon hw that shouldn't 
touch any existing hw support that I'll send after this, its based on this 
one, so pulling it will get this + that.

Dave.

The following changes since commit e9ced8e040ebe40e9953db90acbe7d0b58702ebb:

  drm/radeon: restore nomodeset operation (v2) (2013-05-17 11:47:07 +1000)

are available in the git repository at:

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

for you to fetch changes up to a3f6902672c9fa3868722ef6ab8a7dd9141def6a:

  Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-next (2013-05-21 09:41:33 +1000)

----------------------------------------------------------------

Alex Deucher (1):
      drm/radeon/dce2: use 10khz units for audio dto calculation

Ben Skeggs (9):
      drm/nouveau/bios: fix thinko in ZM_MASK_ADD opcode
      drm/nvc0/ce: disable ce1 on a number of chipsets
      drm/nvc0/ltcg: fix handling of disabled partitions
      drm/nve0/ltcg: poke the partition count into yet another register
      drm/nve0/fifo: prevent races between clients updating playlists
      drm/nvc0/fifo: prevent races between clients updating playlists
      drm/nvc0/fifo: prevent CHAN_TABLE_ERROR:CHANNEL_PENDING on fifo fini
      drm/nv50/fifo: prevent races between clients updating playlists
      drm/nouveau: ensure channels are stopped before saving fences for suspend

Dave Airlie (3):
      drm/nouveau: fix build with nv50->nvc0
      Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next
      Merge branch 'drm-fixes-3.10' of git://people.freedesktop.org/~agd5f/linux into drm-next

Niels Ole Salscheider (2):
      drm/radeon: Remove superfluous variable
      drm/radeon: Fix VRAM size calculation for VRAM >= 4GB

 drivers/gpu/drm/nouveau/core/engine/device/nvc0.c |  2 --
 drivers/gpu/drm/nouveau/core/engine/fifo/nv50.c   |  2 ++
 drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c   | 10 +++++++++
 drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c   |  3 +++
 drivers/gpu/drm/nouveau/core/subdev/bios/init.c   |  4 ++--
 drivers/gpu/drm/nouveau/core/subdev/ltcg/nvc0.c   | 17 ++++++++-------
 drivers/gpu/drm/nouveau/nouveau_drm.c             | 25 ++++++++++++++++++-----
 drivers/gpu/drm/radeon/atombios_crtc.c            |  6 ------
 drivers/gpu/drm/radeon/evergreen.c                |  4 ++--
 drivers/gpu/drm/radeon/evergreen_hdmi.c           |  7 +++----
 drivers/gpu/drm/radeon/r600_hdmi.c                |  9 ++++----
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c       |  4 ----
 drivers/gpu/drm/radeon/radeon_mode.h              |  1 -
 drivers/gpu/drm/radeon/radeon_ttm.c               |  2 +-
 drivers/gpu/drm/radeon/si.c                       |  4 ++--
 15 files changed, 59 insertions(+), 41 deletions(-)

[git pull] drm radeon and nouveau fixes

[Dave Airlie]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 2532 bytes --]


Hi Linus,

Fixes for the other big two, the radeon VCE one is large but it fixes some 
userspace triggerable issues, otherwise its blackscreens and oopses,

nouveau fixes a bleeding laptop panel issue when displayport is used 
sometimes,

Dave.

The following changes since commit 4b660a7f5c8099d88d1a43d8ae138965112592c7:

  Linux 3.15-rc6 (2014-05-22 06:42:02 +0900)

are available in the git repository at:

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

for you to fetch changes up to 77c01bef72a5ce5cb24adae6066ed81a52004d30:

  Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes (2014-05-22 09:15:57 +1000)

----------------------------------------------------------------

Alex Deucher (4):
      drm/radeon: fix DCE83 check for mullins
      drm/radeon: handle non-VGA class pci devices with ATRM
      drm/radeon: fix register typo on si
      drm/radeon/pm: don't allow debugfs/sysfs access when PX card is off (v2)

Ben Skeggs (1):
      drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup

Christian König (4):
      drm/radeon: also try GART for CPU accessed buffers
      drm/radeon: fix page directory update size estimation
      drm/radeon: fix buffer placement under memory pressure v2
      drm/radeon: fix typo in finding PLL params

Dave Airlie (2):
      Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
      Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes

Jérôme Glisse (1):
      drm/radeon: avoid segfault on device open when accel is not working.

Leo Liu (1):
      drm/radeon: check VCE relocation buffer range v3

Martin Peres (1):
      drm/nvd9/therm: handle another kind of PWM fan

 drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c  |   2 +-
 drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c |   1 +
 drivers/gpu/drm/radeon/radeon.h                  |   6 +-
 drivers/gpu/drm/radeon/radeon_bios.c             |  14 +++
 drivers/gpu/drm/radeon/radeon_display.c          |   2 +-
 drivers/gpu/drm/radeon/radeon_kms.c              |  55 +++++-----
 drivers/gpu/drm/radeon/radeon_object.c           |  40 ++++---
 drivers/gpu/drm/radeon/radeon_pm.c               |  42 +++++++-
 drivers/gpu/drm/radeon/radeon_vce.c              | 130 +++++++++++++++++------
 drivers/gpu/drm/radeon/radeon_vm.c               |   2 +-
 drivers/gpu/drm/radeon/sid.h                     |   4 +-
 11 files changed, 218 insertions(+), 80 deletions(-)

Re: [git pull] drm radeon and nouveau fixes

[Ed Tomlinson]

On Thursday 22 May 2014 04:13:22 Dave Airlie wrote:
> 
> Hi Linus,
> 
> Fixes for the other big two, the radeon VCE one is large but it fixes some 
> userspace triggerable issues, otherwise its blackscreens and oopses,
> 
> nouveau fixes a bleeding laptop panel issue when displayport is used 
> sometimes,

Hi Dave,

These are not breaking anything here.  I also have v4 of Christian König's 
VRAM page table entry compression patch applied.  Its also good here and
speeds things up a few percent.

Thanks
Ed Tomlinson

> The following changes since commit 4b660a7f5c8099d88d1a43d8ae138965112592c7:
> 
>   Linux 3.15-rc6 (2014-05-22 06:42:02 +0900)
> 
> are available in the git repository at:
> 
>   git://people.freedesktop.org/~airlied/linux drm-fixes
> 
> for you to fetch changes up to 77c01bef72a5ce5cb24adae6066ed81a52004d30:
> 
>   Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes (2014-05-22 09:15:57 +1000)
> 
> ----------------------------------------------------------------
> 
> Alex Deucher (4):
>       drm/radeon: fix DCE83 check for mullins
>       drm/radeon: handle non-VGA class pci devices with ATRM
>       drm/radeon: fix register typo on si
>       drm/radeon/pm: don't allow debugfs/sysfs access when PX card is off (v2)
> 
> Ben Skeggs (1):
>       drm/gf119-/disp: fix nasty bug which can clobber SOR0's clock setup
> 
> Christian König (4):
>       drm/radeon: also try GART for CPU accessed buffers
>       drm/radeon: fix page directory update size estimation
>       drm/radeon: fix buffer placement under memory pressure v2
>       drm/radeon: fix typo in finding PLL params
> 
> Dave Airlie (2):
>       Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
>       Merge branch 'drm-fixes-3.15' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes
> 
> Jérôme Glisse (1):
>       drm/radeon: avoid segfault on device open when accel is not working.
> 
> Leo Liu (1):
>       drm/radeon: check VCE relocation buffer range v3
> 
> Martin Peres (1):
>       drm/nvd9/therm: handle another kind of PWM fan
> 
>  drivers/gpu/drm/nouveau/core/engine/disp/nvd0.c  |   2 +-
>  drivers/gpu/drm/nouveau/core/subdev/therm/nvd0.c |   1 +
>  drivers/gpu/drm/radeon/radeon.h                  |   6 +-
>  drivers/gpu/drm/radeon/radeon_bios.c             |  14 +++
>  drivers/gpu/drm/radeon/radeon_display.c          |   2 +-
>  drivers/gpu/drm/radeon/radeon_kms.c              |  55 +++++-----
>  drivers/gpu/drm/radeon/radeon_object.c           |  40 ++++---
>  drivers/gpu/drm/radeon/radeon_pm.c               |  42 +++++++-
>  drivers/gpu/drm/radeon/radeon_vce.c              | 130 +++++++++++++++++------
>  drivers/gpu/drm/radeon/radeon_vm.c               |   2 +-
>  drivers/gpu/drm/radeon/sid.h                     |   4 +-
>  11 files changed, 218 insertions(+), 80 deletions(-)