aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Wentland <harry.wentland@amd.com>2018-02-13 11:07:43 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-03-05 15:36:24 -0500
commitc827206f7f78a33eff9496201c4122c246c87db3 (patch)
tree09cbd3fa39084457f7c1d0b2a74220fd7e0e882d
parentdrm/amd/display: validate plane in dce110 for scaling (diff)
downloadlinux-dev-c827206f7f78a33eff9496201c4122c246c87db3.tar.xz
linux-dev-c827206f7f78a33eff9496201c4122c246c87db3.zip
drm/amd/display: Don't blow up if TG is NULL in dce110_vblank_set
Signed-off-by: Harry Wentland <harry.wentland@amd.com> Reviewed-by: Roman Li <Roman.Li@amd.com> Acked-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
index 9bc1c1d90bad..afe0876fe6f8 100644
--- a/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
+++ b/drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c
@@ -208,7 +208,7 @@ bool dce110_vblank_set(struct irq_service *irq_service,
core_dc->current_state->res_ctx.pipe_ctx[pipe_offset].stream_res.tg;
if (enable) {
- if (!tg->funcs->arm_vert_intr(tg, 2)) {
+ if (!tg || !tg->funcs->arm_vert_intr(tg, 2)) {
DC_ERROR("Failed to get VBLANK!\n");
return false;
}