Commit 26d97182 authored by Mukul Joshi's avatar Mukul Joshi Committed by Alex Deucher

drm/amdkfd: Rename read_doorbell_id in MQD functions

Rename read_doorbell_id function to a more meaningful name,
implying what it is used for. No functional change.
Suggested-by: default avatarJay Cornwall <jay.cornwall@amd.com>
Signed-off-by: default avatarMukul Joshi <mukul.joshi@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f37e5d21
...@@ -1997,7 +1997,7 @@ static int unmap_queues_cpsch(struct device_queue_manager *dqm, ...@@ -1997,7 +1997,7 @@ static int unmap_queues_cpsch(struct device_queue_manager *dqm,
* check those fields * check those fields
*/ */
mqd_mgr = dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ]; mqd_mgr = dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ];
if (mqd_mgr->read_doorbell_id(dqm->packet_mgr.priv_queue->queue->mqd)) { if (mqd_mgr->check_preemption_failed(dqm->packet_mgr.priv_queue->queue->mqd)) {
dev_err(dev, "HIQ MQD's queue_doorbell_id0 is not 0, Queue preemption time out\n"); dev_err(dev, "HIQ MQD's queue_doorbell_id0 is not 0, Queue preemption time out\n");
while (halt_if_hws_hang) while (halt_if_hws_hang)
schedule(); schedule();
......
...@@ -119,7 +119,7 @@ struct mqd_manager { ...@@ -119,7 +119,7 @@ struct mqd_manager {
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
int (*debugfs_show_mqd)(struct seq_file *m, void *data); int (*debugfs_show_mqd)(struct seq_file *m, void *data);
#endif #endif
uint32_t (*read_doorbell_id)(void *mqd); uint32_t (*check_preemption_failed)(void *mqd);
uint64_t (*mqd_stride)(struct mqd_manager *mm, uint64_t (*mqd_stride)(struct mqd_manager *mm,
struct queue_properties *p); struct queue_properties *p);
......
...@@ -206,7 +206,7 @@ static void __update_mqd(struct mqd_manager *mm, void *mqd, ...@@ -206,7 +206,7 @@ static void __update_mqd(struct mqd_manager *mm, void *mqd,
q->is_active = QUEUE_IS_ACTIVE(*q); q->is_active = QUEUE_IS_ACTIVE(*q);
} }
static uint32_t read_doorbell_id(void *mqd) static uint32_t check_preemption_failed(void *mqd)
{ {
struct cik_mqd *m = (struct cik_mqd *)mqd; struct cik_mqd *m = (struct cik_mqd *)mqd;
...@@ -423,7 +423,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type, ...@@ -423,7 +423,7 @@ struct mqd_manager *mqd_manager_init_cik(enum KFD_MQD_TYPE type,
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
mqd->debugfs_show_mqd = debugfs_show_mqd; mqd->debugfs_show_mqd = debugfs_show_mqd;
#endif #endif
mqd->read_doorbell_id = read_doorbell_id; mqd->check_preemption_failed = check_preemption_failed;
break; break;
case KFD_MQD_TYPE_DIQ: case KFD_MQD_TYPE_DIQ:
mqd->allocate_mqd = allocate_mqd; mqd->allocate_mqd = allocate_mqd;
......
...@@ -224,7 +224,7 @@ static void update_mqd(struct mqd_manager *mm, void *mqd, ...@@ -224,7 +224,7 @@ static void update_mqd(struct mqd_manager *mm, void *mqd,
q->is_active = QUEUE_IS_ACTIVE(*q); q->is_active = QUEUE_IS_ACTIVE(*q);
} }
static uint32_t read_doorbell_id(void *mqd) static uint32_t check_preemption_failed(void *mqd)
{ {
struct v10_compute_mqd *m = (struct v10_compute_mqd *)mqd; struct v10_compute_mqd *m = (struct v10_compute_mqd *)mqd;
...@@ -488,7 +488,7 @@ struct mqd_manager *mqd_manager_init_v10(enum KFD_MQD_TYPE type, ...@@ -488,7 +488,7 @@ struct mqd_manager *mqd_manager_init_v10(enum KFD_MQD_TYPE type,
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
mqd->debugfs_show_mqd = debugfs_show_mqd; mqd->debugfs_show_mqd = debugfs_show_mqd;
#endif #endif
mqd->read_doorbell_id = read_doorbell_id; mqd->check_preemption_failed = check_preemption_failed;
pr_debug("%s@%i\n", __func__, __LINE__); pr_debug("%s@%i\n", __func__, __LINE__);
break; break;
case KFD_MQD_TYPE_DIQ: case KFD_MQD_TYPE_DIQ:
......
...@@ -278,7 +278,7 @@ static void update_mqd(struct mqd_manager *mm, void *mqd, ...@@ -278,7 +278,7 @@ static void update_mqd(struct mqd_manager *mm, void *mqd,
q->is_active = QUEUE_IS_ACTIVE(*q); q->is_active = QUEUE_IS_ACTIVE(*q);
} }
static uint32_t read_doorbell_id(void *mqd) static uint32_t check_preemption_failed(void *mqd)
{ {
struct v11_compute_mqd *m = (struct v11_compute_mqd *)mqd; struct v11_compute_mqd *m = (struct v11_compute_mqd *)mqd;
...@@ -517,7 +517,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type, ...@@ -517,7 +517,7 @@ struct mqd_manager *mqd_manager_init_v11(enum KFD_MQD_TYPE type,
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
mqd->debugfs_show_mqd = debugfs_show_mqd; mqd->debugfs_show_mqd = debugfs_show_mqd;
#endif #endif
mqd->read_doorbell_id = read_doorbell_id; mqd->check_preemption_failed = check_preemption_failed;
pr_debug("%s@%i\n", __func__, __LINE__); pr_debug("%s@%i\n", __func__, __LINE__);
break; break;
case KFD_MQD_TYPE_DIQ: case KFD_MQD_TYPE_DIQ:
......
...@@ -316,7 +316,7 @@ static void update_mqd(struct mqd_manager *mm, void *mqd, ...@@ -316,7 +316,7 @@ static void update_mqd(struct mqd_manager *mm, void *mqd,
} }
static uint32_t read_doorbell_id(void *mqd) static uint32_t check_preemption_failed(void *mqd)
{ {
struct v9_mqd *m = (struct v9_mqd *)mqd; struct v9_mqd *m = (struct v9_mqd *)mqd;
...@@ -881,7 +881,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type, ...@@ -881,7 +881,7 @@ struct mqd_manager *mqd_manager_init_v9(enum KFD_MQD_TYPE type,
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
mqd->debugfs_show_mqd = debugfs_show_mqd; mqd->debugfs_show_mqd = debugfs_show_mqd;
#endif #endif
mqd->read_doorbell_id = read_doorbell_id; mqd->check_preemption_failed = check_preemption_failed;
if (KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 3)) { if (KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 3)) {
mqd->init_mqd = init_mqd_hiq_v9_4_3; mqd->init_mqd = init_mqd_hiq_v9_4_3;
mqd->load_mqd = hiq_load_mqd_kiq_v9_4_3; mqd->load_mqd = hiq_load_mqd_kiq_v9_4_3;
......
...@@ -237,7 +237,7 @@ static void __update_mqd(struct mqd_manager *mm, void *mqd, ...@@ -237,7 +237,7 @@ static void __update_mqd(struct mqd_manager *mm, void *mqd,
q->is_active = QUEUE_IS_ACTIVE(*q); q->is_active = QUEUE_IS_ACTIVE(*q);
} }
static uint32_t read_doorbell_id(void *mqd) static uint32_t check_preemption_failed(void *mqd)
{ {
struct vi_mqd *m = (struct vi_mqd *)mqd; struct vi_mqd *m = (struct vi_mqd *)mqd;
...@@ -482,7 +482,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type, ...@@ -482,7 +482,7 @@ struct mqd_manager *mqd_manager_init_vi(enum KFD_MQD_TYPE type,
#if defined(CONFIG_DEBUG_FS) #if defined(CONFIG_DEBUG_FS)
mqd->debugfs_show_mqd = debugfs_show_mqd; mqd->debugfs_show_mqd = debugfs_show_mqd;
#endif #endif
mqd->read_doorbell_id = read_doorbell_id; mqd->check_preemption_failed = check_preemption_failed;
break; break;
case KFD_MQD_TYPE_DIQ: case KFD_MQD_TYPE_DIQ:
mqd->allocate_mqd = allocate_mqd; mqd->allocate_mqd = allocate_mqd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment