[pull] radeon and amdgpu drm-next-4.6

Submitted by Alex Deucher on March 3, 2016, 6:15 a.m.

Details

Message ID 1456985734-2799-1-git-send-email-alexander.deucher@amd.com
State New
Headers show

Not browsing as part of any series.

Pull-request download mbox

git pull git://people.freedesktop.org/~agd5f/linux drm-next-4.6

Commit Message

Alex Deucher March 3, 2016, 6:15 a.m.
Hi Dave,

Some more radeon and amdgpu stuff for drm-next.  Mostly just bug fixes
for new features and cleanups.


The following changes since commit d2eaa59000c7717e68a75cf2c106f056d2bc30b4:

  Merge branch 'drm-rockchip-next-2016-02-18' of https://github.com/markyzq/kernel-drm-rockchip into drm-next (2016-02-19 13:10:18 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~agd5f/linux drm-next-4.6

for you to fetch changes up to 6157bd7a1009c2a6944fb3eee8ed2b3dea091fd8:

  drm/amdgpu: fix rb bitmap & cu bitmap calculation (2016-03-03 01:00:20 -0500)

----------------------------------------------------------------
Alex Deucher (3):
      drm/amdgpu/gfx: fix off by one in rb rework (v2)
      drm/radeon: update radeon acpi header
      drm/amdgpu: update radeon acpi header

Christian König (3):
      drm/amdgpu: fix error handling in amdgpu_bo_list_set
      drm/amdgpu: fix VM faults caused by vm_grab_id() v4
      drm/amdgpu: trace the pd_addr in vm_grab_id as well

Dan Carpenter (1):
      drm/amd: cleanup get_mfd_cell_dev()

Flora Cui (1):
      drm/amdgpu: fix rb bitmap & cu bitmap calculation

Geert Uytterhoeven (1):
      drm/amd: Do not make DRM_AMD_ACP default to y

Rex Zhu (1):
      drm/amd/powerplay: fix code style warning.

 drivers/gpu/drm/amd/acp/Kconfig               |   1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu.h           |  16 ++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c       |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c   |   3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c        |   7 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_job.c       |  15 +++-
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h     |  19 +++--
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c        | 116 ++++++++++++++------------
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c         |   2 +-
 drivers/gpu/drm/amd/amdgpu/cikd.h             |   3 -
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c         |  28 +++----
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c         |  22 +++--
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c        |   2 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c        |   2 +-
 drivers/gpu/drm/amd/amdgpu/vid.h              |   2 -
 drivers/gpu/drm/amd/include/amd_acpi.h        |   2 +
 drivers/gpu/drm/amd/powerplay/amd_powerplay.c |   4 +-
 drivers/gpu/drm/radeon/radeon_acpi.h          |   2 +
 18 files changed, 131 insertions(+), 121 deletions(-)

Comments

On 03.03.2016 15:15, Alex Deucher wrote:
> 
> Some more radeon and amdgpu stuff for drm-next.  Mostly just bug fixes
> for new features and cleanups.

Please also include Daniel Vetter's changes switching to drm_vblank_on/off:


https://lists.freedesktop.org/archives/dri-devel/2016-January/099159.html
https://lists.freedesktop.org/archives/dri-devel/2016-January/099160.html (with dce_v8_0.c added)
On Sat, Mar 5, 2016 at 4:35 AM, Michel Dänzer <michel@daenzer.net> wrote:
> On 03.03.2016 15:15, Alex Deucher wrote:
>>
>> Some more radeon and amdgpu stuff for drm-next.  Mostly just bug fixes
>> for new features and cleanups.
>
> Please also include Daniel Vetter's changes switching to drm_vblank_on/off:
>
>
> https://lists.freedesktop.org/archives/dri-devel/2016-January/099159.html
> https://lists.freedesktop.org/archives/dri-devel/2016-January/099160.html (with dce_v8_0.c added)
>

Applied.  thanks!

Alex