OSDN Git Service

drm/amd/display: check for null before calling is_blanked
authorYue Hin Lau <Yuehin.Lau@amd.com>
Tue, 12 Dec 2017 19:34:30 +0000 (14:34 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 20 Dec 2017 19:48:41 +0000 (14:48 -0500)
Signed-off-by: Yue Hin Lau <Yuehin.Lau@amd.com>
Reviewed-by: Eric Bernstein <Eric.Bernstein@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 ab875ea..35e84ed 100644 (file)
@@ -580,7 +580,7 @@ static void program_timing_sync(
                for (j = 0; j < group_size; j++) {
                        struct pipe_ctx *temp;
 
-                       if (!pipe_set[j]->stream_res.tg->funcs->is_blanked(pipe_set[j]->stream_res.tg)) {
+                       if (pipe_set[j]->stream_res.tg->funcs->is_blanked && !pipe_set[j]->stream_res.tg->funcs->is_blanked(pipe_set[j]->stream_res.tg)) {
                                if (j == 0)
                                        break;
 
@@ -593,7 +593,7 @@ static void program_timing_sync(
 
                /* remove any other unblanked pipes as they have already been synced */
                for (j = j + 1; j < group_size; j++) {
-                       if (!pipe_set[j]->stream_res.tg->funcs->is_blanked(pipe_set[j]->stream_res.tg)) {
+                       if (pipe_set[j]->stream_res.tg->funcs->is_blanked && !pipe_set[j]->stream_res.tg->funcs->is_blanked(pipe_set[j]->stream_res.tg)) {
                                group_size--;
                                pipe_set[j] = pipe_set[group_size];
                                j--;