drm/i915/ddi: Silence compiler warning for unknown output type
authorChris Wilson <chris@chris-wilson.co.uk>
Sun, 3 Apr 2016 20:59:14 +0000 (21:59 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 4 Apr 2016 07:25:52 +0000 (08:25 +0100)
Silences

src/drivers/gpu/drm/i915/intel_ddi.c: warning: 'port' may be used uninitialized in this function [-Wuninitialized]

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459717154-27607-1-git-send-email-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/intel_ddi.c

index 766156f88ef4a91f109790f06a75b6e24ab28d48..921edf183d226f9b2606be88f8367542347052e0 100644 (file)
@@ -315,6 +315,9 @@ static void ddi_get_encoder_port(struct intel_encoder *intel_encoder,
                *dig_port = enc_to_mst(encoder)->primary;
                *port = (*dig_port)->port;
                break;
+       default:
+               WARN(1, "Invalid DDI encoder type %d\n", intel_encoder->type);
+               /* fallthrough and treat as unknown */
        case INTEL_OUTPUT_DISPLAYPORT:
        case INTEL_OUTPUT_EDP:
        case INTEL_OUTPUT_HDMI:
@@ -326,9 +329,6 @@ static void ddi_get_encoder_port(struct intel_encoder *intel_encoder,
                *dig_port = NULL;
                *port = PORT_E;
                break;
-       default:
-               WARN(1, "Invalid DDI encoder type %d\n", intel_encoder->type);
-               break;
        }
 }