]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915: Mark expected switch fall-throughs
authorGustavo A. R. Silva <gustavo@embeddedor.com>
Thu, 28 Jun 2018 22:35:41 +0000 (17:35 -0500)
committerJani Nikula <jani.nikula@intel.com>
Thu, 5 Jul 2018 13:40:51 +0000 (16:40 +0300)
In preparation to enabling -Wimplicit-fallthrough, mark switch cases
where we are expecting to fall through.

Addresses-Coverity-ID: 141432
Addresses-Coverity-ID: 141433
Addresses-Coverity-ID: 141434
Addresses-Coverity-ID: 141435
Addresses-Coverity-ID: 141436
Addresses-Coverity-ID: 1357360
Addresses-Coverity-ID: 1357403
Addresses-Coverity-ID: 1357433
Addresses-Coverity-ID: 1392622
Addresses-Coverity-ID: 1415273
Addresses-Coverity-ID: 1435752
Addresses-Coverity-ID: 1441500
Addresses-Coverity-ID: 1454596
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180628223541.GA17665@embeddedor.com
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_stolen.c
drivers/gpu/drm/i915/intel_cdclk.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dpll_mgr.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_engine_cs.c
drivers/gpu/drm/i915/intel_runtime_pm.c
drivers/gpu/drm/i915/intel_sdvo.c

index 048b722cf27cfc28ca6800bbf89fb8c4bf149739..0c0a1a959d0bd6481d33be75f3fbf8a54f506ec2 100644 (file)
@@ -2120,6 +2120,7 @@ err:
                 */
                if (!i915_terminally_wedged(&dev_priv->gpu_error))
                        return VM_FAULT_SIGBUS;
+               /* else: fall through */
        case -EAGAIN:
                /*
                 * EAGAIN means the gpu is hung and we'll wait for the error
index 79a347295e006e53de34acbdc8d5e86892ca21bd..055f8687776d0317f6c8363228e63833482c1578 100644 (file)
@@ -254,6 +254,7 @@ static void vlv_get_stolen_reserved(struct drm_i915_private *dev_priv,
        switch (reg_val & GEN7_STOLEN_RESERVED_SIZE_MASK) {
        default:
                MISSING_CASE(reg_val & GEN7_STOLEN_RESERVED_SIZE_MASK);
+               /* fall through */
        case GEN7_STOLEN_RESERVED_1M:
                *size = 1024 * 1024;
                break;
index bf9433d7964dc1dcea37c9e75376f93d8c20721a..29075c763428055ddb3625a80b59643e694f3d76 100644 (file)
@@ -316,6 +316,7 @@ static void pnv_get_cdclk(struct drm_i915_private *dev_priv,
                break;
        default:
                DRM_ERROR("Unknown pnv display core clock 0x%04x\n", gcfgc);
+               /* fall through */
        case GC_DISPLAY_CLOCK_133_MHZ_PNV:
                cdclk_state->cdclk = 133333;
                break;
@@ -1797,6 +1798,7 @@ static int icl_calc_cdclk(int min_cdclk, unsigned int ref)
        switch (ref) {
        default:
                MISSING_CASE(ref);
+               /* fall through */
        case 24000:
                ranges = ranges_24;
                break;
@@ -1824,6 +1826,7 @@ static int icl_calc_cdclk_pll_vco(struct drm_i915_private *dev_priv, int cdclk)
        switch (cdclk) {
        default:
                MISSING_CASE(cdclk);
+               /* fall through */
        case 307200:
        case 556800:
        case 652800:
@@ -1896,6 +1899,7 @@ static u8 icl_calc_voltage_level(int cdclk)
                return 1;
        default:
                MISSING_CASE(cdclk);
+               /* fall through */
        case 652800:
        case 648000:
                return 2;
@@ -1913,6 +1917,7 @@ static void icl_get_cdclk(struct drm_i915_private *dev_priv,
        switch (val & ICL_DSSM_CDCLK_PLL_REFCLK_MASK) {
        default:
                MISSING_CASE(val);
+               /* fall through */
        case ICL_DSSM_CDCLK_PLL_REFCLK_24MHz:
                cdclk_state->ref = 24000;
                break;
index 0319825b725ba158b6d9d9c64d4b741772b3e4b2..c74b01a52082b8cff480ca304cf159c6a625eddd 100644 (file)
@@ -1069,6 +1069,7 @@ static uint32_t icl_pll_to_ddi_pll_sel(struct intel_encoder *encoder,
        switch (id) {
        default:
                MISSING_CASE(id);
+               /* fall through */
        case DPLL_ID_ICL_DPLL0:
        case DPLL_ID_ICL_DPLL1:
                return DDI_CLK_SEL_NONE;
index ce7646265b503eb34b33b393d6fe70a910a022f3..12102224f47ae24ac15faea3482f7e7d989ea3d5 100644 (file)
@@ -9360,6 +9360,7 @@ static bool hsw_get_transcoder_state(struct intel_crtc *crtc,
                switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {
                default:
                        WARN(1, "unknown pipe linked to edp transcoder\n");
+                       /* fall through */
                case TRANS_DDI_EDP_INPUT_A_ONOFF:
                case TRANS_DDI_EDP_INPUT_A_ON:
                        trans_edp_pipe = PIPE_A;
@@ -11024,6 +11025,7 @@ static bool check_digital_port_conflicts(struct drm_atomic_state *state)
                case INTEL_OUTPUT_DDI:
                        if (WARN_ON(!HAS_DDI(to_i915(dev))))
                                break;
+                       /* else: fall through */
                case INTEL_OUTPUT_DP:
                case INTEL_OUTPUT_HDMI:
                case INTEL_OUTPUT_EDP:
index 57342364fd305ee10c5bdf6566274644cb54c2a8..058696b7d6c375e1d1d4f3e959aa9138b953cecc 100644 (file)
@@ -2566,6 +2566,7 @@ int icl_calc_dp_combo_pll_link(struct drm_i915_private *dev_priv,
        switch (index) {
        default:
                MISSING_CASE(index);
+               /* fall through */
        case 0:
                link_clock = 540000;
                break;
@@ -2639,6 +2640,7 @@ static bool icl_mg_pll_find_divisors(int clock_khz, bool is_dp, bool use_ssc,
                        switch (div1) {
                        default:
                                MISSING_CASE(div1);
+                               /* fall through */
                        case 2:
                                hsdiv = 0;
                                break;
@@ -2903,6 +2905,7 @@ static i915_reg_t icl_pll_id_to_enable_reg(enum intel_dpll_id id)
        switch (id) {
        default:
                MISSING_CASE(id);
+               /* fall through */
        case DPLL_ID_ICL_DPLL0:
        case DPLL_ID_ICL_DPLL1:
                return CNL_DPLL_ENABLE(id);
index a8073eb02ffa6692039c7a91f257858cdb2c1c30..cdfdebc11ef80ff6db11881cb1230b107e1c1635 100644 (file)
@@ -1253,6 +1253,7 @@ enc_to_dig_port(struct drm_encoder *encoder)
        switch (intel_encoder->type) {
        case INTEL_OUTPUT_DDI:
                WARN_ON(!HAS_DDI(to_i915(encoder->dev)));
+               /* fall through */
        case INTEL_OUTPUT_DP:
        case INTEL_OUTPUT_EDP:
        case INTEL_OUTPUT_HDMI:
index 01862884a4360f6bedbb211c448fa2cce454e943..478c928912c4c3b90603f57b2ef41208d771d035 100644 (file)
@@ -229,6 +229,7 @@ __intel_engine_context_size(struct drm_i915_private *dev_priv, u8 class)
                break;
        default:
                MISSING_CASE(class);
+               /* fall through */
        case VIDEO_DECODE_CLASS:
        case VIDEO_ENHANCEMENT_CLASS:
        case COPY_ENGINE_CLASS:
index d81b2cfe1c5ed5f2ef2805da71a98f1612c43c1f..6b5aa3b074ecc8ffb11ae61ead04bc2ea0ee7bb2 100644 (file)
@@ -3212,6 +3212,7 @@ static void cnl_set_procmon_ref_values(struct drm_i915_private *dev_priv,
        switch (val & (PROCESS_INFO_MASK | VOLTAGE_INFO_MASK)) {
        default:
                MISSING_CASE(val);
+               /* fall through */
        case VOLTAGE_INFO_0_85V | PROCESS_INFO_DOT_0:
                procmon = &cnl_procmon_values[PROCMON_0_85V_DOT_0];
                break;
index 9d9229a1f36ccdff0c46b6dcc06930be69bac840..36f81a96b8f642129f96fe085b00566a20ca2b73 100644 (file)
@@ -1340,6 +1340,7 @@ static void intel_sdvo_pre_enable(struct intel_encoder *intel_encoder,
        switch (crtc_state->pixel_multiplier) {
        default:
                WARN(1, "unknown pixel multiplier specified\n");
+               /* fall through */
        case 1: rate = SDVO_CLOCK_RATE_MULT_1X; break;
        case 2: rate = SDVO_CLOCK_RATE_MULT_2X; break;
        case 4: rate = SDVO_CLOCK_RATE_MULT_4X; break;
@@ -2316,14 +2317,19 @@ intel_sdvo_guess_ddc_bus(struct intel_sdvo *sdvo)
        switch (sdvo->controlled_output) {
        case SDVO_OUTPUT_LVDS1:
                mask |= SDVO_OUTPUT_LVDS1;
+               /* fall through */
        case SDVO_OUTPUT_LVDS0:
                mask |= SDVO_OUTPUT_LVDS0;
+               /* fall through */
        case SDVO_OUTPUT_TMDS1:
                mask |= SDVO_OUTPUT_TMDS1;
+               /* fall through */
        case SDVO_OUTPUT_TMDS0:
                mask |= SDVO_OUTPUT_TMDS0;
+               /* fall through */
        case SDVO_OUTPUT_RGB1:
                mask |= SDVO_OUTPUT_RGB1;
+               /* fall through */
        case SDVO_OUTPUT_RGB0:
                mask |= SDVO_OUTPUT_RGB0;
                break;