Revert "drm/amd/display: Set RMX_ASPECT as default"

This reverts commit 91b66c47ba3468f7882ea4a84d5e0e0c186b638f.

Forcing RMX_ASPECT as default uses the preferred/native mode's timings
for any mode the user selects and scales the image. This provides a
a consistently nicer result in the case where the selected mode's
refresh rate matches the native mode's refresh but this isn't always
the case.

For example, if the monitor is 1080p@144Hz and the preferred mode is
60Hz then even if the user selects 1080p@144Hz as their selected mode
they'll get 1080p@60Hz.

Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 943d1ae1de151229cb43840a31993cb24e937b71..f8d2423cc19dba18edc490a58cbb2178cfdeee81 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3100,10 +3100,8 @@ int amdgpu_dm_connector_atomic_set_property(struct drm_connector *connector,
                        rmx_type = RMX_FULL;
                        break;
                case DRM_MODE_SCALE_NONE:
-                       rmx_type = RMX_OFF;
-                       break;
                default:
-                       rmx_type = RMX_ASPECT;
+                       rmx_type = RMX_OFF;
                        break;
                }
 
@@ -3216,7 +3214,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)
        state = kzalloc(sizeof(*state), GFP_KERNEL);
 
        if (state) {
-               state->scaling = RMX_ASPECT;
+               state->scaling = RMX_OFF;
                state->underscan_enable = false;
                state->underscan_hborder = 0;
                state->underscan_vborder = 0;