Merge tag 'drm-amdkfd-next-fixes-2015-06-10' of git://people.freedesktop.org/~gabbayo/linux into drm-next

Browse source

- Make the reset wavefronts action be per process per device instead of
  per process, because one device can be stuck but the other one won't be

- Add some missing properties to the CZ device_info structure

- Rename symbols to not have CONFIG_ prefix

- Some more cleanups and debug prints

* tag 'drm-amdkfd-next-fixes-2015-06-10' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: remove not used defines from cik_regs.h
  drm/amdkfd: Add missing properties to CZ device info
  drm/amdkfd: make reset wavefronts per process per device
  drm/amdkfd: add debug print to kfd_events.c
  drm/amdkfd: avoid CONFIG_ prefix for non-Kconfig symbols

...

This commit is contained in:

Dave Airlie 2015-06-12 10:14:20 +10:00

parent 7207d559e4 da73b9fb56

commit 933ea180a4

8 changed files with 53 additions and 185 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

179

drivers/gpu/drm/amd/amdkfd/cik_regs.h

View file

10

drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c

View file

6

drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h

View file

3

drivers/gpu/drm/amd/amdkfd/kfd_device.c

View file

7

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c

View file

4

drivers/gpu/drm/amd/amdkfd/kfd_events.c

View file

10

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

View file

21

drivers/gpu/drm/amd/amdkfd/kfd_process.c

View file