drm/omap: remove unused omap_connector

Remove unused code. Connectors are now created via drm_bridge_connector_init()
and no longer OMAP specific.

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

diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile
index 66a73eae6f7cc16413ddf061f588badfa1704f40..2a404e045b78f50da1d306862a1ba57119406a13 100644 (file)
--- a/drivers/gpu/drm/omapdrm/Makefile
+++ b/drivers/gpu/drm/omapdrm/Makefile
@@ -12,7 +12,6 @@ omapdrm-y := omap_drv.o \
        omap_crtc.o \
        omap_plane.o \
        omap_encoder.o \
-       omap_connector.o \
        omap_fb.o \
        omap_gem.o \
        omap_gem_dmabuf.o \

diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
deleted file mode 100644 (file)
index 9d14a31..0000000
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ /dev/null
@@ -1,128 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright (C) 2011 Texas Instruments Incorporated - https://www.ti.com/
- * Author: Rob Clark <rob@ti.com>
- */
-
-#include <drm/drm_atomic_helper.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_probe_helper.h>
-
-#include "omap_drv.h"
-
-/*
- * connector funcs
- */
-
-#define to_omap_connector(x) container_of(x, struct omap_connector, base)
-
-struct omap_connector {
-       struct drm_connector base;
-       struct omap_dss_device *output;
-};
-
-static enum drm_connector_status omap_connector_detect(
-               struct drm_connector *connector, bool force)
-{
-       return connector_status_connected;
-}
-
-static void omap_connector_destroy(struct drm_connector *connector)
-{
-       struct omap_connector *omap_connector = to_omap_connector(connector);
-
-       DBG("%s", connector->name);
-
-       drm_connector_unregister(connector);
-       drm_connector_cleanup(connector);
-
-       omapdss_device_put(omap_connector->output);
-
-       kfree(omap_connector);
-}
-
-static int omap_connector_get_modes(struct drm_connector *connector)
-{
-       DBG("%s", connector->name);
-
-       /* We can't retrieve modes. The KMS core will add the default modes. */
-       return 0;
-}
-
-enum drm_mode_status omap_connector_mode_fixup(struct omap_dss_device *dssdev,
-                                       const struct drm_display_mode *mode,
-                                       struct drm_display_mode *adjusted_mode)
-{
-       return MODE_OK;
-}
-
-static enum drm_mode_status omap_connector_mode_valid(struct drm_connector *connector,
-                                struct drm_display_mode *mode)
-{
-       struct omap_connector *omap_connector = to_omap_connector(connector);
-       struct drm_display_mode new_mode = {};
-       enum drm_mode_status status;
-
-       status = omap_connector_mode_fixup(omap_connector->output, mode,
-                                          &new_mode);
-       if (status != MODE_OK)
-               goto done;
-
-       /* Check if vrefresh is still valid. */
-       if (drm_mode_vrefresh(mode) != drm_mode_vrefresh(&new_mode))
-               status = MODE_NOCLOCK;
-
-done:
-       DBG("connector: mode %s: " DRM_MODE_FMT,
-                       (status == MODE_OK) ? "valid" : "invalid",
-                       DRM_MODE_ARG(mode));
-
-       return status;
-}
-
-static const struct drm_connector_funcs omap_connector_funcs = {
-       .reset = drm_atomic_helper_connector_reset,
-       .detect = omap_connector_detect,
-       .fill_modes = drm_helper_probe_single_connector_modes,
-       .destroy = omap_connector_destroy,
-       .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-       .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-};
-
-static const struct drm_connector_helper_funcs omap_connector_helper_funcs = {
-       .get_modes = omap_connector_get_modes,
-       .mode_valid = omap_connector_mode_valid,
-};
-
-/* initialize connector */
-struct drm_connector *omap_connector_init(struct drm_device *dev,
-                                         struct omap_dss_device *output,
-                                         struct drm_encoder *encoder)
-{
-       struct drm_connector *connector = NULL;
-       struct omap_connector *omap_connector;
-
-       DBG("%s", output->name);
-
-       omap_connector = kzalloc(sizeof(*omap_connector), GFP_KERNEL);
-       if (!omap_connector)
-               goto fail;
-
-       omap_connector->output = omapdss_device_get(output);
-
-       connector = &omap_connector->base;
-       connector->interlace_allowed = 1;
-       connector->doublescan_allowed = 0;
-
-       drm_connector_init(dev, connector, &omap_connector_funcs,
-                          DRM_MODE_CONNECTOR_DSI);
-       drm_connector_helper_add(connector, &omap_connector_helper_funcs);
-
-       return connector;
-
-fail:
-       if (connector)
-               omap_connector_destroy(connector);
-
-       return NULL;
-}

diff --git a/drivers/gpu/drm/omapdrm/omap_connector.h b/drivers/gpu/drm/omapdrm/omap_connector.h
deleted file mode 100644 (file)
index 0ecd4f1..0000000
--- a/drivers/gpu/drm/omapdrm/omap_connector.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * omap_connector.h -- OMAP DRM Connector
- *
- * Copyright (C) 2011 Texas Instruments
- * Author: Rob Clark <rob@ti.com>
- */
-
-#ifndef __OMAPDRM_CONNECTOR_H__
-#define __OMAPDRM_CONNECTOR_H__
-
-#include <linux/types.h>
-
-enum drm_mode_status;
-
-struct drm_connector;
-struct drm_device;
-struct drm_encoder;
-struct omap_dss_device;
-
-struct drm_connector *omap_connector_init(struct drm_device *dev,
-                                         struct omap_dss_device *output,
-                                         struct drm_encoder *encoder);
-enum drm_mode_status omap_connector_mode_fixup(struct omap_dss_device *dssdev,
-                                       const struct drm_display_mode *mode,
-                                       struct drm_display_mode *adjusted_mode);
-
-#endif /* __OMAPDRM_CONNECTOR_H__ */

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 825478c0196815ed31adc9cf4463e1a3a1d96778..81e0972c07ccf3ea04ac4ec4299d2b7bbd7ee773 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -332,19 +332,12 @@ static int omap_modeset_init(struct drm_device *dev)
                struct drm_encoder *encoder = pipe->encoder;
                struct drm_crtc *crtc;
 
-               if (pipe->output->next) {
-                       pipe->connector = omap_connector_init(dev, pipe->output,
-                                                             encoder);
-                       if (!pipe->connector)
-                               return -ENOMEM;
-               } else {
-                       pipe->connector = drm_bridge_connector_init(dev, encoder);
-                       if (IS_ERR(pipe->connector)) {
-                               dev_err(priv->dev,
-                                       "unable to create bridge connector for %s\n",
-                                       pipe->output->name);
-                               return PTR_ERR(pipe->connector);
-                       }
+               pipe->connector = drm_bridge_connector_init(dev, encoder);
+               if (IS_ERR(pipe->connector)) {
+                       dev_err(priv->dev,
+                               "unable to create bridge connector for %s\n",
+                               pipe->output->name);
+                       return PTR_ERR(pipe->connector);
                }
 
                drm_connector_attach_encoder(pipe->connector, encoder);

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h
index ae57e7ada87698bcfe95eff705a6d6fb2caa985d..38e15962c9807e5af203a56d79a02c7c2c02ab41 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.h
+++ b/drivers/gpu/drm/omapdrm/omap_drv.h
@@ -16,7 +16,6 @@
 #include <drm/drm_gem.h>
 #include <drm/omap_drm.h>
 
-#include "omap_connector.h"
 #include "omap_crtc.h"
 #include "omap_encoder.h"
 #include "omap_fb.h"

diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index e378c8751e1162e52089af7c201f76fb409c6e85..943348912be88d9d6b0295c17aeae746e2db814e 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -117,27 +117,8 @@ static void omap_encoder_mode_set(struct drm_encoder *encoder,
        dss_mgr_set_timings(output, &vm);
 }
 
-static int omap_encoder_atomic_check(struct drm_encoder *encoder,
-                                    struct drm_crtc_state *crtc_state,
-                                    struct drm_connector_state *conn_state)
-{
-       struct omap_encoder *omap_encoder = to_omap_encoder(encoder);
-       enum drm_mode_status status;
-
-       status = omap_connector_mode_fixup(omap_encoder->output,
-                                          &crtc_state->mode,
-                                          &crtc_state->adjusted_mode);
-       if (status != MODE_OK) {
-               dev_err(encoder->dev->dev, "invalid timings: %d\n", status);
-               return -EINVAL;
-       }
-
-       return 0;
-}
-
 static const struct drm_encoder_helper_funcs omap_encoder_helper_funcs = {
        .mode_set = omap_encoder_mode_set,
-       .atomic_check = omap_encoder_atomic_check,
 };
 
 /* initialize encoder */