| From d942856865c733ff60450de9691af796ad71d7bc Mon Sep 17 00:00:00 2001 |
| From: Charlene Liu <Charlene.Liu@amd.com> |
| Date: Mon, 20 Sep 2021 14:30:02 -0400 |
| Subject: drm/amd/display: Pass PCI deviceid into DC |
| |
| From: Charlene Liu <Charlene.Liu@amd.com> |
| |
| commit d942856865c733ff60450de9691af796ad71d7bc upstream. |
| |
| [why] |
| pci deviceid not passed to dal dc, without proper break, |
| dcn2.x falls into dcn3.x code path |
| |
| [how] |
| pass in pci deviceid, and break once dal_version initialized. |
| |
| Reviewed-by: Zhan Liu <Zhan.Liu@amd.com> |
| Acked-by: Anson Jacob <Anson.Jacob@amd.com> |
| Signed-off-by: Charlene Liu <Charlene.Liu@amd.com> |
| Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |
| +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c |
| @@ -951,6 +951,7 @@ static int amdgpu_dm_init(struct amdgpu_ |
| |
| init_data.asic_id.pci_revision_id = adev->pdev->revision; |
| init_data.asic_id.hw_internal_rev = adev->external_rev_id; |
| + init_data.asic_id.chip_id = adev->pdev->device; |
| |
| init_data.asic_id.vram_width = adev->gmc.vram_width; |
| /* TODO: initialize init_data.asic_id.vram_type here!!!! */ |
