From 0cd8a73122b273672cec7efdfb617ddca3423a2e Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Thu, 30 Jun 2022 13:12:17 +0900 Subject: drm/exynos: MAINTAINERS: move Joonyoung Shim to credits Emails to Joonyoung Shim bounce ("550 5.1.1 Recipient address rejected: User unknown"), so move him to credits file. Signed-off-by: Krzysztof Kozlowski Signed-off-by: Inki Dae --- CREDITS | 4 ++++ MAINTAINERS | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CREDITS b/CREDITS index 7e85a53b6a88..91a564c17012 100644 --- a/CREDITS +++ b/CREDITS @@ -3491,6 +3491,10 @@ D: wd33c93 SCSI driver (linux-m68k) S: San Jose, California S: USA +N: Joonyoung Shim +E: y0922.shim@samsung.com +D: Samsung Exynos DRM drivers + N: Robert Siemer E: Robert.Siemer@gmx.de P: 2048/C99A4289 2F DC 17 2E 56 62 01 C8 3D F2 AC 09 F2 E5 DD EE diff --git a/MAINTAINERS b/MAINTAINERS index 6a66d91e02a2..b6cb25173008 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6656,7 +6656,6 @@ F: drivers/gpu/drm/bridge/ DRM DRIVERS FOR EXYNOS M: Inki Dae -M: Joonyoung Shim M: Seung-Woo Kim M: Kyungmin Park L: dri-devel@lists.freedesktop.org -- cgit From f4284724c2163efc941604990f4e2326f5c1093d Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Fri, 1 Jul 2022 09:31:23 +0900 Subject: dt-bindings: remove Joonyoung Shim from maintainers Emails to Joonyoung Shim bounce ("550 5.1.1 Recipient address rejected: User unknown"), so remove him from maintainers of DT bindings (display, phy). Signed-off-by: Krzysztof Kozlowski Signed-off-by: Inki Dae --- .../devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml | 1 - .../devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml | 1 - .../devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml | 1 - .../devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml | 1 - .../devicetree/bindings/display/samsung/samsung,exynos5433-mic.yaml | 1 - .../devicetree/bindings/display/samsung/samsung,exynos7-decon.yaml | 1 - Documentation/devicetree/bindings/display/samsung/samsung,fimd.yaml | 1 - Documentation/devicetree/bindings/phy/samsung,exynos-hdmi-phy.yaml | 1 - 8 files changed, 8 deletions(-) diff --git a/Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml b/Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml index 919734c05c0b..458d399cb025 100644 --- a/Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml +++ b/Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml @@ -8,7 +8,6 @@ title: Samsung Exynos SoC HDMI DDC maintainers: - Inki Dae - - Joonyoung Shim - Seung-Woo Kim - Kyungmin Park - Krzysztof Kozlowski diff --git a/Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml b/Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml index 63379fae3636..e4a68c5a1a09 100644 --- a/Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml @@ -8,7 +8,6 @@ title: Samsung Exynos SoC HDMI maintainers: - Inki Dae - - Joonyoung Shim - Seung-Woo Kim - Kyungmin Park - Krzysztof Kozlowski diff --git a/Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml b/Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml index 00e325a19cb1..25d53fde92e1 100644 --- a/Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml +++ b/Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml @@ -8,7 +8,6 @@ title: Samsung Exynos SoC Mixer maintainers: - Inki Dae - - Joonyoung Shim - Seung-Woo Kim - Kyungmin Park - Krzysztof Kozlowski diff --git a/Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml b/Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml index 7c37470bd329..921bfe925cd6 100644 --- a/Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml +++ b/Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml @@ -8,7 +8,6 @@ title: Samsung Exynos5433 SoC Display and Enhancement Controller (DECON) maintainers: - Inki Dae - - Joonyoung Shim - Seung-Woo Kim - Kyungmin Park - Krzysztof Kozlowski diff --git a/Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-mic.yaml b/Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-mic.yaml index c5c6239c28d0..7d405f2febcd 100644 --- a/Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-mic.yaml +++ b/Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-mic.yaml @@ -8,7 +8,6 @@ title: Samsung Exynos5433 SoC Mobile Image Compressor (MIC) maintainers: - Inki Dae - - Joonyoung Shim - Seung-Woo Kim - Kyungmin Park - Krzysztof Kozlowski diff --git a/Documentation/devicetree/bindings/display/samsung/samsung,exynos7-decon.yaml b/Documentation/devicetree/bindings/display/samsung/samsung,exynos7-decon.yaml index 320eedc61a5b..969bd8c563a5 100644 --- a/Documentation/devicetree/bindings/display/samsung/samsung,exynos7-decon.yaml +++ b/Documentation/devicetree/bindings/display/samsung/samsung,exynos7-decon.yaml @@ -8,7 +8,6 @@ title: Samsung Exynos7 SoC Display and Enhancement Controller (DECON) maintainers: - Inki Dae - - Joonyoung Shim - Seung-Woo Kim - Kyungmin Park - Krzysztof Kozlowski diff --git a/Documentation/devicetree/bindings/display/samsung/samsung,fimd.yaml b/Documentation/devicetree/bindings/display/samsung/samsung,fimd.yaml index c62ea9d22843..5d5cc220f78a 100644 --- a/Documentation/devicetree/bindings/display/samsung/samsung,fimd.yaml +++ b/Documentation/devicetree/bindings/display/samsung/samsung,fimd.yaml @@ -8,7 +8,6 @@ title: Samsung S3C/S5P/Exynos SoC Fully Interactive Mobile Display (FIMD) maintainers: - Inki Dae - - Joonyoung Shim - Seung-Woo Kim - Kyungmin Park - Krzysztof Kozlowski diff --git a/Documentation/devicetree/bindings/phy/samsung,exynos-hdmi-phy.yaml b/Documentation/devicetree/bindings/phy/samsung,exynos-hdmi-phy.yaml index 3e5f035de2e9..efc679c385ab 100644 --- a/Documentation/devicetree/bindings/phy/samsung,exynos-hdmi-phy.yaml +++ b/Documentation/devicetree/bindings/phy/samsung,exynos-hdmi-phy.yaml @@ -8,7 +8,6 @@ title: Samsung Exynos SoC HDMI PHY maintainers: - Inki Dae - - Joonyoung Shim - Seung-Woo Kim - Kyungmin Park - Krzysztof Kozlowski -- cgit From 48b927770f8ad3f8cf4a024a552abf272af9f592 Mon Sep 17 00:00:00 2001 From: Jian Zhang Date: Tue, 12 Jul 2022 13:56:11 +0900 Subject: drm/exynos/exynos7_drm_decon: free resources when clk_set_parent() failed. In exynos7_decon_resume, When it fails, we must use clk_disable_unprepare() to free resource that have been used. Fixes: 6f83d20838c09 ("drm/exynos: use DRM_DEV_ERROR to print out error message") Reported-by: Hulk Robot Signed-off-by: Jian Zhang Signed-off-by: Inki Dae --- drivers/gpu/drm/exynos/exynos7_drm_decon.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 3047edf355b5..7080cf7952ec 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c @@ -801,31 +801,40 @@ static int exynos7_decon_resume(struct device *dev) if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to prepare_enable the pclk [%d]\n", ret); - return ret; + goto err_pclk_enable; } ret = clk_prepare_enable(ctx->aclk); if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to prepare_enable the aclk [%d]\n", ret); - return ret; + goto err_aclk_enable; } ret = clk_prepare_enable(ctx->eclk); if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to prepare_enable the eclk [%d]\n", ret); - return ret; + goto err_eclk_enable; } ret = clk_prepare_enable(ctx->vclk); if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to prepare_enable the vclk [%d]\n", ret); - return ret; + goto err_vclk_enable; } return 0; + +err_vclk_enable: + clk_disable_unprepare(ctx->eclk); +err_eclk_enable: + clk_disable_unprepare(ctx->aclk); +err_aclk_enable: + clk_disable_unprepare(ctx->pclk); +err_pclk_enable: + return ret; } #endif -- cgit