diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-05-14 13:21:30 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-05-14 13:21:33 +1000 |
| commit | 49eea1c6573a6e31d79783c716b9001c968e5662 (patch) | |
| tree | 6cee26398c8ae357388a570af155b7992f60a441 /drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c | |
| parent | a1fb548962397bb8609bb46e566809a9a1b30044 (diff) | |
| parent | 37e4f052cc9749db608ad63e53acc49354c98200 (diff) | |
| download | linux-49eea1c6573a6e31d79783c716b9001c968e5662.tar.gz linux-49eea1c6573a6e31d79783c716b9001c968e5662.tar.bz2 linux-49eea1c6573a6e31d79783c716b9001c968e5662.zip | |
Merge tag 'amd-drm-next-5.8-2020-05-12' of git://people.freedesktop.org/~agd5f/linux into drm-next
amd-drm-next-5.8-2020-05-12:
amdgpu:
- Misc cleanups
- RAS fixes
- Expose FP16 for modesetting
- DP 1.4 compliance test fixes
- Clockgating fixes
- MAINTAINERS update
- Soft recovery for gfx10
- Runtime PM cleanups
- PSP code cleanups
amdkfd:
- Track GPU memory utilization per process
- Report PCI domain in topology
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200512213703.4039-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c b/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c index 22a5484d9f28..7cd8a43d1889 100644 --- a/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c +++ b/drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c @@ -29,7 +29,6 @@ #include "mod_shared.h" #include "mod_freesync.h" #include "dc.h" -#include "dmub/inc/dmub_cmd_dal.h" enum vsc_packet_revision { vsc_packet_undefined = 0, @@ -145,7 +144,7 @@ void mod_build_vsc_infopacket(const struct dc_stream_state *stream, } /*VSC packet set to 2 when DP revision >= 1.2*/ - if (stream->link->psr_settings.psr_version != PSR_VERSION_UNSUPPORTED) + if (stream->link->psr_settings.psr_version != DC_PSR_VERSION_UNSUPPORTED) vsc_packet_revision = vsc_packet_rev2; /* Update to revision 5 for extended colorimetry support */ |