diff options
| author | Ben Goz <ben.goz@amd.com> | 2014-10-26 12:07:34 -0400 |
|---|---|---|
| committer | Oded Gabbay <oded.gabbay@amd.com> | 2014-10-26 12:07:34 -0400 |
| commit | fe502804205e4103bdff4854bb41cd78fa82b099 (patch) | |
| tree | e4578c2c5e83c9ec6c507223b6b05f7f01d23159 /drivers/gpu/drm/amd | |
| parent | 08dcc57fcd240922347c8a9f14d18e67a3f9f1a9 (diff) | |
drm/amdkfd: Remove call to deprecated init_memory interface
This patch removes a call to kfd-->kgd interface function that is doing H/W
initialization. That function is moved into radeon to be part of the common
H/W initialization sequence. The interface function will be deleted.
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.c | 21 |
1 files changed, 0 insertions, 21 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 6806e64c5ffd..60f4ccbbb301 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | |||
| @@ -37,9 +37,6 @@ | |||
| 37 | #define CIK_HPD_EOP_BYTES_LOG2 11 | 37 | #define CIK_HPD_EOP_BYTES_LOG2 11 |
| 38 | #define CIK_HPD_EOP_BYTES (1U << CIK_HPD_EOP_BYTES_LOG2) | 38 | #define CIK_HPD_EOP_BYTES (1U << CIK_HPD_EOP_BYTES_LOG2) |
| 39 | 39 | ||
| 40 | static bool is_mem_initialized; | ||
| 41 | |||
| 42 | static int init_memory(struct device_queue_manager *dqm); | ||
| 43 | static int set_pasid_vmid_mapping(struct device_queue_manager *dqm, | 40 | static int set_pasid_vmid_mapping(struct device_queue_manager *dqm, |
| 44 | unsigned int pasid, unsigned int vmid); | 41 | unsigned int pasid, unsigned int vmid); |
| 45 | 42 | ||
| @@ -486,20 +483,6 @@ static uint32_t compute_sh_mem_bases_64bit(unsigned int top_address_nybble) | |||
| 486 | SHARED_BASE(top_address_nybble << 12); | 483 | SHARED_BASE(top_address_nybble << 12); |
| 487 | } | 484 | } |
| 488 | 485 | ||
| 489 | static int init_memory(struct device_queue_manager *dqm) | ||
| 490 | { | ||
| 491 | int i, retval; | ||
| 492 | |||
| 493 | for (i = 8; i < 16; i++) | ||
| 494 | set_pasid_vmid_mapping(dqm, 0, i); | ||
| 495 | |||
| 496 | retval = kfd2kgd->init_memory(dqm->dev->kgd); | ||
| 497 | if (retval == 0) | ||
| 498 | is_mem_initialized = true; | ||
| 499 | return retval; | ||
| 500 | } | ||
| 501 | |||
| 502 | |||
| 503 | static int init_pipelines(struct device_queue_manager *dqm, | 486 | static int init_pipelines(struct device_queue_manager *dqm, |
| 504 | unsigned int pipes_num, unsigned int first_pipe) | 487 | unsigned int pipes_num, unsigned int first_pipe) |
| 505 | { | 488 | { |
| @@ -560,10 +543,6 @@ static int init_scheduler(struct device_queue_manager *dqm) | |||
| 560 | pr_debug("kfd: In %s\n", __func__); | 543 | pr_debug("kfd: In %s\n", __func__); |
| 561 | 544 | ||
| 562 | retval = init_pipelines(dqm, get_pipes_num(dqm), KFD_DQM_FIRST_PIPE); | 545 | retval = init_pipelines(dqm, get_pipes_num(dqm), KFD_DQM_FIRST_PIPE); |
| 563 | if (retval != 0) | ||
| 564 | return retval; | ||
| 565 | |||
| 566 | retval = init_memory(dqm); | ||
| 567 | 546 | ||
| 568 | return retval; | 547 | return retval; |
| 569 | } | 548 | } |
