svn commit: r261632 - stable/9/sys/dev/drm2

[Jean-Sebastien Pedron]

Author: dumbbell
Date: Sat Feb  8 11:05:48 2014
New Revision: 261632
URL: http://svnweb.freebsd.org/changeset/base/261632

Log:
  MFC r254798:
  
  drm: Fix leak of connector->edid_blob_ptr

Modified:
  stable/9/sys/dev/drm2/drm_crtc.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/drm2/drm_crtc.c
==============================================================================
--- stable/9/sys/dev/drm2/drm_crtc.c	Sat Feb  8 10:57:46 2014	(r261631)
+++ stable/9/sys/dev/drm2/drm_crtc.c	Sat Feb  8 11:05:48 2014	(r261632)
@@ -170,6 +170,9 @@ static struct drm_prop_enum_list drm_enc
 	{ DRM_MODE_ENCODER_TVDAC, "TV" },
 };
 
+static void drm_property_destroy_blob(struct drm_device *dev,
+			       struct drm_property_blob *blob);
+
 char *drm_get_encoder_name(struct drm_encoder *encoder)
 {
 	static char buf[32];
@@ -520,6 +523,8 @@ void drm_connector_cleanup(struct drm_co
 		drm_mode_remove(connector, mode);
 
 	sx_xlock(&dev->mode_config.mutex);
+	if (connector->edid_blob_ptr)
+		drm_property_destroy_blob(dev, connector->edid_blob_ptr);
 	drm_mode_object_put(dev, &connector->base);
 	list_del(&connector->head);
 	dev->mode_config.num_connector--;