diff options
| author | Harry Wentland <harry.wentland@amd.com> | 2017-02-03 11:45:43 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 17:13:47 -0400 |
| commit | f7f3cfee084b0c68789e2b4231b0d3de3466a52b (patch) | |
| tree | 878f2497653bfcd20bdb2b56ad8bd46160c70613 /drivers/gpu | |
| parent | 94cd1f79b05994b712a2cf0563ac73be0323978b (diff) | |
drm/amd/display: fix crash with modesetting driver
They might call commit with ACTION_NOTHING without a mode.
We shouldn't crash but simply skip updating stream scaling
settings since scaling obviously didn't change without a
provided mode.
Signed-off-by: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c index ad60a28975ca..fdb264c6e859 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c @@ -638,6 +638,10 @@ static void update_stream_scaling_settings( struct rect src = { 0 }; /* viewport in composition space*/ struct rect dst = { 0 }; /* stream addressable area */ + /* no mode. nothing to be done */ + if (!mode) + return; + /* Full screen scaling by default */ src.width = mode->hdisplay; src.height = mode->vdisplay; |