Backmerge tag 'v4.16-rc7' into drm-next

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

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 4f751a9..134069f 100644 (file)
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1575,8 +1575,7 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
        struct edid *override = NULL;
 
        if (connector->override_edid)
-               override = drm_edid_duplicate((const struct edid *)
-                                             connector->edid_blob_ptr->data);
+               override = drm_edid_duplicate(connector->edid_blob_ptr->data);
 
        if (!override)
                override = drm_load_edid_firmware(connector);
@@ -2104,6 +2103,8 @@ drm_mode_std(struct drm_connector *connector, struct edid *edid,
        if (hsize == 1366 && vsize == 768 && vrefresh_rate == 60) {
                mode = drm_cvt_mode(dev, 1366, 768, vrefresh_rate, 0, 0,
                                    false);
+               if (!mode)
+                       return NULL;
                mode->hdisplay = 1366;
                mode->hsync_start = mode->hsync_start - 1;
                mode->hsync_end = mode->hsync_end - 1;
@@ -2788,7 +2789,7 @@ do_detailed_mode(struct detailed_timing *timing, void *c)
 
                drm_mode_probed_add(closure->connector, newmode);
                closure->modes++;
-               closure->preferred = 0;
+               closure->preferred = false;
        }
 }
 
@@ -2805,7 +2806,7 @@ add_detailed_modes(struct drm_connector *connector, struct edid *edid,
        struct detailed_mode_closure closure = {
                .connector = connector,
                .edid = edid,
-               .preferred = 1,
+               .preferred = true,
                .quirks = quirks,
        };