From: Jani Nikula <jani.nikula@intel.com>
Date: Tue, 29 Sep 2015 07:24:25 +0000 (+0300)
Subject: drm/i915/ddi: warn instead of oops on invalid ddi encoder type
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=85b98a4c30c60272b2830d9acc43121eb2988bd2;p=linux-beck.git

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 <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 0e46679fde5a..fdcb4562c8ce 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);
 	}
 }