From patchwork Wed Mar 14 15:07:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10282413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5DB8D6061F for ; Wed, 14 Mar 2018 15:07:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E7702832D for ; Wed, 14 Mar 2018 15:07:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 431402846D; Wed, 14 Mar 2018 15:07:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D977D2832D for ; Wed, 14 Mar 2018 15:07:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 27CCC6E719; Wed, 14 Mar 2018 15:07:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-x241.google.com (mail-yw0-x241.google.com [IPv6:2607:f8b0:4002:c05::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 59EB56E70F for ; Wed, 14 Mar 2018 15:07:21 +0000 (UTC) Received: by mail-yw0-x241.google.com with SMTP id c20so2355791ywa.2 for ; Wed, 14 Mar 2018 08:07:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+Wir9NhFBgxlY+2pU6ULqysbagg5vhxdl22A1Yk372g=; b=IKn+TdABwtqIdjrRG1AmdpRTGgljPEsc7bhTiUInU4z9BLnFK61FgaJDJy+c7U1dRz eoothznOJI3rYw8GGBSwBGr/yQ0QEmcm6u5I099x4nsFAthCgou6vZJ6HbMYoljI9ZrL /HXCXWZ7UxX688W+Qe8XsJAN/7wiSL9UVqtYI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+Wir9NhFBgxlY+2pU6ULqysbagg5vhxdl22A1Yk372g=; b=M5mqUhmFBFcBj1y/N9Fsoo1230cuVyf6xLk7OwdKyQgdtMQbF2C8FGS9yk9StLNC5N MZuxIMoAgMZrumczGzg/3umHycixScbxjxIlEK5bJnAZp54HqRVLsFBWyLEVvHVex2/n NSBcjfVqUTo2NJYJzjY2L/W2rdTpDPN99xPcUeOWbbocZ6YZe8ccRWOK6i+ZdhG81CCC zDRyne/AUHYkFAbF/doGgGvUFCGxgRXbmqDXxDXPajmHUbf/BByjWC5x640LIM+4eac0 A/fT7MezMD9Xr2V5SjJdJopYtOgY1FpafOaIchlk0FD4zBXWYz6iEE++UL/g3MkywDoH nqMQ== X-Gm-Message-State: AElRT7GqVgx5YhQN6kExidwPukardifh43eqRc9jqu50GBtjfn65vVq2 hlxLWxPRoLfZ772WFbnbmYFkng== X-Google-Smtp-Source: AG47ELu5B1RNnCduAAYBLF0wcYvl+e3+WUirHgJx5O0piTc1mtnfL7yinlFVGn6H0U+GNPh/5fdBoA== X-Received: by 10.129.173.28 with SMTP id l28mr3212338ywh.505.1521040040573; Wed, 14 Mar 2018 08:07:20 -0700 (PDT) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:ad55:b1db:adfe:3b9f]) by smtp.gmail.com with ESMTPSA id x70sm973125ywg.94.2018.03.14.08.07.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Mar 2018 08:07:19 -0700 (PDT) From: Sean Paul To: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [DPU PATCH] drm/msm: Add pm_runtime_get/put calls to dpu Date: Wed, 14 Mar 2018 11:07:18 -0400 Message-Id: <20180314150718.254814-1-seanpaul@chromium.org> X-Mailer: git-send-email 2.16.2.804.g6dcf76e118-goog In-Reply-To: <20180312200626.GW223881@art_vandelay> References: <20180312200626.GW223881@art_vandelay> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hoegsberg@chromium.org, abhinavk@codeaurora.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Ensure that pm_runtime is properly referenced/unreferenced when we need it. Signed-off-by: Sean Paul Reviewed-by: Sravanthi Kollukuduru --- Didn't get a response to my suggestion, so wrote the patch anyways. Thoughts? drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 3 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++ drivers/gpu/drm/msm/dpu_power_handle.c | 12 ++++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index f1642d72469e..df6cbeb15cf5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -3497,6 +3497,7 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) /* disable clk & bw control until clk & bw properties are set */ cstate->bw_control = false; cstate->bw_split_vote = false; + pm_runtime_put_sync(crtc->dev->dev); mutex_unlock(&dpu_crtc->crtc_lock); } @@ -3523,6 +3524,8 @@ static void dpu_crtc_enable(struct drm_crtc *crtc, DPU_EVT32_VERBOSE(DRMID(crtc)); dpu_crtc = to_dpu_crtc(crtc); + pm_runtime_get_sync(crtc->dev->dev); + drm_for_each_encoder(encoder, crtc->dev) { if (encoder->crtc != crtc) continue; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index fb4de59d8ed1..90608a303aec 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -346,12 +346,14 @@ static void _dpu_debugfs_destroy(struct dpu_kms *dpu_kms) static int dpu_kms_enable_vblank(struct msm_kms *kms, struct drm_crtc *crtc) { + pm_runtime_get_sync(crtc->dev->dev); return dpu_crtc_vblank(crtc, true); } static void dpu_kms_disable_vblank(struct msm_kms *kms, struct drm_crtc *crtc) { dpu_crtc_vblank(crtc, false); + pm_runtime_put_sync(crtc->dev->dev); } static void dpu_kms_wait_for_frame_transfer_complete(struct msm_kms *kms, diff --git a/drivers/gpu/drm/msm/dpu_power_handle.c b/drivers/gpu/drm/msm/dpu_power_handle.c index 477ea9f2778c..a52be861117f 100644 --- a/drivers/gpu/drm/msm/dpu_power_handle.c +++ b/drivers/gpu/drm/msm/dpu_power_handle.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -857,6 +858,9 @@ int dpu_power_resource_enable(struct dpu_power_handle *phandle, return -EINVAL; } + if (enable) + pm_runtime_get_sync(phandle->dev); + mp = &phandle->mp; mutex_lock(&phandle->phandle_lock); @@ -963,10 +967,6 @@ int dpu_power_resource_enable(struct dpu_power_handle *phandle, DPU_POWER_EVENT_POST_DISABLE); } -end: - mutex_unlock(&phandle->phandle_lock); - return rc; - clk_err: dpu_power_rsc_update(phandle, false); rsc_err: @@ -979,7 +979,11 @@ int dpu_power_resource_enable(struct dpu_power_handle *phandle, dpu_power_data_bus_update(&phandle->data_bus_handle[i], 0); data_bus_hdl_err: phandle->current_usecase_ndx = prev_usecase_ndx; + +end: mutex_unlock(&phandle->phandle_lock); + if (!enable) + pm_runtime_put_sync(phandle->dev); return rc; }