Hi,
On Tue, Nov 24, 2020 at 02:45:09PM +0200, Tomi Valkeinen wrote:
> The functions in display.c are not used, so drop the file.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
-- Sebastian
> drivers/gpu/drm/omapdrm/Makefile | 2 +-
> drivers/gpu/drm/omapdrm/dss/display.c | 58 ---------------------------
> drivers/gpu/drm/omapdrm/dss/omapdss.h | 4 --
> 3 files changed, 1 insertion(+), 63 deletions(-)
> delete mode 100644 drivers/gpu/drm/omapdrm/dss/display.c
>
> diff --git a/drivers/gpu/drm/omapdrm/Makefile b/drivers/gpu/drm/omapdrm/Makefile
> index 33fe7e937680..21e8277ff88f 100644
> --- a/drivers/gpu/drm/omapdrm/Makefile
> +++ b/drivers/gpu/drm/omapdrm/Makefile
> @@ -18,7 +18,7 @@ omapdrm-y := omap_drv.o \
>
> omapdrm-$(CONFIG_DRM_FBDEV_EMULATION) += omap_fbdev.o
>
> -omapdrm-y += dss/base.o dss/display.o dss/output.o dss/dss.o dss/dispc.o \
> +omapdrm-y += dss/base.o dss/output.o dss/dss.o dss/dispc.o \
> dss/dispc_coefs.o dss/pll.o dss/video-pll.o
> omapdrm-$(CONFIG_OMAP2_DSS_DPI) += dss/dpi.o
> omapdrm-$(CONFIG_OMAP2_DSS_VENC) += dss/venc.o
> diff --git a/drivers/gpu/drm/omapdrm/dss/display.c b/drivers/gpu/drm/omapdrm/dss/display.c
> deleted file mode 100644
> index 7b7ee2019eae..000000000000
> --- a/drivers/gpu/drm/omapdrm/dss/display.c
> +++ /dev/null
> @@ -1,58 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * Copyright (C) 2009 Nokia Corporation
> - * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx>
> - *
> - * Some code and ideas taken from drivers/video/omap/ driver
> - * by Imre Deak.
> - */
> -
> -#define DSS_SUBSYS_NAME "DISPLAY"
> -
> -#include <linux/kernel.h>
> -#include <linux/of.h>
> -
> -#include <drm/drm_connector.h>
> -#include <drm/drm_modes.h>
> -
> -#include "omapdss.h"
> -
> -static int disp_num_counter;
> -
> -void omapdss_display_init(struct omap_dss_device *dssdev)
> -{
> - int id;
> -
> - /*
> - * Note: this presumes that all displays either have an DT alias, or
> - * none has.
> - */
> - id = of_alias_get_id(dssdev->dev->of_node, "display");
> - if (id < 0)
> - id = disp_num_counter++;
> -
> - /* Use 'label' property for name, if it exists */
> - of_property_read_string(dssdev->dev->of_node, "label", &dssdev->name);
> -
> - if (dssdev->name == NULL)
> - dssdev->name = devm_kasprintf(dssdev->dev, GFP_KERNEL,
> - "display%u", id);
> -}
> -
> -int omapdss_display_get_modes(struct drm_connector *connector,
> - const struct videomode *vm)
> -{
> - struct drm_display_mode *mode;
> -
> - mode = drm_mode_create(connector->dev);
> - if (!mode)
> - return 0;
> -
> - drm_display_mode_from_videomode(vm, mode);
> -
> - mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
> - drm_mode_set_name(mode);
> - drm_mode_probed_add(connector, mode);
> -
> - return 1;
> -}
> diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss.h b/drivers/gpu/drm/omapdrm/dss/omapdss.h
> index 4e7ae164de4f..90e41c635e45 100644
> --- a/drivers/gpu/drm/omapdrm/dss/omapdss.h
> +++ b/drivers/gpu/drm/omapdrm/dss/omapdss.h
> @@ -300,10 +300,6 @@ struct dss_pdata {
> struct dss_device *dss;
> };
>
> -void omapdss_display_init(struct omap_dss_device *dssdev);
> -int omapdss_display_get_modes(struct drm_connector *connector,
> - const struct videomode *vm);
> -
> void omapdss_device_register(struct omap_dss_device *dssdev);
> void omapdss_device_unregister(struct omap_dss_device *dssdev);
> struct omap_dss_device *omapdss_device_get(struct omap_dss_device *dssdev);
> --
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
>
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
