summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2019-10-23 12:02:47 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2019-10-23 12:10:05 +0200
commit2e79e22e092acd55da0b2db066e4826d7d152c41 (patch)
treee7ec9782c0b7831c511af711424126a2b9a4eb07 /drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h
parentf1b4a9217efd61d0b84c6dc404596c8519ff6f59 (diff)
parent7d194c2100ad2a6dded545887d02754948ca5241 (diff)
downloadlinux-2e79e22e092acd55da0b2db066e4826d7d152c41.tar.gz
Merge v5.4-rc4 into drm-next
Thierry needs fd70c7755bf0 ("drm/bridge: tc358767: fix max_tu_symbol value") to be able to merge his dp_link patch series. Some adjacent changes conflicts, plus some clashes in i915 due to cherry-picking and git trying to be helpful and leaving both versions in. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h')
0 files changed, 0 insertions, 0 deletions