diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-26 13:55:17 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-26 13:55:17 +0300 |
commit | 71e69d7adee10a55b817df748dec5bfec7bf4c30 (patch) | |
tree | ac342851e20df5a5f7891cc603998b654d26724c /drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | |
parent | 03b1292d1c0ea195e025e667555d74db7da82026 (diff) | |
parent | ff1176468d368232b684f75e82563369208bc371 (diff) | |
download | linux-71e69d7adee10a55b817df748dec5bfec7bf4c30.tar.xz |
Merge 5.14-rc3 into char-misc-next
We need the char-misc fixes from 5.14-rc3 into here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/amd/pm/inc/smu_v11_0.h')
-rw-r--r-- | drivers/gpu/drm/amd/pm/inc/smu_v11_0.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h index 1962a5877191..f61b5c914a3d 100644 --- a/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h +++ b/drivers/gpu/drm/amd/pm/inc/smu_v11_0.h @@ -34,7 +34,7 @@ #define SMU11_DRIVER_IF_VERSION_Navy_Flounder 0xE #define SMU11_DRIVER_IF_VERSION_VANGOGH 0x03 #define SMU11_DRIVER_IF_VERSION_Dimgrey_Cavefish 0xF -#define SMU11_DRIVER_IF_VERSION_Beige_Goby 0x9 +#define SMU11_DRIVER_IF_VERSION_Beige_Goby 0xD /* MP Apertures */ #define MP0_Public 0x03800000 |