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

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>

authored by

Ben Goz and committed by
Oded Gabbay
fe502804 08dcc57f

-21
-21
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
··· 37 37 #define CIK_HPD_EOP_BYTES_LOG2 11 38 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 40 static int set_pasid_vmid_mapping(struct device_queue_manager *dqm, 44 41 unsigned int pasid, unsigned int vmid); 45 42 ··· 483 486 SHARED_BASE(top_address_nybble << 12); 484 487 } 485 488 486 - static int init_memory(struct device_queue_manager *dqm) 487 - { 488 - int i, retval; 489 - 490 - for (i = 8; i < 16; i++) 491 - set_pasid_vmid_mapping(dqm, 0, i); 492 - 493 - retval = kfd2kgd->init_memory(dqm->dev->kgd); 494 - if (retval == 0) 495 - is_mem_initialized = true; 496 - return retval; 497 - } 498 - 499 - 500 489 static int init_pipelines(struct device_queue_manager *dqm, 501 490 unsigned int pipes_num, unsigned int first_pipe) 502 491 { ··· 543 560 pr_debug("kfd: In %s\n", __func__); 544 561 545 562 retval = init_pipelines(dqm, get_pipes_num(dqm), KFD_DQM_FIRST_PIPE); 546 - if (retval != 0) 547 - return retval; 548 - 549 - retval = init_memory(dqm); 550 563 551 564 return retval; 552 565 }