[PATCH v6 RESEND 1/3] gpu: drm: separate panel orientation property creating and value setting

---
 drivers/gpu/drm/drm_connector.c         | 58 ++++++++++++++++++-------
 drivers/gpu/drm/i915/display/icl_dsi.c  |  1 +
 drivers/gpu/drm/i915/display/intel_dp.c |  1 +
 drivers/gpu/drm/i915/display/vlv_dsi.c  |  1 +
 include/drm/drm_connector.h             |  2 +
 5 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 7631f76e7f345..7189baaabf416 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c

@@ -1210,7 +1210,7 @@ static const struct drm_prop_enum_list dp_colorspaces[] = {
  *     INPUT_PROP_DIRECT) will still map 1:1 to the actual LCD panel
  *     coordinates, so if userspace rotates the picture to adjust for
  *     the orientation it must also apply the same transformation to the
- *     touchscreen input coordinates. This property is initialized by calling
+ *     touchscreen input coordinates. This property value is set by calling
  *     drm_connector_set_panel_orientation() or
  *     drm_connector_set_panel_orientation_with_quirk()
  *

@@ -2173,8 +2173,8 @@ EXPORT_SYMBOL(drm_connector_set_vrr_capable_property);
  * @connector: connector for which to set the panel-orientation property.
  * @panel_orientation: drm_panel_orientation value to set
  *
- * This function sets the connector's panel_orientation and attaches
- * a "panel orientation" property to the connector.
+ * This function sets the connector's panel_orientation value. If the property
+ * doesn't exist, it will return an error.
  *
  * Calling this function on a connector where the panel_orientation has
  * already been set is a no-op (e.g. the orientation has been overridden with

@@ -2205,19 +2205,11 @@ int drm_connector_set_panel_orientation(
        info->panel_orientation = panel_orientation;

        prop = dev->mode_config.panel_orientation_property;
-       if (!prop) {
-               prop = drm_property_create_enum(dev, DRM_MODE_PROP_IMMUTABLE,
-                               "panel orientation",
-                               drm_panel_orientation_enum_list,
-                               ARRAY_SIZE(drm_panel_orientation_enum_list));
-               if (!prop)
-                       return -ENOMEM;
-
-               dev->mode_config.panel_orientation_property = prop;
-       }
+       if (WARN_ON(!prop))
+               return -EINVAL;

-       drm_object_attach_property(&connector->base, prop,
-                                  info->panel_orientation);
+       drm_object_property_set_value(&connector->base, prop,
+                                     info->panel_orientation);
        return 0;
 }
 EXPORT_SYMBOL(drm_connector_set_panel_orientation);

@@ -2225,7 +2217,7 @@ EXPORT_SYMBOL(drm_connector_set_panel_orientation);
 /**
  * drm_connector_set_panel_orientation_with_quirk -
  *     set the connector's panel_orientation after checking for quirks
- * @connector: connector for which to init the panel-orientation property.
+ * @connector: connector for which to set the panel-orientation property.
  * @panel_orientation: drm_panel_orientation value to set
  * @width: width in pixels of the panel, used for panel quirk detection
  * @height: height in pixels of the panel, used for panel quirk detection

@@ -2252,6 +2244,40 @@ int drm_connector_set_panel_orientation_with_quirk(
 }
 EXPORT_SYMBOL(drm_connector_set_panel_orientation_with_quirk);

+/**
+ * drm_connector_init_panel_orientation_property -
+ *     create the connector's panel orientation property
+ *
+ * This function attaches a "panel orientation" property to the connector
+ * and initializes its value to DRM_MODE_PANEL_ORIENTATION_UNKNOWN.
+ *
+ * The value of the property can be set by drm_connector_set_panel_orientation()
+ * or drm_connector_set_panel_orientation_with_quirk() later.
+ *
+ * Returns:
+ * Zero on success, negative errno on failure.
+ */
+int drm_connector_init_panel_orientation_property(
+       struct drm_connector *connector)
+{
+       struct drm_device *dev = connector->dev;
+       struct drm_property *prop;
+
+       prop = drm_property_create_enum(dev, DRM_MODE_PROP_IMMUTABLE,
+                       "panel orientation",
+                       drm_panel_orientation_enum_list,
+                       ARRAY_SIZE(drm_panel_orientation_enum_list));
+       if (!prop)
+               return -ENOMEM;
+
+       dev->mode_config.panel_orientation_property = prop;
+       drm_object_attach_property(&connector->base, prop,
+                                  DRM_MODE_PANEL_ORIENTATION_UNKNOWN);
+
+       return 0;
+}
+EXPORT_SYMBOL(drm_connector_init_panel_orientation_property);
+
 int drm_connector_set_obj_prop(struct drm_mode_object *obj,
                                    struct drm_property *property,
                                    uint64_t value)

diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c
index 9282978060b08..5ac4538e42833 100644
--- a/drivers/gpu/drm/i915/display/icl_dsi.c
+++ b/drivers/gpu/drm/i915/display/icl_dsi.c

@@ -1903,6 +1903,7 @@ static void icl_dsi_add_properties(struct intel_connector *connector)

        connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;

+       drm_connector_init_panel_orientation_property(&connector->base);
        drm_connector_set_panel_orientation_with_quirk(&connector->base,
                                intel_dsi_get_panel_orientation(connector),
                                connector->panel.fixed_mode->hdisplay,

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index a5231ac3443aa..f1d664e5abb28 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c

@@ -5263,6 +5263,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
        intel_panel_setup_backlight(connector, pipe);

        if (fixed_mode) {
+               drm_connector_init_panel_orientation_property(connector);
                drm_connector_set_panel_orientation_with_quirk(connector,
                                dev_priv->vbt.orientation,
                                fixed_mode->hdisplay, fixed_mode->vdisplay);

diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
index 9bee99fe54954..853855482af14 100644
--- a/drivers/gpu/drm/i915/display/vlv_dsi.c
+++ b/drivers/gpu/drm/i915/display/vlv_dsi.c

@@ -1632,6 +1632,7 @@ static void vlv_dsi_add_properties(struct intel_connector *connector)

                connector->base.state->scaling_mode = DRM_MODE_SCALE_ASPECT;

+               drm_connector_init_panel_orientation_property(&connector->base);
                drm_connector_set_panel_orientation_with_quirk(
                                &connector->base,
                                intel_dsi_get_panel_orientation(connector),

diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 1922b278ffadf..4396c1c4a5dbc 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h

@@ -1696,6 +1696,8 @@ int drm_connector_set_panel_orientation_with_quirk(
        struct drm_connector *connector,
        enum drm_panel_orientation panel_orientation,
        int width, int height);
+int drm_connector_init_panel_orientation_property(
+       struct drm_connector *connector);

---
 drivers/gpu/drm/mediatek/mtk_dsi.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index ae403c67cbd92..9da1fd6491319 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c

@@ -964,6 +964,13 @@ static int mtk_dsi_encoder_init(struct drm_device *drm, struct mtk_dsi *dsi)
                ret = PTR_ERR(dsi->connector);
                goto err_cleanup_encoder;
        }
+
+       ret = drm_connector_init_panel_orientation_property(dsi->connector);
+       if (ret) {
+               DRM_ERROR("Unable to init panel orientation\n");
+               goto err_cleanup_encoder;
+       }
+
        drm_connector_attach_encoder(dsi->connector, &dsi->encoder);

        return 0;
--

2.32.0.288.g62a8d224e6-goog