[git pull] drm nouveau and radeon fixes.

Dave Airlie airlied at linux.ie
Sun Nov 29 11:54:58 PST 2015


Hi Linus,

just some nouveau and radeon/amdgpu fixes, the nouveau fixes
look large as the firmware context files are regenerated, but
the actual change is quite small.

Dave.

The following changes since commit 78c4a49a69e910a162b05e4e8727b9bdbf948f13:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (2015-11-25 15:11:08 -0800)

are available in the git repository at:

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

for you to fetch changes up to 8c14f72b57570d71afda03c5c51b06f0b4af4367:

  Merge branch 'linux-4.4' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes (2015-11-28 06:50:34 +1000)

----------------------------------------------------------------
Alex Deucher (2):
      drm/radeon: make rv770_set_sw_state failures non-fatal
      drm/radeon: make some dpm errors debug only

Ben Skeggs (8):
      drm/nouveau/pci: enable c800 magic for some unknown Samsung laptop
      drm/nouveau/instmem: protect instobj list with a spinlock
      drm/nouveau/bios: return actual size of the buffer retrieved via _ROM
      drm/nouveau/gr/gf100-: split out per-gpc address calculation macro
      drm/nouveau/gr/gf117-: read NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK from correct GPC
      drm/nouveau/gr/gf117-: assume no PPC if NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK is zero
      drm/nouveau/gr/gf100-: fix oops when calling zbc methods
      drm/nouveau/nvif: allow userspace access to its own client object

Christian König (2):
      drm/amdgpu: optimize scheduler fence handling
      drm/amdgpu: move dependency handling out of atomic section v2

Chunming Zhou (2):
      drm/amdgpu: add mutex for ba_va->valids/invalids
      drm/amdgpu: remove vm->mutex

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

Karol Herbst (1):
      drm/nouveau/pci: enable c800 magic for Clevo P157SM

Leo Liu (3):
      drm/amdgpu: reset vce trap interrupt flag
      drm/amdgpu: vce use multiple cache surface starting from stoney
      drm/amdgpu: adapt vce session create interface changes

Martin Peres (1):
      drm/nouveau/volt/pwm/gk104: fix an off-by-one resulting in the voltage not being set

 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |   3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |   4 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |  14 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c            |  11 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  19 +-
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c              |  24 +-
 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c      | 122 ++++--
 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h      |   5 +-
 drivers/gpu/drm/amd/scheduler/sched_fence.c        |  13 +
 .../gpu/drm/nouveau/include/nvkm/subdev/instmem.h  |   1 +
 drivers/gpu/drm/nouveau/nouveau_acpi.c             |   1 +
 drivers/gpu/drm/nouveau/nouveau_drm.h              |   4 +-
 drivers/gpu/drm/nouveau/nouveau_usif.c             |   5 +-
 drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c   |  16 +-
 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c  |   2 +
 drivers/gpu/drm/nouveau/nvkm/engine/gr/fuc/gpc.fuc |   8 +-
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgf117.fuc3.h | 344 +++++++--------
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk104.fuc3.h | 344 +++++++--------
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk110.fuc3.h | 344 +++++++--------
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgk208.fuc5.h | 308 ++++++-------
 .../drm/nouveau/nvkm/engine/gr/fuc/gpcgm107.fuc5.h | 474 ++++++++++-----------
 drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c     |   6 +-
 drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h     |   1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c |   5 +
 drivers/gpu/drm/nouveau/nvkm/subdev/volt/gk104.c   |   2 +-
 drivers/gpu/drm/radeon/rv730_dpm.c                 |   2 +-
 drivers/gpu/drm/radeon/rv770_dpm.c                 |   4 +-
 27 files changed, 1093 insertions(+), 993 deletions(-)


More information about the dri-devel mailing list