Merge branch 'amdkfd-next-3.19' of git://people.freedesktop.org/~gabbayo/linux into drm-next

Browse source

- Fixes for sparse warnings
- Memory leak fixes
- Fix for deadlock between amdkfd and iommu

* 'amdkfd-next-3.19' of git://people.freedesktop.org/~gabbayo/linux:
  amdkfd: delete some dead code
  amdkfd: Fix memory leak of mqds on dqm fini
  amdkfd: fix an error handling bug in pqm_create_queue()
  amdkfd: fix some error handling in ioctl
  amdkfd: Remove DRM_AMDGPU dependency from Kconfig
  amdkfd: explicitely include io.h in kfd_doorbell.c
  amdkfd: Clear ctx cb before suspend
  amdkfd: Instead of using get function, use container_of
  amdkfd: use schedule() in sync_with_hw
  amdkfd: Fix memory leak on process deregistration
  amdkfd: add __iomem attribute to doorbell_ptr
  amdkfd: fence_wait_timeout() can be static
  amdkfd: is_occupied() can be static
  amdkfd: Fix sparse warnings in kfd_flat_memory.c
  amdkfd: pqm_get_kernel_queue() can be static
  amdkfd: test_kq() can be static
  amdkfd: Fix sparse warnings in kfd_topology.c
  amdkfd: Fix sparse warnings in kfd_chardev.c

...

This commit is contained in:

Dave Airlie 2014-11-27 08:28:22 +10:00

parent e38648f95d 9cf4a28131

commit 33f86ff62c

12 changed files with 76 additions and 64 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

2

drivers/gpu/drm/amd/amdkfd/Kconfig

View file

20

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

View file

1

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

View file

31

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

View file

1

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

View file

11

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

View file

14

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

View file

6

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

View file

4

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

View file

5

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

View file

5

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

View file

40

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

View file