diff mbox

udl: handle EDID failure properly.

Message ID 1365737158-8868-1-git-send-email-airlied@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dave Airlie April 12, 2013, 3:25 a.m. UTC
Don't oops seems proper.

Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/udl/udl_connector.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Alex Deucher April 12, 2013, 1:13 p.m. UTC | #1
On Thu, Apr 11, 2013 at 11:25 PM, Dave Airlie <airlied@gmail.com> wrote:
> Don't oops seems proper.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Dave Airlie <airlied@redhat.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/udl/udl_connector.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
> index fe5cdbc..b44d548 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;
> +       }
>
>         /*
>          * We only read the main block, but if the monitor reports extension
> --
> 1.8.2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index fe5cdbc..b44d548 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;
+	}
 
 	/*
 	 * We only read the main block, but if the monitor reports extension