From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753591AbaIVJbL (ORCPT ); Mon, 22 Sep 2014 05:31:11 -0400 Received: from mailout2.w1.samsung.com ([210.118.77.12]:33822 "EHLO mailout2.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750914AbaIVJbI (ORCPT ); Mon, 22 Sep 2014 05:31:08 -0400 X-AuditID: cbfec7f4-b7f156d0000063c7-66-541fec5915a1 From: Andrzej Hajda To: Inki Dae Cc: Andrzej Hajda , Joonyoung Shim , Seung-Woo Kim , Kyungmin Park , David Airlie , Kukjin Kim , dri-devel@lists.freedesktop.org (open list:DRM DRIVERS FOR E...), linux-samsung-soc@vger.kernel.org (moderated list:ARM/S5P EXYNOS AR...), linux-kernel@vger.kernel.org (open list), m.szyprowski@samsung.com Subject: [PATCH] drm/exynos: remove explicit encoder/connector de-initialization Date: Mon, 22 Sep 2014 11:30:48 +0200 Message-id: <1411378248-17479-1-git-send-email-a.hajda@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDJMWRmVeSWpSXmKPExsVy+t/xy7qRb+RDDFrfGVvcWneO1aL33Ekm iytf37NZTLo/gcXixb2LLBa9C66yWZxtesNucXnXHDaLGef3MVmsPXKX3WLG5JdsDtwe2789 YPW4332cyaNvyypGj8+b5AJYorhsUlJzMstSi/TtErgylqybzFxwR7ai4b13A+N5yS5GTg4J AROJG0feskHYYhIX7q0Hsrk4hASWMkq0XXjGDOH0MUmsWz2PBaSKTUBT4u/mm2AdIgLKEqv2 tbOD2MwCx5gl7jaVg9jCAgES05uuMoHYLAKqEpf2rQfr5RVwlvi75xE7xDY5iZPHJrNOYORe wMiwilE0tTS5oDgpPddQrzgxt7g0L10vOT93EyMkhL7sYFx8zOoQowAHoxIP74Im+RAh1sSy 4srcQ4wSHMxKIrxPnwOFeFMSK6tSi/Lji0pzUosPMTJxcEo1MPKqh54WPxvHJqG74B1TIoe5 GP8npodW06TWX+ucydFWOvncOj4fKa8HybsfzSxTz7kQIJT2o8o55EyTqPOei95ft0++tFP+ 7sQrImFnRQosP26/m5qd1D7v5fmC9Wzxu9x2lUY6bd2aeE2F+zcrw75VJYt3Hl18op0zvlFn UdLPmxsV1+5ynKDEUpyRaKjFXFScCAAJN1yB/wEAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All KMS objects are destroyed by drm_mode_config_cleanup in proper order so component drivers should not care about it. Signed-off-by: Andrzej Hajda --- Hi Inki, This is another spin-off of exynos_drm tests regarding your component support update. The patch is based as usual on the latest exynos-drm-next branch. Regards Andrzej --- drivers/gpu/drm/exynos/exynos_dp_core.c | 5 ----- drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 ---- drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 ---- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 3 --- drivers/gpu/drm/exynos/exynos_hdmi.c | 6 ------ 5 files changed, 22 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c b/drivers/gpu/drm/exynos/exynos_dp_core.c index cd50ece..6adb1e5 100644 --- a/drivers/gpu/drm/exynos/exynos_dp_core.c +++ b/drivers/gpu/drm/exynos/exynos_dp_core.c @@ -1355,13 +1355,8 @@ static void exynos_dp_unbind(struct device *dev, struct device *master, void *data) { struct exynos_drm_display *display = dev_get_drvdata(dev); - struct exynos_dp_device *dp = display->ctx; - struct drm_encoder *encoder = dp->encoder; exynos_dp_dpms(display, DRM_MODE_DPMS_OFF); - - exynos_dp_connector_destroy(&dp->connector); - encoder->funcs->destroy(encoder); } static const struct component_ops exynos_dp_ops = { diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c index 96c87db..3dc678e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c @@ -338,14 +338,10 @@ err_del_component: int exynos_dpi_remove(struct device *dev) { - struct drm_encoder *encoder = exynos_dpi_display.encoder; struct exynos_dpi *ctx = exynos_dpi_display.ctx; exynos_dpi_dpms(&exynos_dpi_display, DRM_MODE_DPMS_OFF); - exynos_dpi_connector_destroy(&ctx->connector); - encoder->funcs->destroy(encoder); - if (ctx->panel) drm_panel_detach(ctx->panel); diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c index 24741d8..acf7e9e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c @@ -1660,13 +1660,9 @@ static void exynos_dsi_unbind(struct device *dev, struct device *master, void *data) { struct exynos_dsi *dsi = exynos_dsi_display.ctx; - struct drm_encoder *encoder = dsi->encoder; exynos_dsi_dpms(&exynos_dsi_display, DRM_MODE_DPMS_OFF); - exynos_dsi_connector_destroy(&dsi->connector); - encoder->funcs->destroy(encoder); - mipi_dsi_host_unregister(&dsi->dsi_host); } diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index d565207..9395e85 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c @@ -639,9 +639,6 @@ static int vidi_remove(struct platform_device *pdev) return -EINVAL; } - encoder->funcs->destroy(encoder); - drm_connector_cleanup(&ctx->connector); - return 0; } diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 7910fb3..563a19e 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -2312,12 +2312,6 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data) static void hdmi_unbind(struct device *dev, struct device *master, void *data) { - struct exynos_drm_display *display = get_hdmi_display(dev); - struct drm_encoder *encoder = display->encoder; - struct hdmi_context *hdata = display->ctx; - - hdmi_connector_destroy(&hdata->connector); - encoder->funcs->destroy(encoder); } static const struct component_ops hdmi_component_ops = { -- 1.9.1