Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'exynos-drm-next-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

Two cleanups
- Remove Joonyoung Shim from MAINTAINERS and relevant yaml files.
He left from Samsung so his email address isn't valid anymore.

Fixup
- Fix resume function issue of exynos decon driver by calling
clk_disable_unprepare() properly if clk_prepare_enable() failed.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220712061008.199961-1-inki.dae@samsung.com

+17 -13
+4
CREDITS
··· 3491 3491 S: San Jose, California 3492 3492 S: USA 3493 3493 3494 + N: Joonyoung Shim 3495 + E: y0922.shim@samsung.com 3496 + D: Samsung Exynos DRM drivers 3497 + 3494 3498 N: Robert Siemer 3495 3499 E: Robert.Siemer@gmx.de 3496 3500 P: 2048/C99A4289 2F DC 17 2E 56 62 01 C8 3D F2 AC 09 F2 E5 DD EE
-1
Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi-ddc.yaml
··· 8 8 9 9 maintainers: 10 10 - Inki Dae <inki.dae@samsung.com> 11 - - Joonyoung Shim <jy0922.shim@samsung.com> 12 11 - Seung-Woo Kim <sw0312.kim@samsung.com> 13 12 - Kyungmin Park <kyungmin.park@samsung.com> 14 13 - Krzysztof Kozlowski <krzk@kernel.org>
-1
Documentation/devicetree/bindings/display/samsung/samsung,exynos-hdmi.yaml
··· 8 8 9 9 maintainers: 10 10 - Inki Dae <inki.dae@samsung.com> 11 - - Joonyoung Shim <jy0922.shim@samsung.com> 12 11 - Seung-Woo Kim <sw0312.kim@samsung.com> 13 12 - Kyungmin Park <kyungmin.park@samsung.com> 14 13 - Krzysztof Kozlowski <krzk@kernel.org>
-1
Documentation/devicetree/bindings/display/samsung/samsung,exynos-mixer.yaml
··· 8 8 9 9 maintainers: 10 10 - Inki Dae <inki.dae@samsung.com> 11 - - Joonyoung Shim <jy0922.shim@samsung.com> 12 11 - Seung-Woo Kim <sw0312.kim@samsung.com> 13 12 - Kyungmin Park <kyungmin.park@samsung.com> 14 13 - Krzysztof Kozlowski <krzk@kernel.org>
-1
Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-decon.yaml
··· 8 8 9 9 maintainers: 10 10 - Inki Dae <inki.dae@samsung.com> 11 - - Joonyoung Shim <jy0922.shim@samsung.com> 12 11 - Seung-Woo Kim <sw0312.kim@samsung.com> 13 12 - Kyungmin Park <kyungmin.park@samsung.com> 14 13 - Krzysztof Kozlowski <krzk@kernel.org>
-1
Documentation/devicetree/bindings/display/samsung/samsung,exynos5433-mic.yaml
··· 8 8 9 9 maintainers: 10 10 - Inki Dae <inki.dae@samsung.com> 11 - - Joonyoung Shim <jy0922.shim@samsung.com> 12 11 - Seung-Woo Kim <sw0312.kim@samsung.com> 13 12 - Kyungmin Park <kyungmin.park@samsung.com> 14 13 - Krzysztof Kozlowski <krzk@kernel.org>
-1
Documentation/devicetree/bindings/display/samsung/samsung,exynos7-decon.yaml
··· 8 8 9 9 maintainers: 10 10 - Inki Dae <inki.dae@samsung.com> 11 - - Joonyoung Shim <jy0922.shim@samsung.com> 12 11 - Seung-Woo Kim <sw0312.kim@samsung.com> 13 12 - Kyungmin Park <kyungmin.park@samsung.com> 14 13 - Krzysztof Kozlowski <krzk@kernel.org>
-1
Documentation/devicetree/bindings/display/samsung/samsung,fimd.yaml
··· 8 8 9 9 maintainers: 10 10 - Inki Dae <inki.dae@samsung.com> 11 - - Joonyoung Shim <jy0922.shim@samsung.com> 12 11 - Seung-Woo Kim <sw0312.kim@samsung.com> 13 12 - Kyungmin Park <kyungmin.park@samsung.com> 14 13 - Krzysztof Kozlowski <krzk@kernel.org>
-1
Documentation/devicetree/bindings/phy/samsung,exynos-hdmi-phy.yaml
··· 8 8 9 9 maintainers: 10 10 - Inki Dae <inki.dae@samsung.com> 11 - - Joonyoung Shim <jy0922.shim@samsung.com> 12 11 - Seung-Woo Kim <sw0312.kim@samsung.com> 13 12 - Kyungmin Park <kyungmin.park@samsung.com> 14 13 - Krzysztof Kozlowski <krzk@kernel.org>
-1
MAINTAINERS
··· 6748 6748 6749 6749 DRM DRIVERS FOR EXYNOS 6750 6750 M: Inki Dae <inki.dae@samsung.com> 6751 - M: Joonyoung Shim <jy0922.shim@samsung.com> 6752 6751 M: Seung-Woo Kim <sw0312.kim@samsung.com> 6753 6752 M: Kyungmin Park <kyungmin.park@samsung.com> 6754 6753 L: dri-devel@lists.freedesktop.org
+13 -4
drivers/gpu/drm/exynos/exynos7_drm_decon.c
··· 801 801 if (ret < 0) { 802 802 DRM_DEV_ERROR(dev, "Failed to prepare_enable the pclk [%d]\n", 803 803 ret); 804 - return ret; 804 + goto err_pclk_enable; 805 805 } 806 806 807 807 ret = clk_prepare_enable(ctx->aclk); 808 808 if (ret < 0) { 809 809 DRM_DEV_ERROR(dev, "Failed to prepare_enable the aclk [%d]\n", 810 810 ret); 811 - return ret; 811 + goto err_aclk_enable; 812 812 } 813 813 814 814 ret = clk_prepare_enable(ctx->eclk); 815 815 if (ret < 0) { 816 816 DRM_DEV_ERROR(dev, "Failed to prepare_enable the eclk [%d]\n", 817 817 ret); 818 - return ret; 818 + goto err_eclk_enable; 819 819 } 820 820 821 821 ret = clk_prepare_enable(ctx->vclk); 822 822 if (ret < 0) { 823 823 DRM_DEV_ERROR(dev, "Failed to prepare_enable the vclk [%d]\n", 824 824 ret); 825 - return ret; 825 + goto err_vclk_enable; 826 826 } 827 827 828 828 return 0; 829 + 830 + err_vclk_enable: 831 + clk_disable_unprepare(ctx->eclk); 832 + err_eclk_enable: 833 + clk_disable_unprepare(ctx->aclk); 834 + err_aclk_enable: 835 + clk_disable_unprepare(ctx->pclk); 836 + err_pclk_enable: 837 + return ret; 829 838 } 830 839 #endif 831 840