Merge remote-tracking branch 'airlied/drm-next' into HEAD

Backmerge drm-next so that I can keep merging patches. Specifically I
want:
- atomic stuff, yay!
- eld parsing patch from Jani.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

4 files changed, 4 insertions, 51 deletions

diff --git a/drivers/gpu/drm/i915/i915_cmd_parser.c b/drivers/gpu/drm/i915/i915_cmd_parser.c
index ef38915075a1..809bb957b452 100644
--- a/drivers/gpu/drm/i915/i915_cmd_parser.c
+++ b/drivers/gpu/drm/i915/i915_cmd_parser.c
@@ -73,7 +73,7 @@
  * those commands required by the parser. This generally works because command
  * opcode ranges have standard command length encodings. So for commands that
  * the parser does not need to check, it can easily skip them. This is
- * implementated via a per-ring length decoding vfunc.
+ * implemented via a per-ring length decoding vfunc.
  *
  * Unfortunately, there are a number of commands that do not follow the standard
  * length encoding for their opcode range, primarily amongst the MI_* commands.
@@ -843,7 +843,7 @@ finish:
  * @ring: the ring in question
  *
  * Only certain platforms require software batch buffer command parsing, and
- * only when enabled via module paramter.
+ * only when enabled via module parameter.
  *
  * Return: true if the ring requires software command parsing
  */
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index b250d96ab7a1..d43fa0e627f8 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -672,7 +672,7 @@ enum punit_power_well {
  * need to be accessed during AUX communication,
  *
  * Generally the common lane corresponds to the pipe and
- * the spline (PCS/TX) correponds to the port.
+ * the spline (PCS/TX) corresponds to the port.
  *
  * For dual channel PHY (VLV/CHV):
  *
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 292beb0fa1dc..6025ac754c37 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -1681,7 +1681,7 @@ static int lrc_setup_hardware_status_page(struct intel_engine_cs *ring,
  * the creation is a deferred call: it's better to make sure first that we need to use
  * a given ring with the context.
  *
- * Return: non-zero on eror.
+ * Return: non-zero on error.
  */
 int intel_lr_context_deferred_create(struct intel_context *ctx,
                                      struct intel_engine_cs *ring)
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)
         return !list_empty(&connector->probed_modes);
 }
 
-static void
-intel_sdvo_destroy_enhance_property(struct drm_connector *connector)
-{
-        struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
-        struct drm_device *dev = connector->dev;
-
-        if (intel_sdvo_connector->left)
-                drm_property_destroy(dev, intel_sdvo_connector->left);
-        if (intel_sdvo_connector->right)
-                drm_property_destroy(dev, intel_sdvo_connector->right);
-        if (intel_sdvo_connector->top)
-                drm_property_destroy(dev, intel_sdvo_connector->top);
-        if (intel_sdvo_connector->bottom)
-                drm_property_destroy(dev, intel_sdvo_connector->bottom);
-        if (intel_sdvo_connector->hpos)
-                drm_property_destroy(dev, intel_sdvo_connector->hpos);
-        if (intel_sdvo_connector->vpos)
-                drm_property_destroy(dev, intel_sdvo_connector->vpos);
-        if (intel_sdvo_connector->saturation)
-                drm_property_destroy(dev, intel_sdvo_connector->saturation);
-        if (intel_sdvo_connector->contrast)
-                drm_property_destroy(dev, intel_sdvo_connector->contrast);
-        if (intel_sdvo_connector->hue)
-                drm_property_destroy(dev, intel_sdvo_connector->hue);
-        if (intel_sdvo_connector->sharpness)
-                drm_property_destroy(dev, intel_sdvo_connector->sharpness);
-        if (intel_sdvo_connector->flicker_filter)
-                drm_property_destroy(dev, intel_sdvo_connector->flicker_filter);
-        if (intel_sdvo_connector->flicker_filter_2d)
-                drm_property_destroy(dev, intel_sdvo_connector->flicker_filter_2d);
-        if (intel_sdvo_connector->flicker_filter_adaptive)
-                drm_property_destroy(dev, intel_sdvo_connector->flicker_filter_adaptive);
-        if (intel_sdvo_connector->tv_luma_filter)
-                drm_property_destroy(dev, intel_sdvo_connector->tv_luma_filter);
-        if (intel_sdvo_connector->tv_chroma_filter)
-                drm_property_destroy(dev, intel_sdvo_connector->tv_chroma_filter);
-        if (intel_sdvo_connector->dot_crawl)
-                drm_property_destroy(dev, intel_sdvo_connector->dot_crawl);
-        if (intel_sdvo_connector->brightness)
-                drm_property_destroy(dev, intel_sdvo_connector->brightness);
-}
-
 static void intel_sdvo_destroy(struct drm_connector *connector)
 {
         struct intel_sdvo_connector *intel_sdvo_connector = to_intel_sdvo_connector(connector);
 
-        if (intel_sdvo_connector->tv_format)
-                drm_property_destroy(connector->dev,
-                                     intel_sdvo_connector->tv_format);
-
-        intel_sdvo_destroy_enhance_property(connector);
         drm_connector_cleanup(connector);
         kfree(intel_sdvo_connector);
 }