diff options
author | Dave Airlie <airlied@redhat.com> | 2018-07-06 10:44:35 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-07-06 10:44:43 +1000 |
commit | c8440a70bd204b4149971cfaeddc5e9aee72b7b0 (patch) | |
tree | 6450dd152a55ebbb9af1a10c6c900642a4ee4bfc /drivers/gpu/drm/amd/include/atomfirmware.h | |
parent | 0581a5cb06249cb694d5776e8995928e6639d93e (diff) | |
parent | 413ff0b942481c7ac2e800abbbac5af318a65e61 (diff) |
Merge branch 'drm-fixes-4.18' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
- Fix an HDMI 2.0 4k@60 regression
- Hotplug fixes for PX/HG laptops
- Fixes for vbios changes in vega12
- Fix a race in the user fence code
- Fix a couple of misc typos
Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180705155206.2752-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/include/atomfirmware.h')
-rw-r--r-- | drivers/gpu/drm/amd/include/atomfirmware.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/include/atomfirmware.h b/drivers/gpu/drm/amd/include/atomfirmware.h index 092d800b703a..33b4de4ad66e 100644 --- a/drivers/gpu/drm/amd/include/atomfirmware.h +++ b/drivers/gpu/drm/amd/include/atomfirmware.h @@ -1433,7 +1433,10 @@ struct atom_smc_dpm_info_v4_1 uint8_t acggfxclkspreadpercent; uint16_t acggfxclkspreadfreq; - uint32_t boardreserved[10]; + uint8_t Vr2_I2C_address; + uint8_t padding_vr2[3]; + + uint32_t boardreserved[9]; }; /* |