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

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: Jay Cornwall <jay.cornwall@amd.com>
Signed-off-by: Mukul Joshi <mukul.joshi@amd.com>
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Mukul Joshi and committed by
Alex Deucher 26d97182 f37e5d21

+12 -12
+1 -1
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
··· 1997 1997 * check those fields 1998 1998 */ 1999 1999 mqd_mgr = dqm->mqd_mgrs[KFD_MQD_TYPE_HIQ]; 2000 - if (mqd_mgr->read_doorbell_id(dqm->packet_mgr.priv_queue->queue->mqd)) { 2000 + if (mqd_mgr->check_preemption_failed(dqm->packet_mgr.priv_queue->queue->mqd)) { 2001 2001 dev_err(dev, "HIQ MQD's queue_doorbell_id0 is not 0, Queue preemption time out\n"); 2002 2002 while (halt_if_hws_hang) 2003 2003 schedule();
+1 -1
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
··· 119 119 #if defined(CONFIG_DEBUG_FS) 120 120 int (*debugfs_show_mqd)(struct seq_file *m, void *data); 121 121 #endif 122 - uint32_t (*read_doorbell_id)(void *mqd); 122 + uint32_t (*check_preemption_failed)(void *mqd); 123 123 uint64_t (*mqd_stride)(struct mqd_manager *mm, 124 124 struct queue_properties *p); 125 125
+2 -2
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c
··· 206 206 q->is_active = QUEUE_IS_ACTIVE(*q); 207 207 } 208 208 209 - static uint32_t read_doorbell_id(void *mqd) 209 + static uint32_t check_preemption_failed(void *mqd) 210 210 { 211 211 struct cik_mqd *m = (struct cik_mqd *)mqd; 212 212 ··· 423 423 #if defined(CONFIG_DEBUG_FS) 424 424 mqd->debugfs_show_mqd = debugfs_show_mqd; 425 425 #endif 426 - mqd->read_doorbell_id = read_doorbell_id; 426 + mqd->check_preemption_failed = check_preemption_failed; 427 427 break; 428 428 case KFD_MQD_TYPE_DIQ: 429 429 mqd->allocate_mqd = allocate_mqd;
+2 -2
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c
··· 224 224 q->is_active = QUEUE_IS_ACTIVE(*q); 225 225 } 226 226 227 - static uint32_t read_doorbell_id(void *mqd) 227 + static uint32_t check_preemption_failed(void *mqd) 228 228 { 229 229 struct v10_compute_mqd *m = (struct v10_compute_mqd *)mqd; 230 230 ··· 488 488 #if defined(CONFIG_DEBUG_FS) 489 489 mqd->debugfs_show_mqd = debugfs_show_mqd; 490 490 #endif 491 - mqd->read_doorbell_id = read_doorbell_id; 491 + mqd->check_preemption_failed = check_preemption_failed; 492 492 pr_debug("%s@%i\n", __func__, __LINE__); 493 493 break; 494 494 case KFD_MQD_TYPE_DIQ:
+2 -2
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c
··· 278 278 q->is_active = QUEUE_IS_ACTIVE(*q); 279 279 } 280 280 281 - static uint32_t read_doorbell_id(void *mqd) 281 + static uint32_t check_preemption_failed(void *mqd) 282 282 { 283 283 struct v11_compute_mqd *m = (struct v11_compute_mqd *)mqd; 284 284 ··· 517 517 #if defined(CONFIG_DEBUG_FS) 518 518 mqd->debugfs_show_mqd = debugfs_show_mqd; 519 519 #endif 520 - mqd->read_doorbell_id = read_doorbell_id; 520 + mqd->check_preemption_failed = check_preemption_failed; 521 521 pr_debug("%s@%i\n", __func__, __LINE__); 522 522 break; 523 523 case KFD_MQD_TYPE_DIQ:
+2 -2
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c
··· 316 316 } 317 317 318 318 319 - static uint32_t read_doorbell_id(void *mqd) 319 + static uint32_t check_preemption_failed(void *mqd) 320 320 { 321 321 struct v9_mqd *m = (struct v9_mqd *)mqd; 322 322 ··· 881 881 #if defined(CONFIG_DEBUG_FS) 882 882 mqd->debugfs_show_mqd = debugfs_show_mqd; 883 883 #endif 884 - mqd->read_doorbell_id = read_doorbell_id; 884 + mqd->check_preemption_failed = check_preemption_failed; 885 885 if (KFD_GC_VERSION(dev) == IP_VERSION(9, 4, 3)) { 886 886 mqd->init_mqd = init_mqd_hiq_v9_4_3; 887 887 mqd->load_mqd = hiq_load_mqd_kiq_v9_4_3;
+2 -2
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c
··· 237 237 q->is_active = QUEUE_IS_ACTIVE(*q); 238 238 } 239 239 240 - static uint32_t read_doorbell_id(void *mqd) 240 + static uint32_t check_preemption_failed(void *mqd) 241 241 { 242 242 struct vi_mqd *m = (struct vi_mqd *)mqd; 243 243 ··· 482 482 #if defined(CONFIG_DEBUG_FS) 483 483 mqd->debugfs_show_mqd = debugfs_show_mqd; 484 484 #endif 485 - mqd->read_doorbell_id = read_doorbell_id; 485 + mqd->check_preemption_failed = check_preemption_failed; 486 486 break; 487 487 case KFD_MQD_TYPE_DIQ: 488 488 mqd->allocate_mqd = allocate_mqd;