On 2022-02-17 10:24, Jasdeep Dhillon wrote:
> This reverts commit e4a10691948030fc92b11b563cf62144d8d7cb8b.
>
It would be good to have a commit description here that mentions
that this is reverting the wrong device ID definition.
> Signed-off-by: Jasdeep Dhillon <jdhillon@xxxxxxx>
Either way, this is
Reviewed-by: Harry Wentland <harry.wentland@xxxxxxx>
Harry
> ---
> drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +-
> drivers/gpu/drm/amd/display/include/dal_asic_id.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> index a2a25d444574..0d0df7271732 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
> @@ -135,7 +135,7 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
>
> case FAMILY_NV:
> dc_version = DCN_VERSION_2_0;
> - if (asic_id.chip_id == DEVICE_ID_NV_13FE || asic_id.chip_id == DEVICE_ID_NV_1400) {
> + if (asic_id.chip_id == DEVICE_ID_NV_13FE || asic_id.chip_id == DEVICE_ID_NV_143F) {
> dc_version = DCN_VERSION_2_01;
> break;
> }
> diff --git a/drivers/gpu/drm/amd/display/include/dal_asic_id.h b/drivers/gpu/drm/amd/display/include/dal_asic_id.h
> index a8dcd6d439c6..e672be6327cb 100644
> --- a/drivers/gpu/drm/amd/display/include/dal_asic_id.h
> +++ b/drivers/gpu/drm/amd/display/include/dal_asic_id.h
> @@ -212,7 +212,7 @@ enum {
> #define ASICREV_IS_GREEN_SARDINE(eChipRev) ((eChipRev >= GREEN_SARDINE_A0) && (eChipRev < 0xFF))
> #endif
> #define DEVICE_ID_NV_13FE 0x13FE // CYAN_SKILLFISH
> -#define DEVICE_ID_NV_1400 0x1400
> +#define DEVICE_ID_NV_143F 0x143F
> #define FAMILY_VGH 144
> #define DEVICE_ID_VGH_163F 0x163F
> #define VANGOGH_A0 0x01
