1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 0c6bf82bb059..68f2fb89ece3 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -354,6 +354,7 @@ static bool intel_crt_compute_config(struct intel_encoder *encoder,
         if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
                 return false;
 
+        pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
         return true;
 }
 
@@ -368,6 +369,7 @@ static bool pch_crt_compute_config(struct intel_encoder *encoder,
                 return false;
 
         pipe_config->has_pch_encoder = true;
+        pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
 
         return true;
 }
@@ -389,6 +391,7 @@ static bool hsw_crt_compute_config(struct intel_encoder *encoder,
                 return false;
 
         pipe_config->has_pch_encoder = true;
+        pipe_config->output_format = INTEL_OUTPUT_FORMAT_RGB;
 
         /* LPT FDI RX only supports 8bpc. */
         if (HAS_PCH_LPT(dev_priv)) {
@@ -849,12 +852,6 @@ out:
         return status;
 }
 
-static void intel_crt_destroy(struct drm_connector *connector)
-{
-        drm_connector_cleanup(connector);
-        kfree(connector);
-}
-
 static int intel_crt_get_modes(struct drm_connector *connector)
 {
         struct drm_device *dev = connector->dev;
@@ -909,7 +906,7 @@ static const struct drm_connector_funcs intel_crt_connector_funcs = {
         .fill_modes = drm_helper_probe_single_connector_modes,
         .late_register = intel_connector_register,
         .early_unregister = intel_connector_unregister,
-        .destroy = intel_crt_destroy,
+        .destroy = intel_connector_destroy,
         .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
         .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
 };