diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2017-07-17 11:43:05 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-07-17 11:56:07 -0400 |
| commit | ef434a0c2ce765ad33026375db7d23aebd5e9532 (patch) | |
| tree | 4bdac59f0bac3a6508741e6bd62da6e770fc3bc1 /drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | |
| parent | dma-buf/fence: Avoid use of uninitialised timestamp (diff) | |
| parent | drm/vc4: Fix VBLANK handling in crtc->enable() path (diff) | |
| download | linux-dev-ef434a0c2ce765ad33026375db7d23aebd5e9532.tar.xz linux-dev-ef434a0c2ce765ad33026375db7d23aebd5e9532.zip | |
Merge branch 'drm-misc-next-fixes' into drm-misc-fixes
Pick up
1ed134e6526b drm/vc4: Fix VBLANK handling in crtc->enable() path
From drm-misc-next-fixes, it was applied after the last pull request
was sent from that branch. We'll send it through drm-fixes instead.
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h index 1912e086c0cf..6e5c5b99593b 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h @@ -185,6 +185,7 @@ struct vega10_vbios_boot_state { uint32_t gfx_clock; uint32_t mem_clock; uint32_t soc_clock; + uint32_t dcef_clock; }; #define DPMTABLE_OD_UPDATE_SCLK 0x00000001 @@ -210,6 +211,7 @@ struct vega10_smc_state_table { PPTable_t pp_table; Watermarks_t water_marks_table; AvfsTable_t avfs_table; + AvfsFuseOverride_t avfs_fuse_override_table; }; struct vega10_mclk_latency_entries { |