Merge branch 'drm-intel-fixes' into drm-intel-next

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_sdvo.c
index b684a405a05b847c90af6cd77043963bf1068983,ee73e428a84a800dd8d70a1747457033f7e8da8e..a84224f37605fc645f3781292ab308703f8dad42
--- 1/drivers/gpu/drm/i915/intel_sdvo.c
--- 2/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@@ -2134,30 -2148,29 +2134,29 @@@ intel_sdvo_tv_init(struct intel_sdvo *i
                return false;
  
        intel_connector = &intel_sdvo_connector->base;
 -        connector = &intel_connector->base;
 -        encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
 -        connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
 +      connector = &intel_connector->base;
 +      encoder->encoder_type = DRM_MODE_ENCODER_TVDAC;
 +      connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO;
  
 -        intel_sdvo->controlled_output |= type;
 -        intel_sdvo_connector->output_flag = type;
 +      intel_sdvo->controlled_output |= type;
 +      intel_sdvo_connector->output_flag = type;
  
 -        intel_sdvo->is_tv = true;
 -        intel_sdvo->base.needs_tv_clock = true;
 -        intel_sdvo->base.clone_mask = 1 << INTEL_SDVO_TV_CLONE_BIT;
 +      intel_sdvo->is_tv = true;
 +      intel_sdvo->base.needs_tv_clock = true;
 +      intel_sdvo->base.clone_mask = 1 << INTEL_SDVO_TV_CLONE_BIT;
  
 -        intel_sdvo_connector_init(encoder, connector);
 +      intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo);
  
 -        if (!intel_sdvo_tv_create_property(intel_sdvo, intel_sdvo_connector, type))
 +      if (!intel_sdvo_tv_create_property(intel_sdvo, intel_sdvo_connector, type))
                goto err;
  
 -        if (!intel_sdvo_create_enhance_property(intel_sdvo, intel_sdvo_connector))
 +      if (!intel_sdvo_create_enhance_property(intel_sdvo, intel_sdvo_connector))
                goto err;
  
 -        return true;
 +      return true;
  
  err:
-       intel_sdvo_destroy_enhance_property(connector);
-       kfree(intel_sdvo_connector);
+       intel_sdvo_destroy(connector);
        return false;
  }