Commit d9aaf7576241a9c24ede9998a630b29b26d8a6d0

Authored by Andrzej Hajda
Committed by Inki Dae
1 parent c52142e6a8

drm/exynos: remove explicit encoder/connector de-initialization

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 <a.hajda@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

Showing 5 changed files with 0 additions and 22 deletions Side-by-side Diff

drivers/gpu/drm/exynos/exynos_dp_core.c
... ... @@ -1355,13 +1355,8 @@
1355 1355 void *data)
1356 1356 {
1357 1357 struct exynos_drm_display *display = dev_get_drvdata(dev);
1358   - struct exynos_dp_device *dp = display->ctx;
1359   - struct drm_encoder *encoder = dp->encoder;
1360 1358  
1361 1359 exynos_dp_dpms(display, DRM_MODE_DPMS_OFF);
1362   -
1363   - exynos_dp_connector_destroy(&dp->connector);
1364   - encoder->funcs->destroy(encoder);
1365 1360 }
1366 1361  
1367 1362 static const struct component_ops exynos_dp_ops = {
drivers/gpu/drm/exynos/exynos_drm_dpi.c
... ... @@ -338,13 +338,9 @@
338 338  
339 339 int exynos_dpi_remove(struct device *dev)
340 340 {
341   - struct drm_encoder *encoder = exynos_dpi_display.encoder;
342 341 struct exynos_dpi *ctx = exynos_dpi_display.ctx;
343 342  
344 343 exynos_dpi_dpms(&exynos_dpi_display, DRM_MODE_DPMS_OFF);
345   -
346   - exynos_dpi_connector_destroy(&ctx->connector);
347   - encoder->funcs->destroy(encoder);
348 344  
349 345 if (ctx->panel)
350 346 drm_panel_detach(ctx->panel);
drivers/gpu/drm/exynos/exynos_drm_dsi.c
... ... @@ -1660,12 +1660,8 @@
1660 1660 void *data)
1661 1661 {
1662 1662 struct exynos_dsi *dsi = exynos_dsi_display.ctx;
1663   - struct drm_encoder *encoder = dsi->encoder;
1664 1663  
1665 1664 exynos_dsi_dpms(&exynos_dsi_display, DRM_MODE_DPMS_OFF);
1666   -
1667   - exynos_dsi_connector_destroy(&dsi->connector);
1668   - encoder->funcs->destroy(encoder);
1669 1665  
1670 1666 mipi_dsi_host_unregister(&dsi->dsi_host);
1671 1667 }
drivers/gpu/drm/exynos/exynos_drm_vidi.c
... ... @@ -639,9 +639,6 @@
639 639 return -EINVAL;
640 640 }
641 641  
642   - encoder->funcs->destroy(encoder);
643   - drm_connector_cleanup(&ctx->connector);
644   -
645 642 return 0;
646 643 }
647 644  
drivers/gpu/drm/exynos/exynos_hdmi.c
... ... @@ -2312,12 +2312,6 @@
2312 2312  
2313 2313 static void hdmi_unbind(struct device *dev, struct device *master, void *data)
2314 2314 {
2315   - struct exynos_drm_display *display = get_hdmi_display(dev);
2316   - struct drm_encoder *encoder = display->encoder;
2317   - struct hdmi_context *hdata = display->ctx;
2318   -
2319   - hdmi_connector_destroy(&hdata->connector);
2320   - encoder->funcs->destroy(encoder);
2321 2315 }
2322 2316  
2323 2317 static const struct component_ops hdmi_component_ops = {