Merge branch 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux into drm-next

Browse source

This is the first radeon and amdgpu pull for drm-next. Highlights include:
- Efficiency improvements to the CS checker for pre-SI asics
- Cursor fixes ported from radeon to amdgpu
- Enable GPU scheduler by default
- Add a bunch of GPUVM debugging options
- Add support for some new atombios opcodes
- Misc cleanups and fixes

* 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux: (42 commits)
  drm/amdgpu: fix lockup when clean pending fences
  drm/amdgpu: add timer to fence to detect scheduler lockup
  drm/amdgpu: add VM CS mapping trace point
  drm/amdgpu: add option to clear VM page tables after every submit
  drm/amdgpu: add option to stop on VM fault
  drm/amdgpu: only print meaningful VM faults
  drm/amdgpu: also trace already allocated VMIDs
  drm/amdgpu: Drop unnecessary #include <linux/vga_switcheroo.h>
  drm/radeon: Drop unnecessary #include <linux/vga_switcheroo.h>
  drm/amdgpu: clean up pageflip interrupt handling
  drm/amdgpu: rework sdma structures
  drm/amdgpu: unpin cursor BOs on suspend and pin them again on resume
  drm/amdgpu/dce8: Fold set_cursor() into show_cursor()
  drm/amdgpu/dce8: Clean up reference counting and pinning of the cursor BOs
  drm/amdgpu/dce8: Move hotspot handling out of set_cursor
  drm/amdgpu/dce8: Re-show the cursor after a modeset (v2)
  drm/amdgpu/dce8: Use cursor_set2 hook for enabling / disabling the HW cursor
  drm/amdgpu/dce11: Fold set_cursor() into show_cursor()
  drm/amdgpu/dce11: Clean up reference counting and pinning of the cursor BOs
  drm/amdgpu/dce11: Move hotspot handling out of set_cursor
  ...

...

This commit is contained in:

Dave Airlie 2015-10-16 09:39:14 +10:00

parent 99a91c9497 2fcef6ec87

commit aa1b36f2bb

37 changed files with 1076 additions and 822 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

29

drivers/gpu/drm/amd/amdgpu/amdgpu.h

View file

1

drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c

View file

4

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c

View file

4

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c

View file

2

drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c

View file

1

drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c

View file

24

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

View file

33

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

View file

16

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

View file

14

drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c

View file

12

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

View file

4

drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h

View file

2

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

View file

4

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

View file

12

drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h

View file

5

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

View file

12

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

View file

53

drivers/gpu/drm/amd/amdgpu/atom.c

View file

2

drivers/gpu/drm/amd/amdgpu/atom.h

View file

130

drivers/gpu/drm/amd/amdgpu/cik_sdma.c

View file

190

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

View file

190

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

View file

190

drivers/gpu/drm/amd/amdgpu/dce_v8_0.c

View file

387

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

View file

48

drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c

View file

44

drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c

View file

156

drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c

View file

164

drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c

View file

43

drivers/gpu/drm/amd/scheduler/gpu_scheduler.c

View file

7

drivers/gpu/drm/amd/scheduler/gpu_scheduler.h

View file

104

drivers/gpu/drm/radeon/evergreen_cs.c

View file

1

drivers/gpu/drm/radeon/radeon_acpi.c

View file

1

drivers/gpu/drm/radeon/radeon_asic.c

View file

2

drivers/gpu/drm/radeon/radeon_atpx_handler.c

View file

1

drivers/gpu/drm/radeon/radeon_bios.c

View file

2

drivers/gpu/drm/radeon/radeon_device.c

View file

2

drivers/gpu/drm/radeon/radeon_kms.c

View file