releases/4.6.5/drm-amdkfd-destroy-dbgmgr-in-notifier-release.patch

   1 From bc4755a4bd1845ef6e88ac8c62f12e05bb530256 Mon Sep 17 00:00:00 2001
   2 From: Oded Gabbay <oded.gabbay@gmail.com>
   3 Date: Thu, 26 May 2016 08:41:48 +0300
   4 Subject: drm/amdkfd: destroy dbgmgr in notifier release
   5
   6 From: Oded Gabbay <oded.gabbay@gmail.com>
   7
   8 commit bc4755a4bd1845ef6e88ac8c62f12e05bb530256 upstream.
   9
  10 amdkfd need to destroy the debug manager in case amdkfd's notifier
  11 function is called before the unbind function, because in that case,
  12 the unbind function will exit without destroying debug manager.
  13
  14 Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16
  17 ---
  18  drivers/gpu/drm/amd/amdkfd/kfd_process.c |   10 ++++++++--
  19  1 file changed, 8 insertions(+), 2 deletions(-)
  20
  21 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
  22 +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
  23 @@ -242,13 +242,19 @@ static void kfd_process_notifier_release
  24         pqm_uninit(&p->pqm);
  25
  26         /* Iterate over all process device data structure and check
  27 -        * if we should reset all wavefronts */
  28 -       list_for_each_entry(pdd, &p->per_device_data, per_device_list)
  29 +        * if we should delete debug managers and reset all wavefronts
  30 +        */
  31 +       list_for_each_entry(pdd, &p->per_device_data, per_device_list) {
  32 +               if ((pdd->dev->dbgmgr) &&
  33 +                               (pdd->dev->dbgmgr->pasid == p->pasid))
  34 +                       kfd_dbgmgr_destroy(pdd->dev->dbgmgr);
  35 +
  36                 if (pdd->reset_wavefronts) {
  37                         pr_warn("amdkfd: Resetting all wave fronts\n");
  38                         dbgdev_wave_reset_wavefronts(pdd->dev, p);
  39                         pdd->reset_wavefronts = false;
  40                 }
  41 +       }
  42
  43         mutex_unlock(&p->mutex);
  44