From 85b98a4c30c60272b2830d9acc43121eb2988bd2 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Tue, 29 Sep 2015 10:24:25 +0300 Subject: [PATCH] drm/i915/ddi: warn instead of oops on invalid ddi encoder type It's more useful to limp on than bring the kernel down. Hitting this is a more likely event with BXT DSI, although care should be taken not to call the function for DSI. Signed-off-by: Jani Nikula Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_ddi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index 0e46679..fdcb456 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -322,8 +322,7 @@ static void ddi_get_encoder_port(struct intel_encoder *intel_encoder, *dig_port = NULL; *port = PORT_E; } else { - DRM_ERROR("Invalid DDI encoder type %d\n", type); - BUG(); + WARN(1, "Invalid DDI encoder type %d\n", type); } } -- 2.7.4