diff options
| author | Charlene Liu <Charlene.Liu@amd.com> | 2022-08-18 20:24:26 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2022-08-29 17:58:48 -0400 |
| commit | b1bdb5ebb06ead49456ae9f23a12c7028076f9cb (patch) | |
| tree | b40708c9abd254dc434bc1494d96940e1595aa56 /drivers/gpu/drm/amd/display/dc/dcn31 | |
| parent | a3cdb5d2c89c8005f50cd4c80c1dc75690e5fc96 (diff) | |
| download | linux-stable-b1bdb5ebb06ead49456ae9f23a12c7028076f9cb.tar.gz linux-stable-b1bdb5ebb06ead49456ae9f23a12c7028076f9cb.tar.bz2 linux-stable-b1bdb5ebb06ead49456ae9f23a12c7028076f9cb.zip | |
drm/amd/display: fix wrong register access
[why]
fw version check was for release branch.
for staging, it has a chance to enter wrong code path.
Reviewed-by: Hansen Dsouza <hansen.dsouza@amd.com>
Acked-by: Brian Chang <Brian.Chang@amd.com>
Signed-off-by: Charlene Liu <Charlene.Liu@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dcn31')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c index a788d160953b..ab70ebd8f223 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dio_link_encoder.c @@ -104,6 +104,9 @@ static bool has_query_dp_alt(struct link_encoder *enc) { struct dc_dmub_srv *dc_dmub_srv = enc->ctx->dmub_srv; + if (enc->ctx->dce_version >= DCN_VERSION_3_15) + return true; + /* Supports development firmware and firmware >= 4.0.11 */ return dc_dmub_srv && !(dc_dmub_srv->dmub->fw_version >= DMUB_FW_VERSION(4, 0, 0) && |