[git pull] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

This is amdkfd's pull request for kernel 4.13. It contains a fix to a function
which returned an incorrect error value and another spelling fix

Thanks,
Oded

The following changes since commit 047b8e21e3bfa9faa4ed9a0c337fe0c687710251:

  Merge tag 'drm-misc-next-2017-06-19_0' of 
git://anongit.freedesktop.org/git/drm-misc into drm-next (2017-06-21 08:57:34 
+1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2017-06-25

for you to fetch changes up to 7a10d63f02e0bb4f31d452e6ba0f4d46c1f8791d:

  drm/amdkfd: Spelling s/apreture/aperture/ (2017-06-01 12:28:38 +0200)


Dan Carpenter (1):
  drm/amdkfd: NULL dereference involving create_process()

Geert Uytterhoeven (1):
  drm/amdkfd: Spelling s/apreture/aperture/

 drivers/gpu/drm/amd/amdkfd/kfd_process.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

Pull request for amdkfd.
Just two patches for 4.11 merge window:
- A small fix to return value of function in case of error
- A spelling mistake

Thanks,

   Oded

The following changes since commit 282d0a35c8c42c3ac4dd86a7e408ed1b30db4897:

  Merge tag 'drm-misc-next-2017-01-09' of 
git://anongit.freedesktop.org/git/drm-misc into drm-next (2017-01-10 08:06:56 
+1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2017-01-16

for you to fetch changes up to 8bf793883da213864efc50c274d2b38ec0ca58b2:

  drm/amdkfd: fix improper return value on error (2017-01-16 17:34:47 +0200)


Colin Ian King (1):
  amdkfd: fix spelling mistake in kfd_ioctl_dbg_unrgesiter

Pan Bian (1):
  drm/amdkfd: fix improper return value on error

 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +++---
 drivers/gpu/drm/amd/amdkfd/kfd_events.c  | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,
Just wanted to make sure this pull request hasn't got lost in the mail.

Thanks,
  Oded

On Mon, Sep 19, 2016 at 10:49 PM, Oded Gabbay  wrote:
> Hi Dave,
>
> This is amdkfd's pull request for kernel 4.9. It contains a fix to a possible
> infinite loop bug and a couple of other minor "cleaning" patches.
>
> Thanks,
> Oded
>
> The following changes since commit 9f8cf165c62913244479832f04c44cd77ffc9293:
>
>   Merge tag 'topic/drm-misc-2016-09-19' of 
> git://anongit.freedesktop.org/drm-intel into drm-next (2016-09-19 17:16:02 
> +1000)
>
> are available in the git repository at:
>
>   git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2016-09-19
>
> for you to fetch changes up to e88a614c403573e861f82c063d8aee25cf109f17:
>
>   drm/amdkfd: Pass 'struct queue_propertices' by reference (2016-09-19 
> 20:58:35 +0300)
>
> 
> Edward O'Callaghan (6):
>   drm/amdkfd: Tidy up kfd_generate_gpu_id() uint64_t bitshift unpack
>   drm/amdkfd: Add some missing memset zero'ing in queue init func
>   drm/amdkfd: Reuse function to find a process through pasid
>   drm/amdkfd: Fix possible infinite loop
>   drm/amdkfd: Unify multiple calls to pr_debug() into one
>   drm/amdkfd: Pass 'struct queue_propertices' by reference
>
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c  | 17 +++---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c  | 17 +++---
>  drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c  | 16 +++---
>  drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c  |  5 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_priv.h  |  2 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_process.c   | 61 
> +-
>  .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |  2 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_queue.c |  4 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_topology.c  |  8 +--
>  9 files changed, 65 insertions(+), 67 deletions(-)

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

This is amdkfd's pull request for kernel 4.9. It contains a fix to a possible
infinite loop bug and a couple of other minor "cleaning" patches.

Thanks,
Oded

The following changes since commit 9f8cf165c62913244479832f04c44cd77ffc9293:

  Merge tag 'topic/drm-misc-2016-09-19' of 
git://anongit.freedesktop.org/drm-intel into drm-next (2016-09-19 17:16:02 
+1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2016-09-19

for you to fetch changes up to e88a614c403573e861f82c063d8aee25cf109f17:

  drm/amdkfd: Pass 'struct queue_propertices' by reference (2016-09-19 20:58:35 
+0300)


Edward O'Callaghan (6):
  drm/amdkfd: Tidy up kfd_generate_gpu_id() uint64_t bitshift unpack
  drm/amdkfd: Add some missing memset zero'ing in queue init func
  drm/amdkfd: Reuse function to find a process through pasid
  drm/amdkfd: Fix possible infinite loop
  drm/amdkfd: Unify multiple calls to pr_debug() into one
  drm/amdkfd: Pass 'struct queue_propertices' by reference

 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c  | 17 +++---
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c  | 17 +++---
 drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c  | 16 +++---
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c  |  5 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h  |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c   | 61 +-
 .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_queue.c |  4 +-
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c  |  8 +--
 9 files changed, 65 insertions(+), 67 deletions(-)

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

A few amdkfd patches for 4.8. One patch replaces deprecated kernel api call 
(create_workqueue) and the other patch properly cleans up resources in case of 
failing to create a process object.

Thanks,

   Oded

The following changes since commit dac2c48ca5ac9bb2d6339aaa733c60d5b801ee86:

  Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into 
drm-next (2016-07-02 16:21:35 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2016-07-03

for you to fetch changes up to 7fd5e03ca6b41a591bd9fda083362b8a07cfb5f7:

  drm/amdkfd: destroy mutex if process creation fails (2016-07-03 08:05:45 
+0300)


Bhaktipriya Shridhar (1):
  drm/amdkfd: Remove create_workqueue()

Oded Gabbay (1):
  drm/amdkfd: destroy mutex if process creation fails

 drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

Here are a few amdkfd patches for 4.7, all of them fixes according to 
the Coccinelle tool.

Thanks,

Oded

The following changes since commit b89359bdf0f1e95a4c5f92300594ba9dde323fc4:

  Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into 
drm-next (2016-04-29 14:57:51 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2016-05-04

for you to fetch changes up to eb026024c24bbeb18e08d973e950f76c0d97a3c0:

  amdkfd: Trim unnescessary intermediate err var in kfd_chardev.c (2016-05-01 
00:06:29 +1000)


Edward O'Callaghan (3):
  amdkfd: Use the canonical form in branch predicates
  amdkfd: Trim off unnescessary semicolon from kfd_packet_manager.c
  amdkfd: Trim unnescessary intermediate err var in kfd_chardev.c

 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c  |  5 ++---
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +-
 drivers/gpu/drm/amd/amdkfd/kfd_events.c   |  4 ++--
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c |  2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c   | 12 ++--
 5 files changed, 16 insertions(+), 17 deletions(-)

[PULL] drm-amdkfd-next-fixes

[Oded Gabbay]

Hi Dave,

Just a small fix for uninitialized variable. Hoping you could squeeze it into 
the merge window's pull request, but -rc2 is perfectly fine as well.

Thanks,

Oded

The following changes since commit 211afd577a186e18d3eece543c6767420d6f6737:

  Merge tag 'drm-vc4-next-2016-03-14' of github.com:anholt/linux into drm-next 
(2016-03-15 09:49:19 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux 
tags/drm-amdkfd-next-fixes-2016-03-15

for you to fetch changes up to 93fce954427effee89e44a976299b15dd75b4bbc:

  drm/amdkfd: uninitialized variable in dbgdev_wave_control_set_registers() 
(2016-03-15 14:09:37 +0200)


Dan Carpenter (1):
  drm/amdkfd: uninitialized variable in dbgdev_wave_control_set_registers()

 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

Here are a few amdkfd patches for 4.6.
These patches defer radeon/amdgpu loading in case amdkfd is not yet loaded,
by returning -EPROBE_DEFER during their probing stage.

Thanks,

Oded

The following changes since commit 44ab4042178bd596275927ea050980aa4257581b:

  Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into 
drm-next (2016-02-26 13:02:57 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2016-02-27

for you to fetch changes up to efb1c6582e5cd291a6b9e6dde55fd31ce6f606a1:

  drm/amdgpu: Return -EPROBE_DEFER when amdkfd not loaded (2016-02-27 22:52:40 
+0200)


Oded Gabbay (3):
  drm/amdkfd: Track when module's init is complete
  drm/radeon: Return -EPROBE_DEFER when amdkfd not loaded
  drm/amdgpu: Return -EPROBE_DEFER when amdkfd not loaded

 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c  | 57 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h  |  2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 -
 drivers/gpu/drm/amd/amdkfd/kfd_module.c | 15 +--
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h |  2 +-
 drivers/gpu/drm/radeon/radeon_drv.c | 10 -
 drivers/gpu/drm/radeon/radeon_kfd.c | 25 ++-
 drivers/gpu/drm/radeon/radeon_kfd.h |  2 +-
 8 files changed, 64 insertions(+), 59 deletions(-)

[PULL] drm-amdkfd-next-fixes

[Oded Gabbay]

Hi Dave,

Just one small fix before 4.3 merge window:

- Use linux/mman.h instead of uapi's mman-common.h inside the driver.

Thanks,

Oded

The following changes since commit 92cffd56b21c825579f3b37bc7803e4c37073076:

  drm/nouveau/dispnv04: fix build on powerpc (2015-08-28 20:33:58 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux 
tags/drm-amdkfd-next-fixes-2015-08-30

for you to fetch changes up to 2497ee721524be80a7690dac0956d04c0ee954f0:

  amdkfd: use  instead of  
(2015-08-30 12:36:58 +0300)


Christoph Hellwig (1):
  amdkfd: use  instead of 

 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[PULL] drm-amdkfd-next-fixes

[Daniel Vetter]

On Wed, Aug 05, 2015 at 10:49:57AM +0300, Oded Gabbay wrote:
> On Wed, Aug 5, 2015 at 10:48 AM, Daniel Vetter  wrote:
> > Forwarding -fixes pull to Linus since Dave is on vacation for 2 weeks.
> > -Daniel
> >
> 
> Daniel,
> This is for 4.3 merge window...
> This is not for 4.2-rcX
> I don't think we need to forward this to Linus.

Oh right totally didn't read the subject correctly. Sorry for the noise
everyone.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

[PULL] drm-amdkfd-next-fixes

[Oded Gabbay]

On Wed, Aug 5, 2015 at 10:48 AM, Daniel Vetter  wrote:
> Forwarding -fixes pull to Linus since Dave is on vacation for 2 weeks.
> -Daniel
>

Daniel,
This is for 4.3 merge window...
This is not for 4.2-rcX
I don't think we need to forward this to Linus.

  Oded

[PULL] drm-amdkfd-next-fixes

[Oded Gabbay]

Hi Dave,

Two small bug fixes for the code you pulled for 4.3:

- Used a SHIFT define instead of a MASK define to check if a bit is turned on
  when destroying hqd. Luckily, this is in gfx7 interface file with amdgpu, 
  which was used only for bring-up purposes of amdgpu, so no real effect on 
  a running system

- Used a logical AND instead of a bitwise AND operator, when initializing 
  sdma virtual memory when using SDMA queues

Thanks,

  Oded

The following changes since commit dcd14dd957f02ef679c61325a2221a0574bdcab3:

  Merge tag 'topic/connector-locking-2015-07-23' of 
git://anongit.freedesktop.org/drm-intel into drm-next (2015-07-24 14:30:29 
+1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux 
tags/drm-amdkfd-next-fixes-2015-08-05

for you to fetch changes up to a63c580a5271b61f12cf91e768120e33792e2907:

  drm/amdkfd: fix bug when initializing sdma vm (2015-07-30 09:26:15 +0300)


Oded Gabbay (2):
  drm/amdgpu: fix bug when amdkfd destroys hqd
  drm/amdkfd: fix bug when initializing sdma vm

 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_vi.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

[PULL] drm-amdkfd-next-fixes

[Daniel Vetter]

Forwarding -fixes pull to Linus since Dave is on vacation for 2 weeks.
-Daniel

On Wed, Aug 05, 2015 at 10:05:00AM +0300, Oded Gabbay wrote:
> Hi Dave,
> 
> Two small bug fixes for the code you pulled for 4.3:
> 
> - Used a SHIFT define instead of a MASK define to check if a bit is turned on
>   when destroying hqd. Luckily, this is in gfx7 interface file with amdgpu, 
>   which was used only for bring-up purposes of amdgpu, so no real effect on 
>   a running system
> 
> - Used a logical AND instead of a bitwise AND operator, when initializing 
>   sdma virtual memory when using SDMA queues
> 
> Thanks,
> 
>   Oded
> 
> The following changes since commit dcd14dd957f02ef679c61325a2221a0574bdcab3:
> 
>   Merge tag 'topic/connector-locking-2015-07-23' of 
> git://anongit.freedesktop.org/drm-intel into drm-next (2015-07-24 14:30:29 
> +1000)
> 
> are available in the git repository at:
> 
>   git://people.freedesktop.org/~gabbayo/linux 
> tags/drm-amdkfd-next-fixes-2015-08-05
> 
> for you to fetch changes up to a63c580a5271b61f12cf91e768120e33792e2907:
> 
>   drm/amdkfd: fix bug when initializing sdma vm (2015-07-30 09:26:15 +0300)
> 
> 
> Oded Gabbay (2):
>   drm/amdgpu: fix bug when amdkfd destroys hqd
>   drm/amdkfd: fix bug when initializing sdma vm
> 
>  drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 2 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_vi.c  | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

This is amdkfd's pull request for kernel 4.3.

drm-amdkfd-next-2015-07-20:

- Add Carrizo support for amdkfd, using the new amdgpu driver as the relevant
  kgd. The support includes interfaces with amdgpu both for gfx7 (Kaveri) and
  gfx8 (Carrizo). However, gfx7 interface is used for debugging purposes only,
  so amdkfd defaults to using radeon when Kaveri is installed.

I would like to note that no new IOCTLs are being introduced, and there is no 
change in the current IOCTLs, as they are suited both for gfx7 and gfx8.

Thanks,

Oded

The following changes since commit 52721d9d3334c1cb1f76219a161084094ec634dc:

  Linux 4.2-rc3 (2015-07-19 14:45:02 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2015-07-20

for you to fetch changes up to 7639a8c420f04ca9be87974416efb2848b0962d9:

  drm/amdkfd: Set correct doorbell packet type for Carrizo (2015-07-20 09:16:49 
+0300)


Ben Goz (8):
  drm/amdgpu: Add amdgpu <--> amdkfd gfx8 interface
  drm/amdkfd: add supported CZ devices PCI IDs to amdkfd
  drm/amdkfd: add CP HWS packet headers for VI
  drm/amdkfd: add support for VI in MQD manager
  drm/amdkfd: Add support for VI in DQM
  drm/amdkfd: fix runlist length calculation
  drm/amdkfd: Implement create_map_queues() for Carrizo
  drm/amdkfd: Set correct doorbell packet type for Carrizo

Oded Gabbay (5):
  drm/radeon: Modify kgd_engine_type enum to match CZ
  drm/amdgpu: Add H/W agnostic amdgpu <--> amdkfd interface
  drm/amdgpu: add amdgpu <--> amdkfd gfx7 interface
  drm/amdkfd: Add dependency of DRM_AMDGPU to Kconfig
  drm/amdkfd: Use generic defines in new amd headers

 MAINTAINERS|   5 +
 drivers/gpu/drm/amd/amdgpu/Makefile|   6 +
 drivers/gpu/drm/amd/amdgpu/amdgpu.h|   3 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 267 
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h |  65 ++
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c  | 670 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c  | 543 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c|   5 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c |   7 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c|   7 +
 drivers/gpu/drm/amd/amdgpu/cik.c   |  11 +-
 drivers/gpu/drm/amd/amdgpu/cikd.h  |   6 +
 drivers/gpu/drm/amd/amdgpu/vid.h   |   5 +
 drivers/gpu/drm/amd/amdkfd/Kconfig |   2 +-
 drivers/gpu/drm/amd/amdkfd/Makefile|   3 +-
 drivers/gpu/drm/amd/amdkfd/cik_regs.h  |  11 -
 drivers/gpu/drm/amd/amdkfd/kfd_device.c|   7 +-
 .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c  |  12 +-
 .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c   | 103 +++-
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c   |  20 +-
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c| 249 +++-
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c|  99 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h| 398 
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c  |   5 +
 drivers/gpu/drm/amd/amdkfd/kfd_topology.h  |   1 +
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h|   3 +-
 drivers/gpu/drm/amd/include/vi_structs.h   | 417 +
 drivers/gpu/drm/radeon/radeon_kfd.c|   3 +-
 28 files changed, 2893 insertions(+), 40 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
 create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h
 create mode 100644 drivers/gpu/drm/amd/include/vi_structs.h

[PULL] drm-amdkfd-next-fixes

[Oded Gabbay]

Hi Dave,

A few fixes to the two pull requests you merged for 4.2:

- 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

Thanks,

Oded

The following changes since commit ae45577324d1f749c907840247d443696ac3bc7a:

  virtgpu: include linux/types.h to avoid warning. (2015-06-05 12:31:12 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux 
tags/drm-amdkfd-next-fixes-2015-06-10

for you to fetch changes up to da73b9fb56c14c6d537738e891906006a7960535:

  drm/amdkfd: remove not used defines from cik_regs.h (2015-06-06 22:26:47 
+0300)


Ben Goz (1):
  drm/amdkfd: make reset wavefronts per process per device

Oded Gabbay (3):
  drm/amdkfd: add debug print to kfd_events.c
  drm/amdkfd: Add missing properties to CZ device info
  drm/amdkfd: remove not used defines from cik_regs.h

Valentin Rothberg (1):
  drm/amdkfd: avoid CONFIG_ prefix for non-Kconfig symbols

 drivers/gpu/drm/amd/amdkfd/cik_regs.h  | 177 ++---
 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c|  10 +-
 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h|   6 +-
 drivers/gpu/drm/amd/amdkfd/kfd_device.c|   3 +
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |   7 +-
 drivers/gpu/drm/amd/amdkfd/kfd_events.c|   4 +
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h  |  10 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c   |  21 ++-
 8 files changed, 53 insertions(+), 185 deletions(-)

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

Another pull request of amdkfd for 4.2

drm-amdkfd-next-2015-06-01:

- Add the H/W debugger support module, including new IOCTLs to:
  - register/unregister a process as a debugged process
  - Set address watch-point in the debugged process's GPU kernel
  - Do a wave control operation in the debugged process's waves
  See the commit messages for more details on the available operations.

  The debugged process can only perform debug operation on itself. It is
  blocked by the amdkfd+H/W from performing operations on other processes's 
  waves or GPU kernels. The blocking is done by setting the VMID and PASID of
  the debugged process in the packets that are sent to the CP with the debug
  instructions.

- Add support for static user-mode queues. These queues are regular queues, 
  but because they belong to the debugged process, we need to make sure the CP
  doesn't preempt them during a debug operation. Therefore, we mark them as
  static for the CP ignore them during preemption.

- Support killing all the waves when a process is terminated. This is needed
  in case a process is terminated but we can't UNMAP its queues (can occur due
  to several reasons). In that case, the CP could be stuck unless we kill all
  its waves. This function is *very* important as it provides the kernel a high
  level of control over the GPU. The reason we didn't upstream this function 
  so far, is because it is implemented using the H/W debugger module functions,
  so we had to wait until we can upstream the H/W debugger module.

- Replace declaration of bitmap from unsigned long to standard DECLARE_BITMAP

Thanks,

Oded

The following changes since commit 95872b49ce14169a1ce0dfaac62e284cbdc6eea8:

  Merge branch 'drm-tda998x-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 
into drm-next (2015-05-29 09:19:59 +1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2015-06-01

for you to fetch changes up to c34d7db08e60fdc1e43bd478a8d5b40fea7703da:

  drm/amdkfd: Enforce kill all waves on process termination (2015-06-01 
08:43:42 +0300)


Alexey Skidanov (1):
  drm/radeon: Add ATC VMID<-->PASID functions to kfd->kgd

Ben Goz (1):
  drm/amdkfd: Enforce kill all waves on process termination

Joe Perches (1):
  drm/amdkfd: Use DECLARE_BITMAP

Yair Shachar (9):
  drm/radeon: Add H/W debugger kfd->kgd functions
  drm/amdkfd: add H/W debugger IOCTL set definitions
  drm/amdkfd: Add static user-mode queues support
  drm/amdkfd: Add skeleton H/W debugger module support
  drm/amdkfd: Add wave control operation to debugger
  drm/amdkfd: Add address watch operation to debugger
  drm/amdkfd: Implement (un)register debugger IOCTLs
  drm/amdkfd: Implement wave control debugger IOCTL
  drm/amdkfd: Implement address watch debugger IOCTL

 drivers/gpu/drm/amd/amdkfd/Makefile|   3 +-
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c   | 304 +++
 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c| 886 +
 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h| 193 +
 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c| 168 
 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h| 294 +++
 drivers/gpu/drm/amd/amdkfd/kfd_device.c|   5 +
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |  48 +-
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |   6 +
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c|  46 +-
 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers.h   |   6 +-
 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h   | 290 +++
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h  |  24 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c   |  11 +
 .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |  18 +-
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h|  21 +
 drivers/gpu/drm/radeon/cik_reg.h   |  56 +-
 drivers/gpu/drm/radeon/cikd.h  |   9 +-
 drivers/gpu/drm/radeon/radeon_kfd.c| 151 +++-
 include/uapi/linux/kfd_ioctl.h |  43 +-
 20 files changed, 2547 insertions(+), 35 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.h
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_diq.h

[PULL] drm-amdkfd-next

[Dave Airlie]

>
>> drm-amdkfd-next-2015-05-18:
>>
>> - Add the interrupts & events modules, including new IOCTLs to create and
>> wait
>>   on events. The HSA RT open source stack is mainly using events to know
>> when
>>   a dispatched work has been completed. In addition, this module is
>>   a pre-requisite for the next module I'm going to upstream - debugger
>> support
>>
>>   This module also handles H/W exceptions, such as memory exception
>> received
>>   through the IOMMUv2 H/W and Bad Opcode exception receieved from the GPU.
>>
>> - Adding a new kernel module parameter to let the user decide whether he
>> wants
>>   to receive a SIGTERM when a memory exception occurs inside the GPU
>> kernel and
>>   the HSA application doesn't wait on an appropriate event, or if he just
>> want
>>   to receive notification about this event in dmesg. The default is the
>> latter.
>>
>> - Additional improvements for SDMA code
>>
>> - Update my email address in Maintainers file as I'm leaving AMD in two
>> weeks.
>>
>
Two things,

a) pull request from ssh:// please fix scripts to generate git:// URLs,

b) ioctls with bool in them make me worry, four packed bool's even more,
4 packed bools with a 64-bit straight after them put me over the not
pulling this edge.

I don't trust bools in ioctl defintions, please use explicitly sized types.

Dave.
-- next part --
An HTML attachment was scrubbed...
URL: 

[PULL] drm-amdkfd-next

[Oded Gabbay]

On May 19, 2015 3:16 AM, "Dave Airlie"  wrote:
>
>
>>>
>>> drm-amdkfd-next-2015-05-18:
>>>
>>> - Add the interrupts & events modules, including new IOCTLs to create
and wait
>>>   on events. The HSA RT open source stack is mainly using events to
know when
>>>   a dispatched work has been completed. In addition, this module is
>>>   a pre-requisite for the next module I'm going to upstream - debugger
support
>>>
>>>   This module also handles H/W exceptions, such as memory exception
received
>>>   through the IOMMUv2 H/W and Bad Opcode exception receieved from the
GPU.
>>>
>>> - Adding a new kernel module parameter to let the user decide whether
he wants
>>>   to receive a SIGTERM when a memory exception occurs inside the GPU
kernel and
>>>   the HSA application doesn't wait on an appropriate event, or if he
just want
>>>   to receive notification about this event in dmesg. The default is the
latter.
>>>
>>> - Additional improvements for SDMA code
>>>
>>> - Update my email address in Maintainers file as I'm leaving AMD in two
weeks.
>
>
> Two things,
>
> a) pull request from ssh:// please fix scripts to generate git:// URLs,
>
> b) ioctls with bool in them make me worry, four packed bool's even more,
> 4 packed bools with a 64-bit straight after them put me over the not
pulling this edge.
>
> I don't trust bools in ioctl defintions, please use explicitly sized
types.
>
> Dave.

Thanks Dave,
No problem, I'll fix and resend it today.

Oded
-- next part --
An HTML attachment was scrubbed...
URL: 

[PULL] drm-amdkfd-next

[Oded Gabbay]

On Mon, May 18, 2015 at 9:29 AM, Oded Gabbay  wrote:

> Hi Dave,
>
> Here is the pull request of amdkfd for 4.2
>
> drm-amdkfd-next-2015-05-18:
>
> - Add the interrupts & events modules, including new IOCTLs to create and
> wait
>   on events. The HSA RT open source stack is mainly using events to know
> when
>   a dispatched work has been completed. In addition, this module is
>   a pre-requisite for the next module I'm going to upstream - debugger
> support
>
>   This module also handles H/W exceptions, such as memory exception
> received
>   through the IOMMUv2 H/W and Bad Opcode exception receieved from the GPU.
>
> - Adding a new kernel module parameter to let the user decide whether he
> wants
>   to receive a SIGTERM when a memory exception occurs inside the GPU
> kernel and
>   the HSA application doesn't wait on an appropriate event, or if he just
> want
>   to receive notification about this event in dmesg. The default is the
> latter.
>
> - Additional improvements for SDMA code
>
> - Update my email address in Maintainers file as I'm leaving AMD in two
> weeks.
>
> Thanks,
>
> Oded
>
> The following changes since commit
> dde10068e1a4798fa44e68a5d08b5dfe3602cbba:
>
>   Merge branch 'drm-armada-devel' of git://
> ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next (2015-05-15 15:24:41
> +1000)
>
> are available in the git repository at:
>
>   ssh://gabbayo at people.freedesktop.org/~gabbayo/linux
> tags/drm-amdkfd-next-2015-05-18
>
> for you to fetch changes up to a441b1ddc5ad53aaa9e6d4d0b98387b1cf0a9ba8:
>
>   drm/amdkfd: change driver version to 0.7.2 (2015-05-18 09:15:28 +0300)
>
> 
> Alexey Skidanov (2):
>   drm/amdkfd: Add memory exception handling
>   drm/amdkfd: Add bad opcode exception handling
>
> Andrew Lewycky (4):
>   drm/amdkfd: Add interrupt handling module
>   drm/amdkfd: add events IOCTL set definitions
>   drm/amdkfd: Add the events module
>   drm/amdkfd: Implement events IOCTLs
>
> Firo Yang (1):
>   drm/amdkfd: Remove unessary void pointer cast
>
> Oded Gabbay (7):
>   drm/amdkfd: reformat some debug prints
>   drm/amdkfd: Use new struct for asic specific ops
>   drm/amdkfd: make the sdma vm init to be asic specific
>   MAINTAINERS: update amdkfd Oded's email address
>   drm/radeon: Add init interrupt kfd->kgd interface
>   drm/amdkfd: Add module parameter of send_sigterm
>   drm/amdkfd: change driver version to 0.7.2
>
>  MAINTAINERS|   2 +-
>  drivers/gpu/drm/amd/amdkfd/Makefile|   1 +
>  drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c   |  66 ++
>  drivers/gpu/drm/amd/amdkfd/cik_int.h   |  41 +
>  drivers/gpu/drm/amd/amdkfd/kfd_chardev.c   |  87 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_device.c|  52 +-
>  .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |  30 +-
>  .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |  21 +-
>  .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c  |  18 +-
>  .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c   |  10 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c  |  15 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_events.c| 965
> +
>  drivers/gpu/drm/amd/amdkfd/kfd_events.h|  84 ++
>  drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 188 
>  drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c  |   5 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_module.c|   9 +-
>  drivers/gpu/drm/amd/amdkfd/kfd_priv.h  |  75 ++
>  drivers/gpu/drm/amd/amdkfd/kfd_process.c   |  27 +-
>  drivers/gpu/drm/amd/include/kgd_kfd_interface.h|   2 +
>  drivers/gpu/drm/radeon/cik_reg.h   |   2 +
>  drivers/gpu/drm/radeon/cikd.h  |   1 +
>  drivers/gpu/drm/radeon/radeon_kfd.c|  21 +-
>  include/uapi/linux/kfd_ioctl.h |  96 +-
>  23 files changed, 1778 insertions(+), 40 deletions(-)
>  create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c
>  create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_int.h
>  create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.c
>  create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.h
>  create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c
>

​Fixing Alex's email address.​
​Sorry.​

-- 
  Oded
-- next part --
An HTML attachment was scrubbed...
URL: 

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

Here is the pull request of amdkfd for 4.2

drm-amdkfd-next-2015-05-18:

- Add the interrupts & events modules, including new IOCTLs to create and wait
  on events. The HSA RT open source stack is mainly using events to know when 
  a dispatched work has been completed. In addition, this module is 
  a pre-requisite for the next module I'm going to upstream - debugger support

  This module also handles H/W exceptions, such as memory exception received 
  through the IOMMUv2 H/W and Bad Opcode exception receieved from the GPU.

- Adding a new kernel module parameter to let the user decide whether he wants
  to receive a SIGTERM when a memory exception occurs inside the GPU kernel and
  the HSA application doesn't wait on an appropriate event, or if he just want
  to receive notification about this event in dmesg. The default is the latter.

- Additional improvements for SDMA code

- Update my email address in Maintainers file as I'm leaving AMD in two weeks.

Thanks,

Oded

The following changes since commit dde10068e1a4798fa44e68a5d08b5dfe3602cbba:

  Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 
into drm-next (2015-05-15 15:24:41 +1000)

are available in the git repository at:

  ssh://gabbayo at people.freedesktop.org/~gabbayo/linux 
tags/drm-amdkfd-next-2015-05-18

for you to fetch changes up to a441b1ddc5ad53aaa9e6d4d0b98387b1cf0a9ba8:

  drm/amdkfd: change driver version to 0.7.2 (2015-05-18 09:15:28 +0300)


Alexey Skidanov (2):
  drm/amdkfd: Add memory exception handling
  drm/amdkfd: Add bad opcode exception handling

Andrew Lewycky (4):
  drm/amdkfd: Add interrupt handling module
  drm/amdkfd: add events IOCTL set definitions
  drm/amdkfd: Add the events module
  drm/amdkfd: Implement events IOCTLs

Firo Yang (1):
  drm/amdkfd: Remove unessary void pointer cast

Oded Gabbay (7):
  drm/amdkfd: reformat some debug prints
  drm/amdkfd: Use new struct for asic specific ops
  drm/amdkfd: make the sdma vm init to be asic specific
  MAINTAINERS: update amdkfd Oded's email address
  drm/radeon: Add init interrupt kfd->kgd interface
  drm/amdkfd: Add module parameter of send_sigterm
  drm/amdkfd: change driver version to 0.7.2

 MAINTAINERS|   2 +-
 drivers/gpu/drm/amd/amdkfd/Makefile|   1 +
 drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c   |  66 ++
 drivers/gpu/drm/amd/amdkfd/cik_int.h   |  41 +
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c   |  87 +-
 drivers/gpu/drm/amd/amdkfd/kfd_device.c|  52 +-
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  |  30 +-
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |  21 +-
 .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c  |  18 +-
 .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c   |  10 +-
 drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c  |  15 +-
 drivers/gpu/drm/amd/amdkfd/kfd_events.c| 965 +
 drivers/gpu/drm/amd/amdkfd/kfd_events.h|  84 ++
 drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 188 
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c  |   5 +-
 drivers/gpu/drm/amd/amdkfd/kfd_module.c|   9 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h  |  75 ++
 drivers/gpu/drm/amd/amdkfd/kfd_process.c   |  27 +-
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h|   2 +
 drivers/gpu/drm/radeon/cik_reg.h   |   2 +
 drivers/gpu/drm/radeon/cikd.h  |   1 +
 drivers/gpu/drm/radeon/radeon_kfd.c|  21 +-
 include/uapi/linux/kfd_ioctl.h |  96 +-
 23 files changed, 1778 insertions(+), 40 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_int.h
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.h
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

Here is the pull request of amdkfd for 4.1

drm-amdkfd-next-2015-03-25:

- Allow amdkfd to work with multiple kgd instances. This is in preparation for
  AMD's new open source kernel graphic driver (amdgpu), and for the new 
  AMD APU, Carrizo.

- Convert timestamping to use 64bit time accessors

- Three other minor changes.

Thanks,

Oded

The following changes since commit ae10c2248593fb84c6951d67c98c9c934997e56a:

  Merge branch 'drm/next/rcar-du' of git://linuxtv.org/pinchartl/fbdev into 
drm-next (2015-03-23 09:34:32 +1000)

are available in the git repository at:

  ssh://gabbayo at people.freedesktop.org/~gabbayo/linux 
tags/drm-amdkfd-next-2015-03-25

for you to fetch changes up to cea405b172e3b1fd2cf9da5ec05c7d808d6af03d:

  drm/amdkfd: Add multiple kgd support (2015-03-25 14:02:05 +0200)


John Stultz (1):
  drm/amdkfd: Convert timestamping to use 64bit time accessors

Oded Gabbay (3):
  drm/amdkfd: rename fence_wait_timeout
  drm/amdkfd: Remove unused field from struct qcm_process_device
  drm/amdkfd: add debug prints for process teardown

Xihan Zhang (1):
  drm/amdkfd: Add multiple kgd support

 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c   | 13 +++--
 drivers/gpu/drm/amd/amdkfd/kfd_device.c| 17 --
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  | 18 +++---
 drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c  | 17 +++---
 drivers/gpu/drm/amd/amdkfd/kfd_module.c| 12 +---
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c   | 13 +++--
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h  | 14 +++--
 drivers/gpu/drm/amd/amdkfd/kfd_process.c   |  6 ++
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c  | 12 ++--
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h| 64 +++---
 drivers/gpu/drm/radeon/radeon_kfd.c| 10 ++--
 11 files changed, 103 insertions(+), 93 deletions(-)

[PULL] drm-amdkfd-next-fixes

[Oded Gabbay]

Hi Dave,

Two more fixes for 3.20 amdkfd code:

- Fixing accounting of active queues
- Preserving a register internal state

Thanks,

Oded

The following changes since commit e4bf44b3b558742fb7c58b4d34e206c8942f07e6:

  drm/modes: Print the mode status in human readable form (2015-02-03 11:13:27 
+1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux 
tags/drm-amdkfd-next-fixes-2015-02-03

for you to fetch changes up to d752f95e55ed36648fc2bcbca348f5113920c357:

  drm/amdkfd: Preserve CP_MQD_IQ_RPTR internal state (2015-01-19 11:47:34 -0600)


Jay Cornwall (2):
  drm/amdkfd: Fix dqm->queue_count tracking
  drm/amdkfd: Preserve CP_MQD_IQ_RPTR internal state

 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 ++---
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c  | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

[PULL] drm-amdkfd-next

[Oded Gabbay]

On 01/22/2015 01:47 AM, Dave Airlie wrote:
> On 21 January 2015 at 22:38, Oded Gabbay  wrote:
>> Hi Dave,
>>
>> Another pull request for 3.20.
>>
>> drm-amdkfd-next-2015-01-21:
>>
>> - Infrastructure work in amdkfd to prepare for VI support. This work mainly
>>includes separating modules into ASIC-specific functionality, adding
>>new properties that are relevant for VI, making sure that shared code is
>>reused, etc.
>>
>> - Improve mechanism of submitting packets to HIQ (the kernel queue that 
>> amdkfd
>>uses to issue commands to the GPU). The driver used to verify that each CS
>>was read by the GPU. However, this proved to be both unnecessary and 
>> erroneous.
>>Therefore, we cancelled this verification.
>>
>> - Moved initialization of compute VMIDs into radeon driver
>>
>> - Various minor fixes
>
>
>   CC [M]  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_cik.o
> /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:
> In function ‘destroy_queue_nocpsch’:
> /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:291:9:
> warning: ‘mqd’ may be used uninitialized in this function
> [-Wmaybe-uninitialized]
>retval = mqd->destroy_mqd(mqd, q->mqd,
>   ^
>
> Looks valid to me, I've pulled this but please follow up ASAP with a
> fix for the new warning.
>
> Dave.
>
Thanks, sent the fix (and others) to the mailing list.

Oded

[PULL] drm-amdkfd-next

[Dave Airlie]

On 21 January 2015 at 22:38, Oded Gabbay  wrote:
> Hi Dave,
>
> Another pull request for 3.20.
>
> drm-amdkfd-next-2015-01-21:
>
> - Infrastructure work in amdkfd to prepare for VI support. This work mainly
>   includes separating modules into ASIC-specific functionality, adding
>   new properties that are relevant for VI, making sure that shared code is
>   reused, etc.
>
> - Improve mechanism of submitting packets to HIQ (the kernel queue that amdkfd
>   uses to issue commands to the GPU). The driver used to verify that each CS
>   was read by the GPU. However, this proved to be both unnecessary and 
> erroneous.
>   Therefore, we cancelled this verification.
>
> - Moved initialization of compute VMIDs into radeon driver
>
> - Various minor fixes


 CC [M]  drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_cik.o
/home/airlied/devel/kernel/drm-next/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:
In function ‘destroy_queue_nocpsch’:
/home/airlied/devel/kernel/drm-next/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:291:9:
warning: ‘mqd’ may be used uninitialized in this function
[-Wmaybe-uninitialized]
  retval = mqd->destroy_mqd(mqd, q->mqd,
 ^

Looks valid to me, I've pulled this but please follow up ASAP with a
fix for the new warning.

Dave.

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

Another pull request for 3.20.

drm-amdkfd-next-2015-01-21:

- Infrastructure work in amdkfd to prepare for VI support. This work mainly 
  includes separating modules into ASIC-specific functionality, adding 
  new properties that are relevant for VI, making sure that shared code is 
  reused, etc.

- Improve mechanism of submitting packets to HIQ (the kernel queue that amdkfd
  uses to issue commands to the GPU). The driver used to verify that each CS
  was read by the GPU. However, this proved to be both unnecessary and 
erroneous.
  Therefore, we cancelled this verification.

- Moved initialization of compute VMIDs into radeon driver

- Various minor fixes  

Thanks,

Oded

The following changes since commit fc83975348ebce07793e6b9f780edc3cbcffa9fc:

  Merge tag 'imx-drm-next-2015-01-09' of git://git.pengutronix.de/git/pza/linux 
into drm-next (2015-01-21 10:17:16 +1000)

are available in the git repository at:


  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2015-01-21

for you to fetch changes up to cb2ac441289fbd4fc7fe98180d9413f3e86b2ddf:

  drm/amdkfd: Fix description of sched_policy module parameter (2015-01-18 
13:18:01 +0200)


Ben Goz (12):
  drm/radeon: Initialize compute vmid
  drm/amdkfd: Remove call to deprecated init_memory interface
  drm/amd: Put cik structures in a common place
  drm/amdkfd: Add new VI-specific queue properties
  drm/amdkfd: Make KFD_MQD_TYPE enum types H/W agnostic
  drm/amdkfd: Add asic property to kfd_device_info
  drm/amdkfd: Change MQD manager to be H/W specific
  drm/amdkfd: Fix logic of destroy_queue_nocpsch()
  drm/amdkfd: Add initial VI support for DQM
  drm/amdkfd: Add initial VI support for KQ
  drm/amdkfd: Fix for-loop when allocating HQD (non-HWS)
  drm/amdkfd: Fix description of sched_policy module parameter

Oded Gabbay (10):
  drm/radeon: Don't use relative paths in #include
  drm/amdkfd: Don't include header files from radeon
  drm/radeon: Use new cik_structs.h file
  MAINTAINERS: Update amdkfd files
  drm/amdkfd: Don't BUG on freeing GART sub-allocation
  drm/amdkfd: Encapsulate DQM functions in ops structure
  drm/amdkfd: Encapsulate KQ functions in ops structure
  drm/amdkfd: Replace cpu_relax() with schedule() in DQM
  drm/amdkfd: Remove unused function busy_wait()
  drm/amdkfd: Remove sync_with_hw() from amdkfd

 MAINTAINERS|   2 +
 drivers/gpu/drm/amd/amdkfd/Makefile|   5 +-
 drivers/gpu/drm/amd/amdkfd/cik_regs.h  |  13 +
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c   |  33 +-
 drivers/gpu/drm/amd/amdkfd/kfd_device.c|  21 +-
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  | 248 
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |  36 +-
 .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c  | 135 +++
 .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c   |  64 +++
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c  |  67 ++-
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h  |  40 +-
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c  |  44 ++
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c   |  56 +++
 drivers/gpu/drm/amd/amdkfd/kfd_module.c|   2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c   | 435 +---
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c   | 448 +
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c|  33 ++
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c|  22 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h  |  23 +-
 .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |  16 +-
 drivers/gpu/drm/amd/include/cik_structs.h  | 293 ++
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h|   4 -
 drivers/gpu/drm/radeon/Makefile|   2 +-
 drivers/gpu/drm/radeon/cik.c   |  24 ++
 drivers/gpu/drm/radeon/cik_reg.h   | 264 
 drivers/gpu/drm/radeon/radeon_kfd.c|  40 +-
 drivers/gpu/drm/radeon/radeon_kfd.h|   2 +-
 27 files changed, 1387 insertions(+), 985 deletions(-)
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_cik.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_vi.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
 create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
 create mode 100644 drivers/gpu/drm/amd/include/cik_structs.h

[PULL] drm-amdkfd-next

[Oded Gabbay]

Hi Dave,

First pull request of amdkfd for 3.20.

drm-amdkfd-next-2015-01-09:

- Add support for SDMA usermode queues
- Replace logic of sub-allocating from GART buffer in amdkfd. Instead 
  of using radeon_sa module, use a new module that is more suited for 
  this purpose
- Add the number of watch points to amdkfd topology
- Split a function that did two things into two seperate functions.

Thanks,
Oded

The following changes since commit c93546a5e32bd788c22aefa072385f3784551c13:

  Merge tag 'topic/atomic-core-2015-01-05' of 
git://anongit.freedesktop.org/drm-intel into drm-next (2015-01-09 09:22:40 
+1000)

are available in the git repository at:

  git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2015-01-09

for you to fetch changes up to 6bbcde9803a8e385d18c5a235c961e11a8e20601:

  drm/amd: Remove old radeon_sa funcs from kfd-->kgd interface (2015-01-09 
22:26:11 +0200)


Alexey Skidanov (2):
  drm/amdkfd: Add number of watch points to topology
  drm/amdkfd: Process-device data creation and lookup split

Ben Goz (7):
  drm/amd: Add SDMA functions to kfd-->kgd interface
  drm/radeon: Implement SDMA interface functions
  drm/amdkfd: Add SDMA mqd support
  drm/amdkfd: Add SDMA user-mode queues support to QCM
  drm/amdkfd: Identify SDMA queue in create queue ioctl
  drm/amdkfd: Pass queue type to pqm_create_queue()
  drm/radeon: Enable sdma preemption

Oded Gabbay (9):
  drm/amd: Add new kfd-->kgd interface for gart usage
  drm/radeon: Impl. new gtt allocate/free functions
  drm/amdkfd: Add gtt sa related data to kfd_dev struct
  drm/amdkfd: Add kfd gtt sub-allocator functions
  drm/amdkfd: Fixed calculation of gart buffer size
  drm/amdkfd: Allocate gart memory using new interface
  drm/amdkfd: Using new gtt sa in amdkfd
  drm/radeon: Remove old radeon_sa usage from kfd-->kgd interface
  drm/amd: Remove old radeon_sa funcs from kfd-->kgd interface

 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c   |   6 +-
 drivers/gpu/drm/amd/amdkfd/kfd_device.c| 225 ++-
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c  | 183 +---
 .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h  |   5 +
 drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c  |   4 -
 drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c   |   7 +-
 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c  |  41 ++--
 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c   | 136 +++-
 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c|  10 +-
 drivers/gpu/drm/amd/amdkfd/kfd_priv.h  |  42 +++-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c   |  40 ++--
 .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c |  16 +-
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c  | 155 +++--
 drivers/gpu/drm/amd/include/kgd_kfd_interface.h|  45 ++--
 drivers/gpu/drm/radeon/cik_reg.h   | 169 +-
 drivers/gpu/drm/radeon/cik_sdma.c  |  29 +++
 drivers/gpu/drm/radeon/radeon_kfd.c| 243 +++--
 17 files changed, 1078 insertions(+), 278 deletions(-)