drm/i915: Use per-connector scaling mode property

None of the intel connectors can use all types of scaling modes,
so only try the ones that are possible. This is another preparation
for connectors towards conversion to atomic.

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-5-maarten.lankhorst@linux.intel.com
[mlankhorst: Use renamed drm_connector_attach_scaling_mode_property function]

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 921b9bb3a09e0fca1454973a865315b318300c43..476cac07da7c615fe0d429aa753cfdb2f272fe23 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4888,18 +4888,7 @@ intel_dp_set_property(struct drm_connector *connector,
                goto done;
        }
 
-       if (is_edp(intel_dp) &&
-           property == connector->dev->mode_config.scaling_mode_property) {
-               if (val == DRM_MODE_SCALE_NONE) {
-                       DRM_DEBUG_KMS("no scaling not supported\n");
-                       return -EINVAL;
-               }
-               if (HAS_GMCH_DISPLAY(dev_priv) &&
-                   val == DRM_MODE_SCALE_CENTER) {
-                       DRM_DEBUG_KMS("centering not supported\n");
-                       return -EINVAL;
-               }
-
+       if (property == connector->scaling_mode_property) {
                if (connector->state->scaling_mode == val) {
                        /* the eDP scaling property is not changed */
                        return 0;
@@ -5182,17 +5171,23 @@ bool intel_dp_is_edp(struct drm_i915_private *dev_priv, enum port port)
 static void
 intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connector)
 {
+       struct drm_i915_private *dev_priv = to_i915(connector->dev);
+
        intel_attach_force_audio_property(connector);
        intel_attach_broadcast_rgb_property(connector);
        intel_dp->color_range_auto = true;
 
        if (is_edp(intel_dp)) {
-               drm_mode_create_scaling_mode_property(connector->dev);
-               drm_object_attach_property(
-                       &connector->base,
-                       connector->dev->mode_config.scaling_mode_property,
-                       DRM_MODE_SCALE_ASPECT);
+               u32 allowed_scalers;
+
+               allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT) | BIT(DRM_MODE_SCALE_FULLSCREEN);
+               if (!HAS_GMCH_DISPLAY(dev_priv))
+                       allowed_scalers |= BIT(DRM_MODE_SCALE_CENTER);
+
+               drm_connector_attach_scaling_mode_property(connector, allowed_scalers);
+
                connector->state->scaling_mode = DRM_MODE_SCALE_ASPECT;
+
        }
 }
 

diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
index ec141eb59e6d34adc3ec76a40707b01a2e21d685..77b8dad5fa416c1fb523ff2027cfbfd6038ae7f1 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dsi.c
+++ b/drivers/gpu/drm/i915/intel_dsi.c
@@ -1591,7 +1591,6 @@ static int intel_dsi_set_property(struct drm_connector *connector,
                                  struct drm_property *property,
                                  uint64_t val)
 {
-       struct drm_device *dev = connector->dev;
        struct drm_crtc *crtc;
        int ret;
 
@@ -1599,17 +1598,7 @@ static int intel_dsi_set_property(struct drm_connector *connector,
        if (ret)
                return ret;
 
-       if (property == dev->mode_config.scaling_mode_property) {
-               if (val == DRM_MODE_SCALE_NONE) {
-                       DRM_DEBUG_KMS("no scaling not supported\n");
-                       return -EINVAL;
-               }
-               if (HAS_GMCH_DISPLAY(to_i915(dev)) &&
-                   val == DRM_MODE_SCALE_CENTER) {
-                       DRM_DEBUG_KMS("centering not supported\n");
-                       return -EINVAL;
-               }
-
+       if (property == connector->scaling_mode_property) {
                if (connector->state->scaling_mode == val)
                        return 0;
 
@@ -1672,13 +1661,18 @@ static const struct drm_connector_funcs intel_dsi_connector_funcs = {
 
 static void intel_dsi_add_properties(struct intel_connector *connector)
 {
-       struct drm_device *dev = connector->base.dev;
+       struct drm_i915_private *dev_priv = to_i915(connector->base.dev);
 
        if (connector->panel.fixed_mode) {
-               drm_mode_create_scaling_mode_property(dev);
-               drm_object_attach_property(&connector->base.base,
-                                          dev->mode_config.scaling_mode_property,
-                                          DRM_MODE_SCALE_ASPECT);
+               u32 allowed_scalers;
+
+               allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT) | BIT(DRM_MODE_SCALE_FULLSCREEN);
+               if (!HAS_GMCH_DISPLAY(dev_priv))
+                       allowed_scalers |= BIT(DRM_MODE_SCALE_CENTER);
+
+               drm_connector_attach_scaling_mode_property(&connector->base,
+                                                               allowed_scalers);
+
                connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;
        }
 }

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index a14bdefdcb8f63e948289f1001e879fb255826fa..3bcd9695ef2e8144155da7e5fce60953fd5145cf 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -602,16 +602,10 @@ static int intel_lvds_set_property(struct drm_connector *connector,
                                   struct drm_property *property,
                                   uint64_t value)
 {
-       struct drm_device *dev = connector->dev;
 
-       if (property == dev->mode_config.scaling_mode_property) {
+       if (property == connector->scaling_mode_property) {
                struct drm_crtc *crtc;
 
-               if (value == DRM_MODE_SCALE_NONE) {
-                       DRM_DEBUG_KMS("no scaling not supported\n");
-                       return -EINVAL;
-               }
-
                if (connector->state->scaling_mode == value) {
                        /* the LVDS scaling property is not changed */
                        return 0;
@@ -987,6 +981,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
        u32 lvds;
        int pipe;
        u8 pin;
+       u32 allowed_scalers;
 
        if (!intel_lvds_supported(dev_priv))
                return;
@@ -1082,10 +1077,10 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
        lvds_encoder->reg = lvds_reg;
 
        /* create the scaling mode property */
-       drm_mode_create_scaling_mode_property(dev);
-       drm_object_attach_property(&connector->base,
-                                     dev->mode_config.scaling_mode_property,
-                                     DRM_MODE_SCALE_ASPECT);
+       allowed_scalers = BIT(DRM_MODE_SCALE_ASPECT);
+       allowed_scalers |= BIT(DRM_MODE_SCALE_FULLSCREEN);
+       allowed_scalers |= BIT(DRM_MODE_SCALE_CENTER);
+       drm_connector_attach_scaling_mode_property(connector, allowed_scalers);
        connector->state->scaling_mode = DRM_MODE_SCALE_ASPECT;
 
        intel_lvds_pps_get_hw_state(dev_priv, &lvds_encoder->init_pps);