diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-10-28 14:59:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-10-28 14:59:38 +1000 |
| commit | 970eae15600a883e4ad27dd0757b18871cc983ab (patch) | |
| tree | 7aeb639a35ca2ab8b54a5987837f8ac5f96ee5f4 /drivers/gpu/drm/amd/display/include/dal_asic_id.h | |
| parent | 27f4432577e4f78bbdf15c104748cc738db8eead (diff) | |
| parent | 3906fe9bb7f1a2c8667ae54e967dc8690824f4ea (diff) | |
BackMerge tag 'v5.15-rc7' into drm-next
The msm next tree is based on rc3, so let's just backmerge rc7 before pulling it in.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/include/dal_asic_id.h')
| -rw-r--r-- | drivers/gpu/drm/amd/display/include/dal_asic_id.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 e4a2dfacab4c..a9974f12f7fb 100644 --- a/drivers/gpu/drm/amd/display/include/dal_asic_id.h +++ b/drivers/gpu/drm/amd/display/include/dal_asic_id.h @@ -228,7 +228,7 @@ enum { #define FAMILY_YELLOW_CARP 146 #define YELLOW_CARP_A0 0x01 -#define YELLOW_CARP_B0 0x20 +#define YELLOW_CARP_B0 0x1A #define YELLOW_CARP_UNKNOWN 0xFF #ifndef ASICREV_IS_YELLOW_CARP |