|
@@ -1587,36 +1587,6 @@ static int intel_dsi_get_modes(struct drm_connector *connector)
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-static int intel_dsi_set_property(struct drm_connector *connector,
|
|
|
- struct drm_property *property,
|
|
|
- uint64_t val)
|
|
|
-{
|
|
|
- struct drm_crtc *crtc;
|
|
|
- int ret;
|
|
|
-
|
|
|
- ret = drm_object_property_set_value(&connector->base, property, val);
|
|
|
- if (ret)
|
|
|
- return ret;
|
|
|
-
|
|
|
- if (property == connector->scaling_mode_property) {
|
|
|
- if (connector->state->scaling_mode == val)
|
|
|
- return 0;
|
|
|
-
|
|
|
- connector->state->scaling_mode = val;
|
|
|
- }
|
|
|
-
|
|
|
- crtc = connector->state->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 void intel_dsi_connector_destroy(struct drm_connector *connector)
|
|
|
{
|
|
|
struct intel_connector *intel_connector = to_intel_connector(connector);
|
|
@@ -1645,6 +1615,7 @@ static const struct drm_encoder_funcs intel_dsi_funcs = {
|
|
|
static const struct drm_connector_helper_funcs intel_dsi_connector_helper_funcs = {
|
|
|
.get_modes = intel_dsi_get_modes,
|
|
|
.mode_valid = intel_dsi_mode_valid,
|
|
|
+ .atomic_check = intel_digital_connector_atomic_check,
|
|
|
};
|
|
|
|
|
|
static const struct drm_connector_funcs intel_dsi_connector_funcs = {
|
|
@@ -1653,10 +1624,11 @@ static const struct drm_connector_funcs intel_dsi_connector_funcs = {
|
|
|
.early_unregister = intel_connector_unregister,
|
|
|
.destroy = intel_dsi_connector_destroy,
|
|
|
.fill_modes = drm_helper_probe_single_connector_modes,
|
|
|
- .set_property = intel_dsi_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,
|
|
|
.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 void intel_dsi_add_properties(struct intel_connector *connector)
|