Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5494d864 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: move getting pcie info to common code 



No need to replicate it in several places.

Reviewed-by: default avatarRex Zhu <rezhu@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3cdfe700

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −2
Original line number Diff line number Diff line
@@ -1081,8 +1081,6 @@ struct amdgpu_wb { 
int amdgpu_device_wb_get(struct amdgpu_device *adev, u32 *wb);

void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb);



void amdgpu_device_get_pcie_info(struct amdgpu_device *adev);



/*

 * SDMA

 */

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+5 −1
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ static const char *amdgpu_asic_name[] = { 
	"LAST",

};



static void amdgpu_device_get_pcie_info(struct amdgpu_device *adev);



bool amdgpu_device_is_px(struct drm_device *dev)

{

	struct amdgpu_device *adev = dev->dev_private;
@@ -1909,6 +1911,8 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (adev->rio_mem == NULL)

		DRM_INFO("PCI I/O BAR is not found.\n");



	amdgpu_device_get_pcie_info(adev);



	/* early init functions */

	r = amdgpu_device_ip_early_init(adev);

	if (r)
@@ -2786,7 +2790,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
	return r;

}



void amdgpu_device_get_pcie_info(struct amdgpu_device *adev)

static void amdgpu_device_get_pcie_info(struct amdgpu_device *adev)

{

	u32 mask;

	int ret;

drivers/gpu/drm/amd/amdgpu/cik.c

+0 −2
Original line number Diff line number Diff line
@@ -1887,8 +1887,6 @@ static int cik_common_early_init(void *handle) 
		return -EINVAL;

	}



	amdgpu_device_get_pcie_info(adev);



	return 0;

}

drivers/gpu/drm/amd/amdgpu/soc15.c

+0 −2
Original line number Diff line number Diff line
@@ -691,8 +691,6 @@ static int soc15_common_early_init(void *handle) 
		xgpu_ai_mailbox_set_irq_funcs(adev);

	}



	amdgpu_device_get_pcie_info(adev);



	return 0;

}

drivers/gpu/drm/amd/amdgpu/vi.c

+0 −2
Original line number Diff line number Diff line
@@ -1097,8 +1097,6 @@ static int vi_common_early_init(void *handle) 
		xgpu_vi_mailbox_set_irq_funcs(adev);

	}



	amdgpu_device_get_pcie_info(adev);



	return 0;

}