Merge tag 'topic/dp-hdmi-2.1-pcon-2020-12-23' of git://anongit.freedesktop.org/drm...

[linux-2.6-block.git] / drivers / gpu / drm / drm_edid.c

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 84be2bbd754993472f2dbcb4f603fa056fee0000..394cc55b321491ad990a5d33c34c513c219a9431 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1844,7 +1844,7 @@ static void connector_bad_edid(struct drm_connector *connector,
        if (connector->bad_edid_counter++ && !drm_debug_enabled(DRM_UT_KMS))
                return;
 
-       drm_warn(connector->dev, "%s: EDID is invalid:\n", connector->name);
+       drm_dbg_kms(connector->dev, "%s: EDID is invalid:\n", connector->name);
        for (i = 0; i < num_blocks; i++) {
                u8 *block = edid + i * EDID_LENGTH;
                char prefix[20];
@@ -1856,7 +1856,7 @@ static void connector_bad_edid(struct drm_connector *connector,
                else
                        sprintf(prefix, "\t[%02x] GOOD ", i);
 
-               print_hex_dump(KERN_WARNING,
+               print_hex_dump(KERN_DEBUG,
                               prefix, DUMP_PREFIX_NONE, 16, 1,
                               block, EDID_LENGTH, false);
        }
@@ -3102,6 +3102,8 @@ static int drm_cvt_modes(struct drm_connector *connector,
 
                height = (cvt->code[0] + ((cvt->code[1] & 0xf0) << 4) + 1) * 2;
                switch (cvt->code[1] & 0x0c) {
+               /* default - because compiler doesn't see that we've enumerated all cases */
+               default:
                case 0x00:
                        width = height * 4 / 3;
                        break;