Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdkfd: Allow device error to be logged

The addition of a WARN_ON() check in order to return early in the
kq_initialize function retroactively causes the default case in the
following switch statement to never be executed, preventing dev_err
from logging device errors in the kernel. Both logs are now checked
in the default case.

Signed-off-by: Sunday Clement <Sunday.Clement@amd.com>
Reviewed-by: Harish Kasiviswanathan <Harish.Kasiviswanathan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Sunday Clement and committed by
Alex Deucher
7bbfa1b1 cbf3a5d6

+2 -5
+2 -5
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
··· 46 46 int retval; 47 47 union PM4_MES_TYPE_3_HEADER nop; 48 48 49 - if (WARN_ON(type != KFD_QUEUE_TYPE_DIQ && type != KFD_QUEUE_TYPE_HIQ)) 50 - return false; 51 - 52 - pr_debug("Initializing queue type %d size %d\n", KFD_QUEUE_TYPE_HIQ, 53 - queue_size); 49 + pr_debug("Initializing queue type %d size %d\n", type, queue_size); 54 50 55 51 memset(&prop, 0, sizeof(prop)); 56 52 memset(&nop, 0, sizeof(nop)); ··· 65 69 kq->mqd_mgr = dev->dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ]; 66 70 break; 67 71 default: 72 + WARN(1, "Invalid queue type %d\n", type); 68 73 dev_err(dev->adev->dev, "Invalid queue type %d\n", type); 69 74 return false; 70 75 }