Commit 53c2ff8b authored by Aaron Liu's avatar Aaron Liu Committed by Alex Deucher
Browse files

drm/amdgpu: support B0&B1 external revision id for yellow carp 



B0 internal rev_id is 0x01, B1 internal rev_id is 0x02.
The external rev_id for B0 and B1 is 0x20.
The original expression is not suitable for B1.

v2: squash in fix for display code (Alex)

Signed-off-by: default avatarAaron Liu <aaron.liu@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 2ef8ea23

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

+1 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,7 @@ static int nv_common_early_init(void *handle) 
			AMD_PG_SUPPORT_VCN_DPG |

			AMD_PG_SUPPORT_JPEG;

		if (adev->pdev->device == 0x1681)

			adev->external_rev_id = adev->rev_id + 0x19;

			adev->external_rev_id = 0x20;

		else

			adev->external_rev_id = adev->rev_id + 0x01;

		break;

drivers/gpu/drm/amd/display/include/dal_asic_id.h

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ enum { 
#define FAMILY_YELLOW_CARP                     146



#define YELLOW_CARP_A0 0x01

#define YELLOW_CARP_B0 0x1A

#define YELLOW_CARP_B0 0x20

#define YELLOW_CARP_UNKNOWN 0xFF



#ifndef ASICREV_IS_YELLOW_CARP