drm/i915/ddi: warn instead of oops on invalid ddi encoder type
Subsystems (2)
PATCH 1/2 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 <[email protected]>
--- drivers/gpu/drm/i915/intel_ddi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +1 -2
@@ -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); } }
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/ddi: use switch case instead of if ladder for ddi_get_encoder_port
Make the alternatives stand out better.
Signed-off-by Jani Nikula <[email protected]>
--- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_ddi.c +13 -7
@@ -309,20 +309,26 @@ static void ddi_get_encoder_port(struct intel_encoder *intel_encoder, enum port *port) {struct drm_encoder *encoder = &intel_encoder->base; -int type = intel_encoder->type; -if (type ==INTEL_OUTPUT_DP_MST ) { +switch (intel_encoder->type) { +case INTEL_OUTPUT_DP_MST : *dig_port =enc_to_mst (encoder)->primary; *port = (*dig_port)->port; - }else if (type ==INTEL_OUTPUT_DISPLAYPORT || type ==INTEL_OUTPUT_EDP || - type ==INTEL_OUTPUT_HDMI || type ==INTEL_OUTPUT_UNKNOWN ) { +break ; +case INTEL_OUTPUT_DISPLAYPORT : +case INTEL_OUTPUT_EDP : +case INTEL_OUTPUT_HDMI : +case INTEL_OUTPUT_UNKNOWN : *dig_port =enc_to_dig_port (encoder); *port = (*dig_port)->port; - }else if (type ==INTEL_OUTPUT_ANALOG ) { +break ; +case INTEL_OUTPUT_ANALOG : *dig_port =NULL ; *port =PORT_E ; - }else { -WARN (1 ,"Invalid DDI encoder type %d\n" , type); +break ; +default : +WARN (1 ,"Invalid DDI encoder type %d\n" , intel_encoder->type); +break ; } }
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915/ddi: use switch case instead of if ladder for ddi_get_encoder_port
Quoted 3 lines · Jani Nikula
Make the alternatives stand out better.
Signed-off-by Jani Nikula <[email protected]>
Both applied to dinq.
-Daniel
Quoted 49 lines
--- drivers/gpu/drm/i915/intel_ddi.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/intel_ddi.c +13
-7@@ -309,20 +309,26 @@ static void ddi_get_encoder_port(struct intel_encoder *intel_encoder, enum port *port) {struct drm_encoder *encoder = &intel_encoder->base; -int type = intel_encoder->type; -if (type ==INTEL_OUTPUT_DP_MST ) { +switch (intel_encoder->type) { +case INTEL_OUTPUT_DP_MST : *dig_port =enc_to_mst (encoder)->primary; *port = (*dig_port)->port; - }else if (type ==INTEL_OUTPUT_DISPLAYPORT || type ==INTEL_OUTPUT_EDP || - type ==INTEL_OUTPUT_HDMI || type ==INTEL_OUTPUT_UNKNOWN ) { +break ; +case INTEL_OUTPUT_DISPLAYPORT : +case INTEL_OUTPUT_EDP : +case INTEL_OUTPUT_HDMI : +case INTEL_OUTPUT_UNKNOWN : *dig_port =enc_to_dig_port (encoder); *port = (*dig_port)->port; - }else if (type ==INTEL_OUTPUT_ANALOG ) { +break ; +case INTEL_OUTPUT_ANALOG : *dig_port =NULL ; *port =PORT_E ; - }else { -WARN (1 ,"Invalid DDI encoder type %d\n" , type); +break ; +default : +WARN (1 ,"Invalid DDI encoder type %d\n" , intel_encoder->type); +break ; } }Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx