]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
drm/amd/display: Handle case when stream not found in set_dpms
authorEric Yang <Eric.Yang2@amd.com>
Tue, 3 Oct 2017 22:15:51 +0000 (18:15 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 21 Oct 2017 20:48:05 +0000 (16:48 -0400)
When validate with context fail to add stream to the context, we have
a case where set_dpms won't be able to find the stream that need to
be disabled.

Signed-off-by: Eric Yang <Eric.Yang2@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/core/dc.c

index 4cdb855ef8558d8cac91fe0a1334eb59843279c7..fe66c6a21bc3f7be0401759bbec1d0f1962e4ce6 100644 (file)
@@ -363,7 +363,7 @@ void set_dpms(
        struct dc_stream_state *stream,
        bool dpms_off)
 {
-       struct pipe_ctx *pipe_ctx;
+       struct pipe_ctx *pipe_ctx = NULL;
        int i;
 
        for (i = 0; i < MAX_PIPES; i++) {
@@ -373,6 +373,11 @@ void set_dpms(
                }
        }
 
+       if (!pipe_ctx) {
+               ASSERT(0);
+               return;
+       }
+
        if (stream->dpms_off != dpms_off) {
                stream->dpms_off = dpms_off;
                if (dpms_off)