Patchwork [3.5.y.z,extended,stable] Patch "udl: handle EDID failure properly." has been added to staging queue

login
register
mail settings
Submitter Luis Henriques
Date April 17, 2013, 2:43 p.m.
Message ID <1366209827-15797-1-git-send-email-luis.henriques@canonical.com>
Download mbox | patch
Permalink /patch/237249/
State New
Headers show

Comments

Luis Henriques - April 17, 2013, 2:43 p.m.
This is a note to let you know that I have just added a patch titled

    udl: handle EDID failure properly.

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

From 85713c0d115b537c234aca5485f9363c66d05af6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@gmail.com>
Date: Fri, 12 Apr 2013 13:25:20 +1000
Subject: [PATCH] udl: handle EDID failure properly.

commit 1baee58638fc58248625255f5c5fcdb987f11b1f upstream.

Don't oops seems proper.

Signed-off-by: Dave Airlie <airlied@redhat.com>
[ luis: adjust context ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 drivers/gpu/drm/udl/udl_connector.c | 4 ++++
 1 file changed, 4 insertions(+)

--
1.8.1.2

Patch

diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index 3234224..b8e6463 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -61,6 +61,10 @@  static int udl_get_modes(struct drm_connector *connector)
 	int ret;

 	edid = (struct edid *)udl_get_edid(udl);
+	if (!edid) {
+		drm_mode_connector_update_edid_property(connector, NULL);
+		return 0;
+	}

 	connector->display_info.raw_edid = (char *)edid;