From: "Artur Świgoń" <a.swigon@partner.samsung.com> To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: krzk@kernel.org, cw00.choi@samsung.com, myungjoo.ham@samsung.com, inki.dae@samsung.com, sw0312.kim@samsung.com, georgi.djakov@linaro.org, m.szyprowski@samsung.com Subject: [RFC PATCH 11/11] drm: exynos: mixer: Add interconnect support Date: Tue, 23 Jul 2019 14:20:16 +0200 [thread overview] Message-ID: <20190723122016.30279-12-a.swigon@partner.samsung.com> (raw) In-Reply-To: <20190723122016.30279-1-a.swigon@partner.samsung.com> From: Marek Szyprowski <m.szyprowski@samsung.com> This patch adds interconnect support to exynos-mixer. Please note that the mixer works the same as before when CONFIG_INTERCONNECT is 'n'. Co-developed-by: Artur Świgoń <a.swigon@partner.samsung.com> Signed-off-by: Artur Świgoń <a.swigon@partner.samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/gpu/drm/exynos/exynos_mixer.c | 68 +++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 7b24338fad3c..fb763854b300 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -13,6 +13,7 @@ #include <linux/component.h> #include <linux/delay.h> #include <linux/i2c.h> +#include <linux/interconnect.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/kernel.h> @@ -97,6 +98,7 @@ struct mixer_context { struct exynos_drm_crtc *crtc; struct exynos_drm_plane planes[MIXER_WIN_NR]; unsigned long flags; + struct icc_path *soc_path; int irq; void __iomem *mixer_regs; @@ -931,6 +933,37 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc) mixer_reg_writemask(mixer_ctx, MXR_INT_EN, 0, MXR_INT_EN_VSYNC); } +static void mixer_set_memory_bandwidth(struct exynos_drm_crtc *crtc) +{ + struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; + struct mixer_context *ctx = crtc->ctx; + unsigned long bw, bandwidth = 0; + int i, j, sub; + + for (i = 0; i < MIXER_WIN_NR; i++) { + struct drm_plane *plane = &ctx->planes[i].base; + const struct drm_format_info *format; + + if (plane->state && plane->state->crtc && plane->state->fb) { + format = plane->state->fb->format; + bw = mode->hdisplay * mode->vdisplay * + drm_mode_vrefresh(mode); + if (mode->flags & DRM_MODE_FLAG_INTERLACE) + bw /= 2; + for (j = 0; j < format->num_planes; j++) { + sub = j ? (format->vsub * format->hsub) : 1; + bandwidth += format->cpp[j] * bw / sub; + } + } + } + + /* add 20% safety margin */ + bandwidth = 5UL * bandwidth / 4; + + pr_info("exynos-mixer: safe bandwidth %ld Bps\n", bandwidth); + icc_set_bw(ctx->soc_path, 0, Bps_to_icc(bandwidth)); +} + static void mixer_atomic_begin(struct exynos_drm_crtc *crtc) { struct mixer_context *ctx = crtc->ctx; @@ -982,6 +1015,7 @@ static void mixer_atomic_flush(struct exynos_drm_crtc *crtc) if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags)) return; + mixer_set_memory_bandwidth(crtc); mixer_enable_sync(mixer_ctx); exynos_crtc_handle_event(crtc); } @@ -1029,6 +1063,7 @@ static void mixer_disable(struct exynos_drm_crtc *crtc) for (i = 0; i < MIXER_WIN_NR; i++) mixer_disable_plane(crtc, &ctx->planes[i]); + mixer_set_memory_bandwidth(crtc); exynos_drm_pipe_clk_enable(crtc, false); pm_runtime_put(ctx->dev); @@ -1220,12 +1255,22 @@ static int mixer_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; const struct mixer_drv_data *drv; struct mixer_context *ctx; + struct icc_path *path; int ret; + /* + * Returns NULL if CONFIG_INTERCONNECT is disabled. + * May return ERR_PTR(-EPROBE_DEFER). + */ + path = of_icc_get(dev, NULL); + if (IS_ERR(path)) + return PTR_ERR(path); + ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) { DRM_DEV_ERROR(dev, "failed to alloc mixer context.\n"); - return -ENOMEM; + ret = -ENOMEM; + goto err; } drv = of_device_get_match_data(dev); @@ -1233,6 +1278,7 @@ static int mixer_probe(struct platform_device *pdev) ctx->pdev = pdev; ctx->dev = dev; ctx->mxr_ver = drv->version; + ctx->soc_path = path; if (drv->is_vp_enabled) __set_bit(MXR_BIT_VP_ENABLED, &ctx->flags); @@ -1242,17 +1288,29 @@ static int mixer_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); ret = component_add(&pdev->dev, &mixer_component_ops); - if (!ret) - pm_runtime_enable(dev); + if (ret < 0) + goto err; + + pm_runtime_enable(dev); + + return 0; + +err: + icc_put(path); return ret; } static int mixer_remove(struct platform_device *pdev) { - pm_runtime_disable(&pdev->dev); + struct device *dev = &pdev->dev; + struct mixer_context *ctx = dev_get_drvdata(dev); - component_del(&pdev->dev, &mixer_component_ops); + pm_runtime_disable(dev); + + component_del(dev, &mixer_component_ops); + + icc_put(ctx->soc_path); return 0; } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: "Artur Świgoń" <a.swigon@partner.samsung.com> To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: sw0312.kim@samsung.com, krzk@kernel.org, inki.dae@samsung.com, cw00.choi@samsung.com, myungjoo.ham@samsung.com, georgi.djakov@linaro.org, m.szyprowski@samsung.com Subject: [RFC PATCH 11/11] drm: exynos: mixer: Add interconnect support Date: Tue, 23 Jul 2019 14:20:16 +0200 [thread overview] Message-ID: <20190723122016.30279-12-a.swigon@partner.samsung.com> (raw) In-Reply-To: <20190723122016.30279-1-a.swigon@partner.samsung.com> From: Marek Szyprowski <m.szyprowski@samsung.com> This patch adds interconnect support to exynos-mixer. Please note that the mixer works the same as before when CONFIG_INTERCONNECT is 'n'. Co-developed-by: Artur Świgoń <a.swigon@partner.samsung.com> Signed-off-by: Artur Świgoń <a.swigon@partner.samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- drivers/gpu/drm/exynos/exynos_mixer.c | 68 +++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 7b24338fad3c..fb763854b300 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -13,6 +13,7 @@ #include <linux/component.h> #include <linux/delay.h> #include <linux/i2c.h> +#include <linux/interconnect.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/kernel.h> @@ -97,6 +98,7 @@ struct mixer_context { struct exynos_drm_crtc *crtc; struct exynos_drm_plane planes[MIXER_WIN_NR]; unsigned long flags; + struct icc_path *soc_path; int irq; void __iomem *mixer_regs; @@ -931,6 +933,37 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc) mixer_reg_writemask(mixer_ctx, MXR_INT_EN, 0, MXR_INT_EN_VSYNC); } +static void mixer_set_memory_bandwidth(struct exynos_drm_crtc *crtc) +{ + struct drm_display_mode *mode = &crtc->base.state->adjusted_mode; + struct mixer_context *ctx = crtc->ctx; + unsigned long bw, bandwidth = 0; + int i, j, sub; + + for (i = 0; i < MIXER_WIN_NR; i++) { + struct drm_plane *plane = &ctx->planes[i].base; + const struct drm_format_info *format; + + if (plane->state && plane->state->crtc && plane->state->fb) { + format = plane->state->fb->format; + bw = mode->hdisplay * mode->vdisplay * + drm_mode_vrefresh(mode); + if (mode->flags & DRM_MODE_FLAG_INTERLACE) + bw /= 2; + for (j = 0; j < format->num_planes; j++) { + sub = j ? (format->vsub * format->hsub) : 1; + bandwidth += format->cpp[j] * bw / sub; + } + } + } + + /* add 20% safety margin */ + bandwidth = 5UL * bandwidth / 4; + + pr_info("exynos-mixer: safe bandwidth %ld Bps\n", bandwidth); + icc_set_bw(ctx->soc_path, 0, Bps_to_icc(bandwidth)); +} + static void mixer_atomic_begin(struct exynos_drm_crtc *crtc) { struct mixer_context *ctx = crtc->ctx; @@ -982,6 +1015,7 @@ static void mixer_atomic_flush(struct exynos_drm_crtc *crtc) if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags)) return; + mixer_set_memory_bandwidth(crtc); mixer_enable_sync(mixer_ctx); exynos_crtc_handle_event(crtc); } @@ -1029,6 +1063,7 @@ static void mixer_disable(struct exynos_drm_crtc *crtc) for (i = 0; i < MIXER_WIN_NR; i++) mixer_disable_plane(crtc, &ctx->planes[i]); + mixer_set_memory_bandwidth(crtc); exynos_drm_pipe_clk_enable(crtc, false); pm_runtime_put(ctx->dev); @@ -1220,12 +1255,22 @@ static int mixer_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; const struct mixer_drv_data *drv; struct mixer_context *ctx; + struct icc_path *path; int ret; + /* + * Returns NULL if CONFIG_INTERCONNECT is disabled. + * May return ERR_PTR(-EPROBE_DEFER). + */ + path = of_icc_get(dev, NULL); + if (IS_ERR(path)) + return PTR_ERR(path); + ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL); if (!ctx) { DRM_DEV_ERROR(dev, "failed to alloc mixer context.\n"); - return -ENOMEM; + ret = -ENOMEM; + goto err; } drv = of_device_get_match_data(dev); @@ -1233,6 +1278,7 @@ static int mixer_probe(struct platform_device *pdev) ctx->pdev = pdev; ctx->dev = dev; ctx->mxr_ver = drv->version; + ctx->soc_path = path; if (drv->is_vp_enabled) __set_bit(MXR_BIT_VP_ENABLED, &ctx->flags); @@ -1242,17 +1288,29 @@ static int mixer_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ctx); ret = component_add(&pdev->dev, &mixer_component_ops); - if (!ret) - pm_runtime_enable(dev); + if (ret < 0) + goto err; + + pm_runtime_enable(dev); + + return 0; + +err: + icc_put(path); return ret; } static int mixer_remove(struct platform_device *pdev) { - pm_runtime_disable(&pdev->dev); + struct device *dev = &pdev->dev; + struct mixer_context *ctx = dev_get_drvdata(dev); - component_del(&pdev->dev, &mixer_component_ops); + pm_runtime_disable(dev); + + component_del(dev, &mixer_component_ops); + + icc_put(ctx->soc_path); return 0; } -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-23 12:20 UTC|newest] Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20190723122022eucas1p2f568f74f981f9de9012eb693c3b446d5@eucas1p2.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 00/11] Simple QoS for exynos-bus driver using interconnect Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń [not found] ` <CGME20190723122022eucas1p1266d90873d564894bd852c20140f8474@eucas1p1.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 01/11] devfreq: exynos-bus: Extract exynos_bus_profile_init() Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń 2019-07-24 19:07 ` Krzysztof Kozlowski 2019-07-24 19:07 ` Krzysztof Kozlowski 2019-07-31 13:00 ` Artur Świgoń 2019-07-31 13:00 ` Artur Świgoń 2019-08-05 9:56 ` Krzysztof Kozlowski 2019-08-05 9:56 ` Krzysztof Kozlowski 2019-07-25 12:43 ` Chanwoo Choi 2019-07-25 12:43 ` Chanwoo Choi 2019-07-26 10:42 ` Krzysztof Kozlowski 2019-07-26 10:42 ` Krzysztof Kozlowski 2019-07-26 10:42 ` Krzysztof Kozlowski 2019-07-26 10:52 ` Chanwoo Choi 2019-07-26 10:52 ` Chanwoo Choi [not found] ` <CGME20190723122023eucas1p2ff56c00b60a676ed85d9fe159a1839f2@eucas1p2.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 02/11] devfreq: exynos-bus: Extract exynos_bus_profile_init_passive() Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń 2019-07-24 19:08 ` Krzysztof Kozlowski 2019-07-24 19:08 ` Krzysztof Kozlowski 2019-07-24 19:08 ` Krzysztof Kozlowski 2019-07-25 12:45 ` Chanwoo Choi 2019-07-25 12:45 ` Chanwoo Choi [not found] ` <CGME20190723122024eucas1p1ff060d072132bfbc8a8a1d10fa1f90f8@eucas1p1.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 03/11] devfreq: exynos-bus: Change goto-based logic to if-else logic Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń 2019-07-24 19:10 ` Krzysztof Kozlowski 2019-07-24 19:10 ` Krzysztof Kozlowski 2019-07-25 12:56 ` Chanwoo Choi 2019-07-25 12:56 ` Chanwoo Choi 2019-07-25 13:02 ` Chanwoo Choi 2019-07-25 13:02 ` Chanwoo Choi [not found] ` <CGME20190723122024eucas1p25a480ccddaa69ee1d0f1a07960ca3f22@eucas1p2.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 04/11] devfreq: exynos-bus: Clean up code Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń 2019-07-24 19:14 ` Krzysztof Kozlowski 2019-07-24 19:14 ` Krzysztof Kozlowski 2019-07-25 12:50 ` Chanwoo Choi 2019-07-25 12:50 ` Chanwoo Choi 2019-07-26 10:45 ` Krzysztof Kozlowski 2019-07-26 10:45 ` Krzysztof Kozlowski 2019-07-26 11:04 ` Chanwoo Choi 2019-07-26 11:04 ` Chanwoo Choi [not found] ` <CGME20190723122025eucas1p251df372451e0b27ad7f2e3c89df60b64@eucas1p2.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 05/11] icc: Export of_icc_get_from_provider() Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń 2019-07-24 19:15 ` Krzysztof Kozlowski 2019-07-24 19:15 ` Krzysztof Kozlowski 2019-07-24 19:15 ` Krzysztof Kozlowski [not found] ` <CGME20190723122026eucas1p2acf705de2a47ba54f383d916f5383144@eucas1p2.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 06/11] icc: Relax requirement in of_icc_get_from_provider() Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń 2019-07-24 19:16 ` Krzysztof Kozlowski 2019-07-24 19:16 ` Krzysztof Kozlowski [not found] ` <CGME20190723122027eucas1p124f44370a63b16dcb765585761d661a3@eucas1p1.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 07/11] icc: Relax condition in apply_constraints() Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń [not found] ` <CGME20190723122027eucas1p24b1d76e3139f7cc52614d7613ff9ba98@eucas1p2.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 08/11] arm: dts: exynos: Add parents and #interconnect-cells to Exynos4412 Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń 2019-07-24 19:24 ` Krzysztof Kozlowski 2019-07-24 19:24 ` Krzysztof Kozlowski 2019-07-24 19:24 ` Krzysztof Kozlowski 2019-07-31 13:00 ` Artur Świgoń 2019-07-31 13:00 ` Artur Świgoń 2019-07-25 13:13 ` Chanwoo Choi 2019-07-25 13:13 ` Chanwoo Choi 2019-07-26 12:02 ` Marek Szyprowski 2019-07-26 12:02 ` Marek Szyprowski 2019-07-29 1:20 ` Chanwoo Choi 2019-07-29 1:20 ` Chanwoo Choi [not found] ` <CGME20190723122028eucas1p2eb75f35b810e71d6c590370aaff0997b@eucas1p2.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 09/11] devfreq: exynos-bus: Add interconnect functionality to exynos-bus Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń 2019-07-24 18:36 ` Krzysztof Kozlowski 2019-07-24 18:36 ` Krzysztof Kozlowski 2019-07-31 13:01 ` Artur Świgoń 2019-07-31 13:01 ` Artur Świgoń 2019-07-26 8:05 ` Georgi Djakov 2019-07-26 8:05 ` Georgi Djakov 2019-08-01 7:59 ` Artur Świgoń 2019-08-01 7:59 ` Artur Świgoń 2019-08-07 14:21 ` Georgi Djakov 2019-08-07 14:21 ` Georgi Djakov 2019-08-08 13:28 ` Artur Świgoń 2019-08-08 13:28 ` Artur Świgoń 2019-07-29 1:52 ` Chanwoo Choi 2019-07-29 1:52 ` Chanwoo Choi 2019-08-08 13:18 ` Artur Świgoń 2019-08-08 13:18 ` Artur Świgoń 2019-08-09 2:17 ` Chanwoo Choi 2019-08-09 2:17 ` Chanwoo Choi 2019-08-08 15:00 ` Leonard Crestez 2019-08-08 15:00 ` Leonard Crestez 2019-08-08 15:00 ` Leonard Crestez 2019-08-19 23:44 ` Chanwoo Choi 2019-08-19 23:44 ` Chanwoo Choi 2019-08-19 23:44 ` Chanwoo Choi 2019-08-06 13:41 ` Leonard Crestez 2019-08-06 13:41 ` Leonard Crestez 2019-08-06 13:41 ` Leonard Crestez 2019-08-08 13:19 ` Artur Świgoń 2019-08-08 13:19 ` Artur Świgoń 2019-08-08 13:19 ` Artur Świgoń [not found] ` <CGME20190723122029eucas1p21e1a51e759f9b605d2c89daf659af7bb@eucas1p2.samsung.com> 2019-07-23 12:20 ` [RFC PATCH 10/11] arm: dts: exynos: Add interconnects to Exynos4412 mixer Artur Świgoń 2019-07-23 12:20 ` Artur Świgoń [not found] ` <CGME20190723122029eucas1p2915f536d9ef43a7bd043a878a553439f@eucas1p2.samsung.com> 2019-07-23 12:20 ` Artur Świgoń [this message] 2019-07-23 12:20 ` [RFC PATCH 11/11] drm: exynos: mixer: Add interconnect support Artur Świgoń 2019-07-24 18:52 ` Krzysztof Kozlowski 2019-07-24 18:52 ` Krzysztof Kozlowski 2019-07-24 18:53 ` [RFC PATCH 00/11] Simple QoS for exynos-bus driver using interconnect Krzysztof Kozlowski 2019-07-24 18:53 ` Krzysztof Kozlowski 2019-07-24 18:53 ` Krzysztof Kozlowski 2019-08-13 6:17 ` Chanwoo Choi 2019-08-13 6:17 ` Chanwoo Choi 2019-08-13 6:19 ` Chanwoo Choi 2019-08-13 6:19 ` Chanwoo Choi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190723122016.30279-12-a.swigon@partner.samsung.com \ --to=a.swigon@partner.samsung.com \ --cc=cw00.choi@samsung.com \ --cc=devicetree@vger.kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=georgi.djakov@linaro.org \ --cc=inki.dae@samsung.com \ --cc=krzk@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=myungjoo.ham@samsung.com \ --cc=sw0312.kim@samsung.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.