summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c')
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c
index 0be4506e9ae5..f2539bcf824f 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c
@@ -251,6 +251,13 @@ void amdgpu_dm_update_freesync_state_on_stream(
mod_build_adaptive_sync_infopacket(new_stream, aconn->as_type, NULL,
&new_stream->adaptive_sync_infopacket);
+ } else if (aconn && aconn->vsdb_info.amd_vsdb_version == 3 &&
+ aconn->max_vfreq > 255) {
+ /*
+ * v1 saturates at 255 Hz. Keyed on the sink's max, not the mode's
+ * rate, so the packet version stays fixed per sink.
+ */
+ packet_type = PACKET_TYPE_FS_V3;
}
app_tf = dm_dp_in_hdr_mode(new_stream) ?
@@ -400,8 +407,16 @@ void amdgpu_dm_handle_vrr_transition(struct amdgpu_display_manager *dm,
struct dm_crtc_state *new_state)
{
struct amdgpu_device *adev = dm->adev;
- bool old_vrr_active = amdgpu_dm_crtc_vrr_active(old_state);
- bool new_vrr_active = amdgpu_dm_crtc_vrr_active(new_state);
+ /*
+ * A disabled CRTC keeps its freesync state, but drm_crtc_vblank_get()
+ * fails there because vblank is off. Hold the reference only while
+ * the CRTC is active as well, which also covers resume, where the
+ * reset state lost track of the reference taken before suspend
+ */
+ bool old_vrr_active = old_state->base.active &&
+ amdgpu_dm_crtc_vrr_active(old_state);
+ bool new_vrr_active = new_state->base.active &&
+ amdgpu_dm_crtc_vrr_active(new_state);
/* Only DCE gates vupdate on VRR, keep it enabled for DCN */
bool vrr_gates_vupdate = amdgpu_ip_version(adev, DCE_HWIP, 0) == 0;