aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd
diff options
context:
space:
mode:
authorBen Goz <ben.goz@amd.com>2015-01-04 03:36:30 -0500
committerOded Gabbay <oded.gabbay@amd.com>2015-01-04 03:36:30 -0500
commit85d258f9a7e827dc321d54d15ce1c6d5b0048a17 (patch)
tree6ade556e519f2feb39ffa9ef6bd99a36e5c3b40b /drivers/gpu/drm/amd
parentff3d04a17117ed0825076c0e9edd0fe232daec9f (diff)
drm/amdkfd: Make KFD_MQD_TYPE enum types H/W agnostic
As the MQD types are common across all AMD GPUs/APUs, let's remove the CIK part from the name. Signed-off-by: Ben Goz <ben.goz@amd.com> Signed-off-by: Oded Gabbay <oded.gabbay@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd')
-rw-r--r--drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c14
-rw-r--r--drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c2
-rw-r--r--drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c8
-rw-r--r--drivers/gpu/drm/amd/amdkfd/kfd_priv.h8
4 files changed, 16 insertions, 16 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
index fead2d7c0877..3d5f71a6e147 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
@@ -57,8 +57,8 @@ static inline
57enum KFD_MQD_TYPE get_mqd_type_from_queue_type(enum kfd_queue_type type) 57enum KFD_MQD_TYPE get_mqd_type_from_queue_type(enum kfd_queue_type type)
58{ 58{
59 if (type == KFD_QUEUE_TYPE_SDMA) 59 if (type == KFD_QUEUE_TYPE_SDMA)
60 return KFD_MQD_TYPE_CIK_SDMA; 60 return KFD_MQD_TYPE_SDMA;
61 return KFD_MQD_TYPE_CIK_CP; 61 return KFD_MQD_TYPE_CP;
62} 62}
63 63
64static inline unsigned int get_pipes_num(struct device_queue_manager *dqm) 64static inline unsigned int get_pipes_num(struct device_queue_manager *dqm)
@@ -271,7 +271,7 @@ static int create_compute_queue_nocpsch(struct device_queue_manager *dqm,
271 271
272 BUG_ON(!dqm || !q || !qpd); 272 BUG_ON(!dqm || !q || !qpd);
273 273
274 mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_COMPUTE); 274 mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);
275 if (mqd == NULL) 275 if (mqd == NULL)
276 return -ENOMEM; 276 return -ENOMEM;
277 277
@@ -302,13 +302,13 @@ static int destroy_queue_nocpsch(struct device_queue_manager *dqm,
302 pr_debug("kfd: In Func %s\n", __func__); 302 pr_debug("kfd: In Func %s\n", __func__);
303 303
304 mutex_lock(&dqm->lock); 304 mutex_lock(&dqm->lock);
305 mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_COMPUTE); 305 mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);
306 if (mqd == NULL) { 306 if (mqd == NULL) {
307 retval = -ENOMEM; 307 retval = -ENOMEM;
308 goto out; 308 goto out;
309 } 309 }
310 310
311 mqd_sdma = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_SDMA); 311 mqd_sdma = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_SDMA);
312 if (mqd_sdma == NULL) { 312 if (mqd_sdma == NULL) {
313 mutex_unlock(&dqm->lock); 313 mutex_unlock(&dqm->lock);
314 return -ENOMEM; 314 return -ENOMEM;
@@ -515,7 +515,7 @@ static int init_pipelines(struct device_queue_manager *dqm,
515 515
516 memset(hpdptr, 0, CIK_HPD_EOP_BYTES * pipes_num); 516 memset(hpdptr, 0, CIK_HPD_EOP_BYTES * pipes_num);
517 517
518 mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_COMPUTE); 518 mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_COMPUTE);
519 if (mqd == NULL) { 519 if (mqd == NULL) {
520 kfd_gtt_sa_free(dqm->dev, dqm->pipeline_mem); 520 kfd_gtt_sa_free(dqm->dev, dqm->pipeline_mem);
521 return -ENOMEM; 521 return -ENOMEM;
@@ -646,7 +646,7 @@ static int create_sdma_queue_nocpsch(struct device_queue_manager *dqm,
646 struct mqd_manager *mqd; 646 struct mqd_manager *mqd;
647 int retval; 647 int retval;
648 648
649 mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_CIK_SDMA); 649 mqd = dqm->get_mqd_manager(dqm, KFD_MQD_TYPE_SDMA);
650 if (!mqd) 650 if (!mqd)
651 return -ENOMEM; 651 return -ENOMEM;
652 652
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
index 0fd8bb7c863e..773c213f2f9a 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
@@ -57,7 +57,7 @@ static bool initialize(struct kernel_queue *kq, struct kfd_dev *dev,
57 case KFD_QUEUE_TYPE_DIQ: 57 case KFD_QUEUE_TYPE_DIQ:
58 case KFD_QUEUE_TYPE_HIQ: 58 case KFD_QUEUE_TYPE_HIQ:
59 kq->mqd = dev->dqm->get_mqd_manager(dev->dqm, 59 kq->mqd = dev->dqm->get_mqd_manager(dev->dqm,
60 KFD_MQD_TYPE_CIK_HIQ); 60 KFD_MQD_TYPE_HIQ);
61 break; 61 break;
62 default: 62 default:
63 BUG(); 63 BUG();
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
index 155e33ceda9a..be989fb22846 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
@@ -423,8 +423,8 @@ struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type,
423 mqd->dev = dev; 423 mqd->dev = dev;
424 424
425 switch (type) { 425 switch (type) {
426 case KFD_MQD_TYPE_CIK_CP: 426 case KFD_MQD_TYPE_CP:
427 case KFD_MQD_TYPE_CIK_COMPUTE: 427 case KFD_MQD_TYPE_COMPUTE:
428 mqd->init_mqd = init_mqd; 428 mqd->init_mqd = init_mqd;
429 mqd->uninit_mqd = uninit_mqd; 429 mqd->uninit_mqd = uninit_mqd;
430 mqd->load_mqd = load_mqd; 430 mqd->load_mqd = load_mqd;
@@ -432,7 +432,7 @@ struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type,
432 mqd->destroy_mqd = destroy_mqd; 432 mqd->destroy_mqd = destroy_mqd;
433 mqd->is_occupied = is_occupied; 433 mqd->is_occupied = is_occupied;
434 break; 434 break;
435 case KFD_MQD_TYPE_CIK_HIQ: 435 case KFD_MQD_TYPE_HIQ:
436 mqd->init_mqd = init_mqd_hiq; 436 mqd->init_mqd = init_mqd_hiq;
437 mqd->uninit_mqd = uninit_mqd; 437 mqd->uninit_mqd = uninit_mqd;
438 mqd->load_mqd = load_mqd; 438 mqd->load_mqd = load_mqd;
@@ -440,7 +440,7 @@ struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type,
440 mqd->destroy_mqd = destroy_mqd; 440 mqd->destroy_mqd = destroy_mqd;
441 mqd->is_occupied = is_occupied; 441 mqd->is_occupied = is_occupied;
442 break; 442 break;
443 case KFD_MQD_TYPE_CIK_SDMA: 443 case KFD_MQD_TYPE_SDMA:
444 mqd->init_mqd = init_mqd_sdma; 444 mqd->init_mqd = init_mqd_sdma;
445 mqd->uninit_mqd = uninit_mqd_sdma; 445 mqd->uninit_mqd = uninit_mqd_sdma;
446 mqd->load_mqd = load_mqd_sdma; 446 mqd->load_mqd = load_mqd_sdma;
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index 3ba34b7bb122..a4e0ddd56778 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@ -356,10 +356,10 @@ struct queue {
356 * Please read the kfd_mqd_manager.h description. 356 * Please read the kfd_mqd_manager.h description.
357 */ 357 */
358enum KFD_MQD_TYPE { 358enum KFD_MQD_TYPE {
359 KFD_MQD_TYPE_CIK_COMPUTE = 0, /* for no cp scheduling */ 359 KFD_MQD_TYPE_COMPUTE = 0, /* for no cp scheduling */
360 KFD_MQD_TYPE_CIK_HIQ, /* for hiq */ 360 KFD_MQD_TYPE_HIQ, /* for hiq */
361 KFD_MQD_TYPE_CIK_CP, /* for cp queues and diq */ 361 KFD_MQD_TYPE_CP, /* for cp queues and diq */
362 KFD_MQD_TYPE_CIK_SDMA, /* for sdma queues */ 362 KFD_MQD_TYPE_SDMA, /* for sdma queues */
363 KFD_MQD_TYPE_MAX 363 KFD_MQD_TYPE_MAX
364}; 364};
365 365