From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752412AbaHSIji (ORCPT ); Tue, 19 Aug 2014 04:39:38 -0400 Received: from mail-lb0-f176.google.com ([209.85.217.176]:36203 "EHLO mail-lb0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752081AbaHSIj3 (ORCPT ); Tue, 19 Aug 2014 04:39:29 -0400 From: Tomeu Vizoso To: linux-pm@vger.kernel.org Cc: Thierry Reding , =?UTF-8?q?Terje=20Bergstr=C3=B6m?= , Stephen Warren , "Rafael J. Wysocki" , Pavel Machek , Len Brown , linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Martinez Canillas , Mikko Perttunen , Tomeu Vizoso Subject: [PATCH v3 2/3] drm/tegra: Request memory bandwidth for the display controller Date: Tue, 19 Aug 2014 10:38:42 +0200 Message-Id: <1408437523-8542-3-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1408437523-8542-1-git-send-email-tomeu.vizoso@collabora.com> References: <1408437523-8542-1-git-send-email-tomeu.vizoso@collabora.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For now the amount requested is based solely on the current mode's refresh rate. Signed-off-by: Tomeu Vizoso --- v3: * Fixed the bandwidth calculation, and have the units be mbps --- drivers/gpu/drm/tegra/dc.c | 13 +++++++++++++ drivers/gpu/drm/tegra/drm.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 6553fd2..83a6d4b 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -9,6 +9,7 @@ #include #include +#include #include #include "dc.h" @@ -753,6 +754,8 @@ static void tegra_crtc_disable(struct drm_crtc *crtc) } drm_vblank_off(drm, dc->pipe); + + pm_qos_update_request(&dc->qos_request, PM_QOS_DEFAULT_VALUE); } static bool tegra_crtc_mode_fixup(struct drm_crtc *crtc, @@ -839,6 +842,7 @@ static int tegra_crtc_mode_set(struct drm_crtc *crtc, struct tegra_dc *dc = to_tegra_dc(crtc); struct tegra_dc_window window; u32 value; + unsigned long bandwidth; int err; drm_vblank_pre_modeset(crtc->dev, dc->pipe); @@ -879,6 +883,10 @@ static int tegra_crtc_mode_set(struct drm_crtc *crtc, if (err < 0) dev_err(dc->dev, "failed to enable root plane\n"); + bandwidth = window.stride[0] * window.dst.h * 8; + bandwidth *= mode->clock * 1000 / 1024 / 1024; + pm_qos_update_request(&dc->qos_request, bandwidth); + return 0; } @@ -1499,6 +1507,9 @@ static int tegra_dc_probe(struct platform_device *pdev) return err; } + pm_qos_add_request(&dc->qos_request, PM_QOS_MEMORY_BANDWIDTH, + PM_QOS_DEFAULT_VALUE); + platform_set_drvdata(pdev, dc); return 0; @@ -1509,6 +1520,8 @@ static int tegra_dc_remove(struct platform_device *pdev) struct tegra_dc *dc = platform_get_drvdata(pdev); int err; + pm_qos_remove_request(&dc->qos_request); + err = host1x_client_unregister(&dc->client); if (err < 0) { dev_err(&pdev->dev, "failed to unregister host1x client: %d\n", diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index e89c70f..a99e533d 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -12,6 +12,7 @@ #include #include +#include #include #include @@ -120,6 +121,8 @@ struct tegra_dc { struct drm_pending_vblank_event *event; const struct tegra_dc_soc_info *soc; + + struct pm_qos_request qos_request; }; static inline struct tegra_dc * -- 1.9.3