drm/omap: dss: Make omap_dss_device_ops optional

As part of the move to drm_bridge ops, the dssdev ops will become empty
for some of the internal encoders. Make them optional in the driver to
allow them to be removed completely, easing the transition.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200226112514.12455-28-laurent.pinchart@ideasonboard.com

diff --git a/drivers/gpu/drm/omapdrm/dss/base.c b/drivers/gpu/drm/omapdrm/dss/base.c
index 80d4893..2db3bd2 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/base.c
+++ b/drivers/gpu/drm/omapdrm/dss/base.c
@@ -195,10 +195,12 @@ int omapdss_device_connect(struct dss_device *dss,
 
        dst->dss = dss;
 
-       ret = dst->ops->connect(src, dst);
-       if (ret < 0) {
-               dst->dss = NULL;
-               return ret;
+       if (dst->ops && dst->ops->connect) {
+               ret = dst->ops->connect(src, dst);
+               if (ret < 0) {
+                       dst->dss = NULL;
+                       return ret;
+               }
        }
 
        return 0;
@@ -226,7 +228,8 @@ void omapdss_device_disconnect(struct omap_dss_device *src,
 
        WARN_ON(dst->state != OMAP_DSS_DISPLAY_DISABLED);
 
-       dst->ops->disconnect(src, dst);
+       if (dst->ops && dst->ops->disconnect)
+               dst->ops->disconnect(src, dst);
        dst->dss = NULL;
 }
 EXPORT_SYMBOL_GPL(omapdss_device_disconnect);
@@ -238,7 +241,7 @@ void omapdss_device_pre_enable(struct omap_dss_device *dssdev)
 
        omapdss_device_pre_enable(dssdev->next);
 
-       if (dssdev->ops->pre_enable)
+       if (dssdev->ops && dssdev->ops->pre_enable)
                dssdev->ops->pre_enable(dssdev);
 }
 EXPORT_SYMBOL_GPL(omapdss_device_pre_enable);
@@ -248,7 +251,7 @@ void omapdss_device_enable(struct omap_dss_device *dssdev)
        if (!dssdev)
                return;
 
-       if (dssdev->ops->enable)
+       if (dssdev->ops && dssdev->ops->enable)
                dssdev->ops->enable(dssdev);
 
        omapdss_device_enable(dssdev->next);
@@ -264,7 +267,7 @@ void omapdss_device_disable(struct omap_dss_device *dssdev)
 
        omapdss_device_disable(dssdev->next);
 
-       if (dssdev->ops->disable)
+       if (dssdev->ops && dssdev->ops->disable)
                dssdev->ops->disable(dssdev);
 }
 EXPORT_SYMBOL_GPL(omapdss_device_disable);
@@ -274,7 +277,7 @@ void omapdss_device_post_disable(struct omap_dss_device *dssdev)
        if (!dssdev)
                return;
 
-       if (dssdev->ops->post_disable)
+       if (dssdev->ops && dssdev->ops->post_disable)
                dssdev->ops->post_disable(dssdev);
 
        omapdss_device_post_disable(dssdev->next);

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c
index 67b92b5..b76fc2b 100644 (file)
--- a/drivers/gpu/drm/omapdrm/dss/dss.c
+++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1552,7 +1552,8 @@ static void dss_shutdown(struct platform_device *pdev)
        DSSDBG("shutdown\n");
 
        for_each_dss_output(dssdev) {
-               if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE)
+               if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE &&
+                   dssdev->ops && dssdev->ops->disable)
                        dssdev->ops->disable(dssdev);
        }
 }

diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index b0cb2ec..a24cec4 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -228,7 +228,7 @@ enum drm_mode_status omap_connector_mode_fixup(struct omap_dss_device *dssdev,
        drm_mode_copy(adjusted_mode, mode);
 
        for (; dssdev; dssdev = dssdev->next) {
-               if (!dssdev->ops->check_timings)
+               if (!dssdev->ops || !dssdev->ops->check_timings)
                        continue;
 
                ret = dssdev->ops->check_timings(dssdev, adjusted_mode);

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index a270173..b232acd 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -77,10 +77,10 @@ static void omap_encoder_hdmi_mode_set(struct drm_connector *connector,
        struct omap_dss_device *dssdev = omap_encoder->output;
        bool hdmi_mode = connector->display_info.is_hdmi;
 
-       if (dssdev->ops->hdmi.set_hdmi_mode)
+       if (dssdev->ops && dssdev->ops->hdmi.set_hdmi_mode)
                dssdev->ops->hdmi.set_hdmi_mode(dssdev, hdmi_mode);
 
-       if (hdmi_mode && dssdev->ops->hdmi.set_infoframe) {
+       if (hdmi_mode && dssdev->ops && dssdev->ops->hdmi.set_infoframe) {
                struct hdmi_avi_infoframe avi;
                int r;
 
@@ -139,7 +139,7 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
        dss_mgr_set_timings(output, &vm);
 
        for (dssdev = output; dssdev; dssdev = dssdev->next) {
-               if (dssdev->ops->set_timings)
+               if (dssdev->ops && dssdev->ops->set_timings)
                        dssdev->ops->set_timings(dssdev, adjusted_mode);
        }
 
@@ -168,7 +168,8 @@ static void omap_encoder_disable(struct drm_encoder *encoder)
         * flow where the pipeline output controls the encoder.
         */
        if (dssdev->type != OMAP_DISPLAY_TYPE_DSI) {
-               dssdev->ops->disable(dssdev);
+               if (dssdev->ops && dssdev->ops->disable)
+                       dssdev->ops->disable(dssdev);
                dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
        }
 
@@ -196,7 +197,8 @@ static void omap_encoder_enable(struct drm_encoder *encoder)
         * flow where the pipeline output controls the encoder.
         */
        if (dssdev->type != OMAP_DISPLAY_TYPE_DSI) {
-               dssdev->ops->enable(dssdev);
+               if (dssdev->ops && dssdev->ops->enable)
+                       dssdev->ops->enable(dssdev);
                dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
        }