]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drm/i915: Convert LVDS connector properties to atomic.
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 1 May 2017 13:37:59 +0000 (15:37 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Tue, 30 May 2017 08:33:25 +0000 (10:33 +0200)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170501133804.8116-8-maarten.lankhorst@linux.intel.com
drivers/gpu/drm/i915/intel_lvds.c

index 3bcd9695ef2e8144155da7e5fce60953fd5145cf..d2c2bca1b327182c4395a12035dfde1ea44ae923 100644 (file)
@@ -598,49 +598,24 @@ static void intel_lvds_destroy(struct drm_connector *connector)
        kfree(connector);
 }
 
-static int intel_lvds_set_property(struct drm_connector *connector,
-                                  struct drm_property *property,
-                                  uint64_t value)
-{
-
-       if (property == connector->scaling_mode_property) {
-               struct drm_crtc *crtc;
-
-               if (connector->state->scaling_mode == value) {
-                       /* the LVDS scaling property is not changed */
-                       return 0;
-               }
-               connector->state->scaling_mode = value;
-
-               crtc = intel_attached_encoder(connector)->base.crtc;
-               if (crtc && crtc->state->enable) {
-                       /*
-                        * If the CRTC is enabled, the display will be changed
-                        * according to the new panel fitting mode.
-                        */
-                       intel_crtc_restore_mode(crtc);
-               }
-       }
-
-       return 0;
-}
-
 static const struct drm_connector_helper_funcs intel_lvds_connector_helper_funcs = {
        .get_modes = intel_lvds_get_modes,
        .mode_valid = intel_lvds_mode_valid,
+       .atomic_check = intel_digital_connector_atomic_check,
 };
 
 static const struct drm_connector_funcs intel_lvds_connector_funcs = {
        .dpms = drm_atomic_helper_connector_dpms,
        .detect = intel_lvds_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
-       .set_property = intel_lvds_set_property,
-       .atomic_get_property = intel_connector_atomic_get_property,
+       .set_property = drm_atomic_helper_connector_set_property,
+       .atomic_get_property = intel_digital_connector_atomic_get_property,
+       .atomic_set_property = intel_digital_connector_atomic_set_property,
        .late_register = intel_connector_register,
        .early_unregister = intel_connector_unregister,
        .destroy = intel_lvds_destroy,
        .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-       .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
+       .atomic_duplicate_state = intel_digital_connector_duplicate_state,
 };
 
 static const struct drm_encoder_funcs intel_lvds_enc_funcs = {