Skip to contentSkip to conversation

EDID leaks kernel memory

BUG Applied Russell King - ARM Linux 4 participants 10 messages Aug 11, 2012 – Aug 22, 2012

Subsystems (10)
DRM drivers DRM misc Staging Intel i915 +6 more subsystems
lore
Share & tools
lore

Russell King - ARM Linux

author
#0 lore raw

Hi,

While looking at the kernel DRM code, I've noticed that in many places we kmalloc() memory to store the raw EDID information, whether it be from a DDC adapter, or loaded from firmware.

Nowhere can I find where this memory is freed. It seems in several places that we assign it into connector->display_info.raw_edid, and next time we obtain EDID information, we re-kmalloc and overwrite this pointer.

Note that some drivers do kfree() this memory themselves after blindly setting connector->display_info.raw_edid to NULL...

Can someone please point me to where this memory is freed? If not, I'll cook up a patch to add some kfree's.

Thanks.

#1 lore raw
Quoted 11 lines · Russell King - ARM Linux

Hi,

While looking at the kernel DRM code, I've noticed that in many places we kmalloc() memory to store the raw EDID information, whether it be from a DDC adapter, or loaded from firmware.

Nowhere can I find where this memory is freed. It seems in several places that we assign it into connector->display_info.raw_edid, and next time we obtain EDID information, we re-kmalloc and overwrite this pointer.

Quoted 5 lines

Note that some drivers do kfree() this memory themselves after blindly setting connector->display_info.raw_edid to NULL...

Can someone please point me to where this memory is freed? If not, I'll cook up a patch to add some kfree's.

Afaik the right thing is to simply kill the raw_edid pointer and handle the edid kmalloc simple as some temp storage fully controlled by the drivers.

I've volunteered Jani from our team to cook up a few patches to handle this.

Yours, Daniel

Signature · 2 lines
Daniel Vetter
[email protected] - +41 (0) 79 364 57 48 - http://blog.ffwll.ch
#2 lore raw

cover remove raw_edid, and fix related memory leaks

Hi, this series addresses the EDID related memory leaks [1] by removing raw_edid altogether. Applies on drm-fixes. Please review.

BR,
Jani.

[1] http://mid.gmane.org/[email protected]

Jani Nikula (4):
drm/i915: fix EDID memory leak in SDVO
drm/ast: fix EDID memory leak
drm/exynos: fix EDID memory leak in HDMI
drm: remove the raw_edid field from struct drm_display_info

 drivers/gpu/drm/ast/ast_mode.c                |    1 +
 drivers/gpu/drm/drm_edid.c                    |    3 ---
 drivers/gpu/drm/drm_edid_load.c               |   23 +++++++++++++----------
 drivers/gpu/drm/exynos/exynos_drm_connector.c |    4 +---
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      |   13 -------------
 drivers/gpu/drm/exynos/exynos_hdmi.c          |    1 +
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c       |    2 --
 drivers/gpu/drm/gma500/oaktrail_hdmi.c        |    1 -
 drivers/gpu/drm/gma500/psb_intel_sdvo.c       |    3 ---
 drivers/gpu/drm/i915/intel_dp.c               |    4 ----
 drivers/gpu/drm/i915/intel_hdmi.c             |    3 ---
 drivers/gpu/drm/i915/intel_modes.c            |    1 -
 drivers/gpu/drm/i915/intel_sdvo.c             |    4 +---
 drivers/gpu/drm/mgag200/mgag200_mode.c        |    1 -
 drivers/gpu/drm/udl/udl_connector.c           |    3 ---
 drivers/staging/omapdrm/omap_connector.c      |    5 +----
 include/drm/drm_crtc.h                        |    2 --
 17 files changed, 18 insertions(+), 56 deletions(-)
Signature · 1 line
1.7.4.1
#3 lore raw

PATCH 1/4 drm/i915: fix EDID memory leak in SDVO

The EDID returned by drm_get_edid() was never freed.

Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/i915/intel_sdvo.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/gpu/drm/i915/intel_sdvo.c +1 -0
index d172e98..d81bb0b 100644
@@ -1692,6 +1692,7 @@ static bool intel_sdvo_detect_hdmi_audio(struct drm_connector *connector)
 	edid = intel_sdvo_get_edid(connector);
 	if (edid != NULL && edid->input & DRM_EDID_INPUT_DIGITAL)
 		has_audio = drm_detect_monitor_audio(edid);
+	kfree(edid);
 
 	return has_audio;
 }
Signature · 1 line
1.7.4.1
Applied
#4 lore raw

Re: [PATCH 1/4] drm/i915: fix EDID memory leak in SDVO

Quoted 3 lines · Jani Nikula

The EDID returned by drm_get_edid() was never freed.

Signed-off-by Jani Nikula <[email protected]>

Picked up for -fixes, thanks for the patch.
-Daniel

Signature · 3 lines
Daniel Vetter
Mail: [email protected]
Mobile: +41 (0)79 365 57 48
#5 lore raw

PATCH 2/4 drm/ast: fix EDID memory leak

In reply to Jani Nikula

The EDID returned by drm_get_edid() was never freed.

Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/ast/ast_mode.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/gpu/drm/ast/ast_mode.c +1 -0
index 7282c08..866e9d4 100644
@@ -737,6 +737,7 @@ static int ast_get_modes(struct drm_connector *connector)
 	if (edid) {
 		drm_mode_connector_update_edid_property(&ast_connector->base, edid);
 		ret = drm_add_edid_modes(connector, edid);
+		kfree(edid);
 		return ret;
 	} else
 		drm_mode_connector_update_edid_property(&ast_connector->base, NULL);
Signature · 1 line
1.7.4.1
#6 lore raw

PATCH 3/4 drm/exynos: fix EDID memory leak in HDMI

In reply to Jani Nikula

The EDID returned by drm_get_edid() was never freed.

Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/exynos/exynos_hdmi.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/gpu/drm/exynos/exynos_hdmi.c +1 -0
index 409e2ec..b55335b 100644
@@ -1282,6 +1282,7 @@ static int hdmi_get_edid(void *ctx, struct drm_connector *connector,
 		DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n",
 			(hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
 			raw_edid->width_cm, raw_edid->height_cm);
+		kfree(raw_edid);
 	} else {
 		return -ENODEV;
 	}
Signature · 1 line
1.7.4.1
maintainer Applied
#7 lore raw

Re: [PATCH 3/4] drm/exynos: fix EDID memory leak in HDMI

2012/8/15 Jani Nikula <[email protected]>:

Quoted 12 lines

The EDID returned by drm_get_edid() was never freed.

Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/exynos/exynos_hdmi.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/gpu/drm/exynos/exynos_hdmi.c +0 -0
index 409e2ec..b55335b 100644

drivers/gpu/drm/exynos/exynos_hdmi.c static int hdmi_get_edid(void *ctx, struct drm_connector *connector, · line 1285

Quoted 4 lines
drivers/gpu/drm/exynos/exynos_hdmi.c +1 -0
@@ -1282,6 +1282,7 @@ static int hdmi_get_edid(void *ctx, struct drm_connector *connector,
                DRM_DEBUG_KMS("%s : width[%d] x height[%d]\n",
                        (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
                        raw_edid->width_cm, raw_edid->height_cm);
+               kfree(raw_edid);

Applied, Thanks.

Quoted 10 lines
drivers/gpu/drm/exynos/exynos_hdmi.c +0 -1
        } else {
                return -ENODEV;
        }
--

1.7.4.1

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

#8 lore raw

PATCH 4/4 drm: remove the raw_edid field from struct drm_display_info

In reply to Jani Nikula

Neither the drm core nor any of the drivers really need the raw_edid field of struct drm_display_info for anything. Instead of being useful, it creates confusion about who is responsible for freeing the memory it points to and setting the field to NULL afterwards, leading to memory leaks and dangling pointers.

Remove the raw_edid field, and fix drivers as necessary.

Reported-by Russell King <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/drm_edid.c                    |    3 ---
 drivers/gpu/drm/drm_edid_load.c               |   23 +++++++++++++----------
 drivers/gpu/drm/exynos/exynos_drm_connector.c |    4 +---
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      |   13 -------------
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c       |    2 --
 drivers/gpu/drm/gma500/oaktrail_hdmi.c        |    1 -
 drivers/gpu/drm/gma500/psb_intel_sdvo.c       |    3 ---
 drivers/gpu/drm/i915/intel_dp.c               |    4 ----
 drivers/gpu/drm/i915/intel_hdmi.c             |    3 ---
 drivers/gpu/drm/i915/intel_modes.c            |    1 -
 drivers/gpu/drm/i915/intel_sdvo.c             |    3 ---
 drivers/gpu/drm/mgag200/mgag200_mode.c        |    1 -
 drivers/gpu/drm/udl/udl_connector.c           |    3 ---
 drivers/staging/omapdrm/omap_connector.c      |    5 +----
 include/drm/drm_crtc.h                        |    2 --
 15 files changed, 15 insertions(+), 56 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -3
index a8743c3..bcc4725 100644
@@ -399,10 +399,7 @@ struct edid *drm_get_edid(struct drm_connector *connector,
 	if (drm_probe_ddc(adapter))
 		edid = (struct edid *)drm_do_get_edid(connector, adapter);
 
-	connector->display_info.raw_edid = (char *)edid;
-
 	return edid;
-
 }
 EXPORT_SYMBOL(drm_get_edid);
drivers/gpu/drm/drm_edid_load.c +13 -10
index 0303935..186832e 100644
@@ -114,8 +114,8 @@ static u8 generic_edid[GENERIC_EDIDS][128] = {
 	},
 };
 
-static int edid_load(struct drm_connector *connector, char *name,
-		     char *connector_name)
+static u8 *edid_load(struct drm_connector *connector, char *name,
+			char *connector_name)
 {
 	const struct firmware *fw;
 	struct platform_device *pdev;

@@ -205,7 +205,6 @@ static int edid_load(struct drm_connector *connector, char *name,
 		edid = new_edid;
 	}
 
-	connector->display_info.raw_edid = edid;
 	DRM_INFO("Got %s EDID base block and %d extension%s from "
 	    "\"%s\" for connector \"%s\"\n", builtin ? "built-in" :
 	    "external", valid_extensions, valid_extensions == 1 ? "" : "s",

@@ -215,7 +214,10 @@ relfw_out:
 	release_firmware(fw);
 
 out:
-	return err;
+	if (err)
+		return ERR_PTR(err);
+
+	return edid;
 }
 
 int drm_load_edid_firmware(struct drm_connector *connector)

@@ -223,6 +225,7 @@ int drm_load_edid_firmware(struct drm_connector *connector)
 	char *connector_name = drm_get_connector_name(connector);
 	char *edidname = edid_firmware, *last, *colon;
 	int ret;
+	struct edid *edid;
 
 	if (*edidname == '\0')
 		return 0;

@@ -240,13 +243,13 @@ int drm_load_edid_firmware(struct drm_connector *connector)
 	if (*last == '\n')
 		*last = '\0';
 
-	ret = edid_load(connector, edidname, connector_name);
-	if (ret)
+	edid = (struct edid *) edid_load(connector, edidname, connector_name);
+	if (IS_ERR_OR_NULL(edid))
 		return 0;
 
-	drm_mode_connector_update_edid_property(connector,
-	    (struct edid *) connector->display_info.raw_edid);
+	drm_mode_connector_update_edid_property(connector, edid);
+	ret = drm_add_edid_modes(connector, edid);
+	kfree(edid);
 
-	return drm_add_edid_modes(connector, (struct edid *)
-	    connector->display_info.raw_edid);
+	return ret;
 }
drivers/gpu/drm/exynos/exynos_drm_connector.c +1 -3
index d956819..9dce3b9 100644
@@ -147,9 +147,7 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector)
 
 		drm_mode_connector_update_edid_property(connector, edid);
 		count = drm_add_edid_modes(connector, edid);
-
-		kfree(connector->display_info.raw_edid);
-		connector->display_info.raw_edid = edid;
+		kfree(edid);
 	} else {
 		struct drm_display_mode *mode = drm_mode_create(connector->dev);
 		struct exynos_drm_panel_info *panel;
drivers/gpu/drm/exynos/exynos_drm_vidi.c +0 -13
index bb1550c..9239525 100644
@@ -102,7 +102,6 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector,
 				u8 *edid, int len)
 {
 	struct vidi_context *ctx = get_vidi_context(dev);
-	struct edid *raw_edid;
 
 	DRM_DEBUG_KMS("%s\n", __FILE__);
 

@@ -115,18 +114,6 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector,
 		return -EFAULT;
 	}
 
-	raw_edid = kzalloc(len, GFP_KERNEL);
-	if (!raw_edid) {
-		DRM_DEBUG_KMS("failed to allocate raw_edid.\n");
-		return -ENOMEM;
-	}
-
-	memcpy(raw_edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions)
-						* EDID_LENGTH, len));
-
-	/* attach the edid data to connector. */
-	connector->display_info.raw_edid = (char *)raw_edid;
-
 	memcpy(edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions)
 					* EDID_LENGTH, len));
drivers/gpu/drm/gma500/cdv_intel_hdmi.c +0 -2
index a86f87b..9db0ef1 100644
@@ -157,8 +157,6 @@ static enum drm_connector_status cdv_hdmi_detect(
 			hdmi_priv->has_hdmi_audio =
 						drm_detect_monitor_audio(edid);
 		}
-
-		psb_intel_connector->base.display_info.raw_edid = NULL;
 		kfree(edid);
 	}
 	return status;
drivers/gpu/drm/gma500/oaktrail_hdmi.c +0 -1
index 2eb3dc4..69e51e9 100644
@@ -252,7 +252,6 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector)
 	if (edid) {
 		drm_mode_connector_update_edid_property(connector, edid);
 		ret = drm_add_edid_modes(connector, edid);
-		connector->display_info.raw_edid = NULL;
 	}
 
 	/*
drivers/gpu/drm/gma500/psb_intel_sdvo.c +0 -3
index 0466c7b..a453d94 100644
@@ -1343,7 +1343,6 @@ psb_intel_sdvo_hdmi_sink_detect(struct drm_connector *connector)
 			}
 		} else
 			status = connector_status_disconnected;
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
 

@@ -1404,7 +1403,6 @@ psb_intel_sdvo_detect(struct drm_connector *connector, bool force)
 				ret = connector_status_disconnected;
 			else
 				ret = connector_status_connected;
-			connector->display_info.raw_edid = NULL;
 			kfree(edid);
 		} else
 			ret = connector_status_connected;

@@ -1453,7 +1451,6 @@ static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector)
 			drm_add_edid_modes(connector, edid);
 		}
 
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
 }
drivers/gpu/drm/i915/intel_dp.c +0 -4
index 0a56b9a..bffd8cc 100644
@@ -2160,7 +2160,6 @@ intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *ada
 		ret = drm_add_edid_modes(connector, intel_dp->edid);
 		drm_edid_to_eld(connector,
 				intel_dp->edid);
-		connector->display_info.raw_edid = NULL;
 		return intel_dp->edid_mode_count;
 	}
 

@@ -2206,7 +2205,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)
 		edid = intel_dp_get_edid(connector, &intel_dp->adapter);
 		if (edid) {
 			intel_dp->has_audio = drm_detect_monitor_audio(edid);
-			connector->display_info.raw_edid = NULL;
 			kfree(edid);
 		}
 	}

@@ -2271,8 +2269,6 @@ intel_dp_detect_audio(struct drm_connector *connector)
 	edid = intel_dp_get_edid(connector, &intel_dp->adapter);
 	if (edid) {
 		has_audio = drm_detect_monitor_audio(edid);
-
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
drivers/gpu/drm/i915/intel_hdmi.c +0 -3
index 98f6024..6a29f72 100644
@@ -737,7 +737,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
 						drm_detect_hdmi_monitor(edid);
 			intel_hdmi->has_audio = drm_detect_monitor_audio(edid);
 		}
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
 

@@ -778,8 +777,6 @@ intel_hdmi_detect_audio(struct drm_connector *connector)
 	if (edid) {
 		if (edid->input & DRM_EDID_INPUT_DIGITAL)
 			has_audio = drm_detect_monitor_audio(edid);
-
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
drivers/gpu/drm/i915/intel_modes.c +0 -1
index 45848b9..7a5238f 100644
@@ -50,7 +50,6 @@ int intel_ddc_get_modes(struct drm_connector *connector,
 		drm_mode_connector_update_edid_property(connector, edid);
 		ret = drm_add_edid_modes(connector, edid);
 		drm_edid_to_eld(connector, edid);
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
drivers/gpu/drm/i915/intel_sdvo.c +0 -3
index d81bb0b..7dad271 100644
@@ -1345,7 +1345,6 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
 			}
 		} else
 			status = connector_status_disconnected;
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
 

@@ -1419,7 +1418,6 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
 			else
 				ret = connector_status_disconnected;
 
-			connector->display_info.raw_edid = NULL;
 			kfree(edid);
 		} else
 			ret = connector_status_connected;

@@ -1465,7 +1463,6 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
 			drm_add_edid_modes(connector, edid);
 		}
 
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
 }
drivers/gpu/drm/mgag200/mgag200_mode.c +0 -1
index b69642d..c7420e8 100644
@@ -1399,7 +1399,6 @@ static int mga_vga_get_modes(struct drm_connector *connector)
 	if (edid) {
 		drm_mode_connector_update_edid_property(connector, edid);
 		ret = drm_add_edid_modes(connector, edid);
-		connector->display_info.raw_edid = NULL;
 		kfree(edid);
 	}
 	return ret;
drivers/gpu/drm/udl/udl_connector.c +0 -3
index ba055e9..2d98ff9 100644
@@ -57,11 +57,8 @@ static int udl_get_modes(struct drm_connector *connector)
 
 	edid = (struct edid *)udl_get_edid(udl);
 
-	connector->display_info.raw_edid = (char *)edid;
-
 	drm_mode_connector_update_edid_property(connector, edid);
 	ret = drm_add_edid_modes(connector, edid);
-	connector->display_info.raw_edid = NULL;
 	kfree(edid);
 	return ret;
 }
drivers/staging/omapdrm/omap_connector.c +1 -4
index 5e2856c..9c2287b 100644
@@ -177,14 +177,11 @@ static int omap_connector_get_modes(struct drm_connector *connector)
 			drm_mode_connector_update_edid_property(
 					connector, edid);
 			n = drm_add_edid_modes(connector, edid);
-			kfree(connector->display_info.raw_edid);
-			connector->display_info.raw_edid = edid;
 		} else {
 			drm_mode_connector_update_edid_property(
 					connector, NULL);
-			connector->display_info.raw_edid = NULL;
-			kfree(edid);
 		}
+		kfree(edid);
 	} else {
 		struct drm_display_mode *mode = drm_mode_create(dev);
 		struct omap_video_timings timings;
include/drm/drm_crtc.h +0 -2
index a1a0386..0522044 100644
@@ -216,8 +216,6 @@ struct drm_display_info {
 	u32 color_formats;
 
 	u8 cea_rev;
-
-	char *raw_edid; /* if any */
 };
 
 struct drm_framebuffer_funcs {
Signature · 1 line
1.7.4.1
maintainer Acked-by on v1 4/4
#9 lore raw

Re: [PATCH 4/4] drm: remove the raw_edid field from struct drm_display_info

Acked-by Inki Dae <[email protected]>

2012/8/15 Jani Nikula <[email protected]>:

Quoted 363 lines

Neither the drm core nor any of the drivers really need the raw_edid field of struct drm_display_info for anything. Instead of being useful, it creates confusion about who is responsible for freeing the memory it points to and setting the field to NULL afterwards, leading to memory leaks and dangling pointers.

Remove the raw_edid field, and fix drivers as necessary.

Reported-by Russell King <[email protected]>
Signed-off-by Jani Nikula <[email protected]>
---
 drivers/gpu/drm/drm_edid.c                    |    3 ---
 drivers/gpu/drm/drm_edid_load.c               |   23 +++++++++++++----------
 drivers/gpu/drm/exynos/exynos_drm_connector.c |    4 +---
 drivers/gpu/drm/exynos/exynos_drm_vidi.c      |   13 -------------
 drivers/gpu/drm/gma500/cdv_intel_hdmi.c       |    2 --
 drivers/gpu/drm/gma500/oaktrail_hdmi.c        |    1 -
 drivers/gpu/drm/gma500/psb_intel_sdvo.c       |    3 ---
 drivers/gpu/drm/i915/intel_dp.c               |    4 ----
 drivers/gpu/drm/i915/intel_hdmi.c             |    3 ---
 drivers/gpu/drm/i915/intel_modes.c            |    1 -
 drivers/gpu/drm/i915/intel_sdvo.c             |    3 ---
 drivers/gpu/drm/mgag200/mgag200_mode.c        |    1 -
 drivers/gpu/drm/udl/udl_connector.c           |    3 ---
 drivers/staging/omapdrm/omap_connector.c      |    5 +----
 include/drm/drm_crtc.h                        |    2 --
 15 files changed, 15 insertions(+), 56 deletions(-)
drivers/gpu/drm/drm_edid.c +0 -3
index a8743c3..bcc4725 100644
@@ -399,10 +399,7 @@ struct edid *drm_get_edid(struct drm_connector *connector,
        if (drm_probe_ddc(adapter))
                edid = (struct edid *)drm_do_get_edid(connector, adapter);
 
-       connector->display_info.raw_edid = (char *)edid;
-
        return edid;
-
 }
 EXPORT_SYMBOL(drm_get_edid);
drivers/gpu/drm/drm_edid_load.c +13 -10
index 0303935..186832e 100644
@@ -114,8 +114,8 @@ static u8 generic_edid[GENERIC_EDIDS][128] = {
        },
 };
 
-static int edid_load(struct drm_connector *connector, char *name,
-                    char *connector_name)
+static u8 *edid_load(struct drm_connector *connector, char *name,
+                       char *connector_name)
 {
        const struct firmware *fw;
        struct platform_device *pdev;

@@ -205,7 +205,6 @@ static int edid_load(struct drm_connector *connector, char *name,
                edid = new_edid;
        }
 
-       connector->display_info.raw_edid = edid;
        DRM_INFO("Got %s EDID base block and %d extension%s from "
            "\"%s\" for connector \"%s\"\n", builtin ? "built-in" :
            "external", valid_extensions, valid_extensions == 1 ? "" : "s",

@@ -215,7 +214,10 @@ relfw_out:
        release_firmware(fw);
 
 out:
-       return err;
+       if (err)
+               return ERR_PTR(err);
+
+       return edid;
 }
 
 int drm_load_edid_firmware(struct drm_connector *connector)

@@ -223,6 +225,7 @@ int drm_load_edid_firmware(struct drm_connector *connector)
        char *connector_name = drm_get_connector_name(connector);
        char *edidname = edid_firmware, *last, *colon;
        int ret;
+       struct edid *edid;
 
        if (*edidname == '\0')
                return 0;

@@ -240,13 +243,13 @@ int drm_load_edid_firmware(struct drm_connector *connector)
        if (*last == '\n')
                *last = '\0';
 
-       ret = edid_load(connector, edidname, connector_name);
-       if (ret)
+       edid = (struct edid *) edid_load(connector, edidname, connector_name);
+       if (IS_ERR_OR_NULL(edid))
                return 0;
 
-       drm_mode_connector_update_edid_property(connector,
-           (struct edid *) connector->display_info.raw_edid);
+       drm_mode_connector_update_edid_property(connector, edid);
+       ret = drm_add_edid_modes(connector, edid);
+       kfree(edid);
 
-       return drm_add_edid_modes(connector, (struct edid *)
-           connector->display_info.raw_edid);
+       return ret;
 }
drivers/gpu/drm/exynos/exynos_drm_connector.c +1 -3
index d956819..9dce3b9 100644
@@ -147,9 +147,7 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector)
 
                drm_mode_connector_update_edid_property(connector, edid);
                count = drm_add_edid_modes(connector, edid);
-
-               kfree(connector->display_info.raw_edid);
-               connector->display_info.raw_edid = edid;
+               kfree(edid);
        } else {
                struct drm_display_mode *mode = drm_mode_create(connector->dev);
                struct exynos_drm_panel_info *panel;
drivers/gpu/drm/exynos/exynos_drm_vidi.c +0 -13
index bb1550c..9239525 100644
@@ -102,7 +102,6 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector,
                                u8 *edid, int len)
 {
        struct vidi_context *ctx = get_vidi_context(dev);
-       struct edid *raw_edid;
 
        DRM_DEBUG_KMS("%s\n", __FILE__);
 

@@ -115,18 +114,6 @@ static int vidi_get_edid(struct device *dev, struct drm_connector *connector,
                return -EFAULT;
        }
 
-       raw_edid = kzalloc(len, GFP_KERNEL);
-       if (!raw_edid) {
-               DRM_DEBUG_KMS("failed to allocate raw_edid.\n");
-               return -ENOMEM;
-       }
-
-       memcpy(raw_edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions)
-                                               * EDID_LENGTH, len));
-
-       /* attach the edid data to connector. */
-       connector->display_info.raw_edid = (char *)raw_edid;
-
        memcpy(edid, ctx->raw_edid, min((1 + ctx->raw_edid->extensions)
                                        * EDID_LENGTH, len));
drivers/gpu/drm/gma500/cdv_intel_hdmi.c +0 -2
index a86f87b..9db0ef1 100644
@@ -157,8 +157,6 @@ static enum drm_connector_status cdv_hdmi_detect(
                        hdmi_priv->has_hdmi_audio =
                                                drm_detect_monitor_audio(edid);
                }
-
-               psb_intel_connector->base.display_info.raw_edid = NULL;
                kfree(edid);
        }
        return status;
drivers/gpu/drm/gma500/oaktrail_hdmi.c +0 -1
index 2eb3dc4..69e51e9 100644
@@ -252,7 +252,6 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector)
        if (edid) {
                drm_mode_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
-               connector->display_info.raw_edid = NULL;
        }
 
        /*
drivers/gpu/drm/gma500/psb_intel_sdvo.c +0 -3
index 0466c7b..a453d94 100644
@@ -1343,7 +1343,6 @@ psb_intel_sdvo_hdmi_sink_detect(struct drm_connector *connector)
                        }
                } else
                        status = connector_status_disconnected;
-               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }
 

@@ -1404,7 +1403,6 @@ psb_intel_sdvo_detect(struct drm_connector *connector, bool force)
                                ret = connector_status_disconnected;
                        else
                                ret = connector_status_connected;
-                       connector->display_info.raw_edid = NULL;
                        kfree(edid);
                } else
                        ret = connector_status_connected;

@@ -1453,7 +1451,6 @@ static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector)
                        drm_add_edid_modes(connector, edid);
                }
 
-               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }
 }
drivers/gpu/drm/i915/intel_dp.c +0 -4
index 0a56b9a..bffd8cc 100644
@@ -2160,7 +2160,6 @@ intel_dp_get_edid_modes(struct drm_connector *connector, struct i2c_adapter *ada
                ret = drm_add_edid_modes(connector, intel_dp->edid);
                drm_edid_to_eld(connector,
                                intel_dp->edid);
-               connector->display_info.raw_edid = NULL;
                return intel_dp->edid_mode_count;
        }
 

@@ -2206,7 +2205,6 @@ intel_dp_detect(struct drm_connector *connector, bool force)
                edid = intel_dp_get_edid(connector, &intel_dp->adapter);
                if (edid) {
                        intel_dp->has_audio = drm_detect_monitor_audio(edid);
-                       connector->display_info.raw_edid = NULL;
                        kfree(edid);
                }
        }

@@ -2271,8 +2269,6 @@ intel_dp_detect_audio(struct drm_connector *connector)
        edid = intel_dp_get_edid(connector, &intel_dp->adapter);
        if (edid) {
                has_audio = drm_detect_monitor_audio(edid);
-
-               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }
drivers/gpu/drm/i915/intel_hdmi.c +0 -3
index 98f6024..6a29f72 100644
@@ -737,7 +737,6 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
                                                drm_detect_hdmi_monitor(edid);
                        intel_hdmi->has_audio = drm_detect_monitor_audio(edid);
                }
-               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }
 

@@ -778,8 +777,6 @@ intel_hdmi_detect_audio(struct drm_connector *connector)
        if (edid) {
                if (edid->input & DRM_EDID_INPUT_DIGITAL)
                        has_audio = drm_detect_monitor_audio(edid);
-
-               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }
drivers/gpu/drm/i915/intel_modes.c +0 -1
index 45848b9..7a5238f 100644
@@ -50,7 +50,6 @@ int intel_ddc_get_modes(struct drm_connector *connector,
                drm_mode_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
                drm_edid_to_eld(connector, edid);
-               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }
drivers/gpu/drm/i915/intel_sdvo.c +0 -3
index d81bb0b..7dad271 100644
@@ -1345,7 +1345,6 @@ intel_sdvo_tmds_sink_detect(struct drm_connector *connector)
                        }
                } else
                        status = connector_status_disconnected;
-               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }
 

@@ -1419,7 +1418,6 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
                        else
                                ret = connector_status_disconnected;
 
-                       connector->display_info.raw_edid = NULL;
                        kfree(edid);
                } else
                        ret = connector_status_connected;

@@ -1465,7 +1463,6 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
                        drm_add_edid_modes(connector, edid);
                }
 
-               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }
 }
drivers/gpu/drm/mgag200/mgag200_mode.c +0 -1
index b69642d..c7420e8 100644
@@ -1399,7 +1399,6 @@ static int mga_vga_get_modes(struct drm_connector *connector)
        if (edid) {
                drm_mode_connector_update_edid_property(connector, edid);
                ret = drm_add_edid_modes(connector, edid);
-               connector->display_info.raw_edid = NULL;
                kfree(edid);
        }
        return ret;
drivers/gpu/drm/udl/udl_connector.c +0 -3
index ba055e9..2d98ff9 100644
@@ -57,11 +57,8 @@ static int udl_get_modes(struct drm_connector *connector)
 
        edid = (struct edid *)udl_get_edid(udl);
 
-       connector->display_info.raw_edid = (char *)edid;
-
        drm_mode_connector_update_edid_property(connector, edid);
        ret = drm_add_edid_modes(connector, edid);
-       connector->display_info.raw_edid = NULL;
        kfree(edid);
        return ret;
 }
drivers/staging/omapdrm/omap_connector.c +1 -4
index 5e2856c..9c2287b 100644
@@ -177,14 +177,11 @@ static int omap_connector_get_modes(struct drm_connector *connector)
                        drm_mode_connector_update_edid_property(
                                        connector, edid);
                        n = drm_add_edid_modes(connector, edid);
-                       kfree(connector->display_info.raw_edid);
-                       connector->display_info.raw_edid = edid;
                } else {
                        drm_mode_connector_update_edid_property(
                                        connector, NULL);
-                       connector->display_info.raw_edid = NULL;
-                       kfree(edid);
                }
+               kfree(edid);
        } else {
                struct drm_display_mode *mode = drm_mode_create(dev);
                struct omap_video_timings timings;
include/drm/drm_crtc.h +0 -3
index a1a0386..0522044 100644
@@ -216,8 +216,6 @@ struct drm_display_info {
        u32 color_formats;
 
        u8 cea_rev;
-
-       char *raw_edid; /* if any */
 };
 
 struct drm_framebuffer_funcs {
--

1.7.4.1

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel