diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2014-10-31 10:39:12 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-10-31 13:38:17 -0400 |
commit | 9d5fab402d3b6fc3d4b895fbb0bde4e4f2378167 (patch) | |
tree | 6415c4a7be2487271dbffdddd2d4c247f47790b9 /drivers/gpu/drm/i915/intel_sdvo.c | |
parent | 3b5b9932fb547a7c89169a1c43a73beee7183ed0 (diff) |
drm/i915: Don't destroy DRM properties in the driver
When drm properties are created, they are added to mode_config.property_list,
which is then used in drm_mode_config_cleanup() to destroy every single
property created by the driver.
Cc: Chandra Konduru <chandra.konduru@intel.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sdvo.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sdvo.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 9350edd6728d..6d7a277458b5 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
@@ -1991,57 +1991,10 @@ static int intel_sdvo_get_modes(struct drm_connector *connector) | |||
1991 | return !list_empty(&connector->probed_modes); | 1991 | return !list_empty(&connector->probed_modes); |
1992 | } | 1992 | } |
1993 | 1993 | ||
1994 | static void | ||
1995 | intel_sdvo_destroy_enhance_property(struct drm_connector *connector) | ||
1996 | { | ||
1997 | struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector); | ||
1998 | struct drm_device *dev = connector->dev; | ||
1999 | |||
2000 | if (intel_sdvo_connector->left) | ||
2001 | drm_property_destroy(dev, intel_sdvo_connector->left); | ||
2002 | if (intel_sdvo_connector->right) | ||
2003 | drm_property_destroy(dev, intel_sdvo_connector->right); | ||
2004 | if (intel_sdvo_connector->top) | ||
2005 | drm_property_destroy(dev, intel_sdvo_connector->top); | ||
2006 | if (intel_sdvo_connector->bottom) | ||
2007 | drm_property_destroy(dev, intel_sdvo_connector->bottom); | ||
2008 | if (intel_sdvo_connector->hpos) | ||
2009 | drm_property_destroy(dev, intel_sdvo_connector->hpos); | ||
2010 | if (intel_sdvo_connector->vpos) | ||
2011 | drm_property_destroy(dev, intel_sdvo_connector->vpos); | ||
2012 | if (intel_sdvo_connector->saturation) | ||
2013 | drm_property_destroy(dev, intel_sdvo_connector->saturation); | ||
2014 | if (intel_sdvo_connector->contrast) | ||
2015 | drm_property_destroy(dev, intel_sdvo_connector->contrast); | ||
2016 | if (intel_sdvo_connector->hue) | ||
2017 | drm_property_destroy(dev, intel_sdvo_connector->hue); | ||
2018 | if (intel_sdvo_connector->sharpness) | ||
2019 | drm_property_destroy(dev, intel_sdvo_connector->sharpness); | ||
2020 | if (intel_sdvo_connector->flicker_filter) | ||
2021 | drm_property_destroy(dev, intel_sdvo_connector->flicker_filter); | ||
2022 | if (intel_sdvo_connector->flicker_filter_2d) | ||
2023 | drm_property_destroy(dev, intel_sdvo_connector->flicker_filter_2d); | ||
2024 | if (intel_sdvo_connector->flicker_filter_adaptive) | ||
2025 | drm_property_destroy(dev, intel_sdvo_connector->flicker_filter_adaptive); | ||
2026 | if (intel_sdvo_connector->tv_luma_filter) | ||
2027 | drm_property_destroy(dev, intel_sdvo_connector->tv_luma_filter); | ||
2028 | if (intel_sdvo_connector->tv_chroma_filter) | ||
2029 | drm_property_destroy(dev, intel_sdvo_connector->tv_chroma_filter); | ||
2030 | if (intel_sdvo_connector->dot_crawl) | ||
2031 | drm_property_destroy(dev, intel_sdvo_connector->dot_crawl); | ||
2032 | if (intel_sdvo_connector->brightness) | ||
2033 | drm_property_destroy(dev, intel_sdvo_connector->brightness); | ||
2034 | } | ||
2035 | |||
2036 | static void intel_sdvo_destroy(struct drm_connector *connector) | 1994 | static void intel_sdvo_destroy(struct drm_connector *connector) |
2037 | { | 1995 | { |
2038 | struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector); | 1996 | struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector); |
2039 | 1997 | ||
2040 | if (intel_sdvo_connector->tv_format) | ||
2041 | drm_property_destroy(connector->dev, | ||
2042 | intel_sdvo_connector->tv_format); | ||
2043 | |||
2044 | intel_sdvo_destroy_enhance_property(connector); | ||
2045 | drm_connector_cleanup(connector); | 1998 | drm_connector_cleanup(connector); |
2046 | kfree(intel_sdvo_connector); | 1999 | kfree(intel_sdvo_connector); |
2047 | } | 2000 | } |