From patchwork Fri Jun 3 09:55:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: huang lin X-Patchwork-Id: 9152395 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 5F81460221 for ; Fri, 3 Jun 2016 09:56:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52004282E8 for ; Fri, 3 Jun 2016 09:56:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46A3228309; Fri, 3 Jun 2016 09:56:22 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E65A2282E8 for ; Fri, 3 Jun 2016 09:56:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932293AbcFCJz7 (ORCPT ); Fri, 3 Jun 2016 05:55:59 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33447 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932233AbcFCJz5 (ORCPT ); Fri, 3 Jun 2016 05:55:57 -0400 Received: by mail-pf0-f194.google.com with SMTP id b124so11114504pfb.0; Fri, 03 Jun 2016 02:55:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6yB7DhcXfegGSMEwyUXDcN4G9WB+nxlkTQB18kF22PU=; b=EXDzD8Y/5Z3CKERiYNsQy8Bqr683ISBgmXrUFKIpoW+YgdYVLHV4TQ5SdswG4O0HMx Slg+TYmza2wwVMddgcQc2SIlmJbawO6Bzyy//S+ubCMDCkiS3Z4LhqP68QuTp0atCl3t VJwCW08t5s9Sl39og+wFu2qIkP1Nz9av6ChDI3ejDXo8C5jd9l3Yq5SSTXrpOq7hSOuD pOJhMKZcAXWgsgHsCGS4rUFFUNvtCjq8RTHbYQIf/oPq5SdDJUMjnHN0QlPlE7fY8k4r vzaUdmdseYSSGhmw2XOQXgVCBZpH/ghVbTP63GXgQvUoJj8VUVv5toM+r4Wr+NWJHbjZ ZpRQ== X-Gm-Message-State: ALyK8tIsFxa3kDa4A6Cc5VQmGvwJUOTwEgxdZXltwKQWObAciIg+BVl7HkvdWqjl0paUKA== X-Received: by 10.98.71.81 with SMTP id u78mr5010542pfa.29.1464947756340; Fri, 03 Jun 2016 02:55:56 -0700 (PDT) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id t77sm6953892pfa.71.2016.06.03.02.55.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 03 Jun 2016 02:55:55 -0700 (PDT) From: Lin Huang To: heiko@sntech.de, mark.yao@rock-chips.com, myungjoo.ham@samsung.com Cc: mturquette@baylibre.com, sboyd@codeaurora.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kyungmin.park@samsung.com, dianders@chromium.org, dbasehore@chromium.org, huangtao@rock-chips.com, typ@rock-chips.com, Lin Huang Subject: [RFC PATCH v1 6/6] drm/rockchip: Add dmc notifier in vop driver Date: Fri, 3 Jun 2016 17:55:19 +0800 Message-Id: <1464947719-6245-7-git-send-email-hl@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1464947719-6245-1-git-send-email-hl@rock-chips.com> References: <1464947719-6245-1-git-send-email-hl@rock-chips.com> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP when in ddr frequency scaling process, vop can not do enable or disable operate, since dcf will base on vop vblank time to do frequency scaling and need to get vop irq if there have vop enabled. So need register to dmc notifier, and we can get the dmc status. Signed-off-by: Lin Huang --- Changes in v1: - use wait_event instead usleep, Suggestion by Derek drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 43 +++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 1c4d5b5..8286048 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -31,6 +31,8 @@ #include #include +#include + #include "rockchip_drm_drv.h" #include "rockchip_drm_gem.h" #include "rockchip_drm_fb.h" @@ -116,6 +118,10 @@ struct vop { const struct vop_data *data; + struct notifier_block dmc_nb; + int dmc_in_process; + wait_queue_head_t wait_dmc_queue; + uint32_t *regsbak; void __iomem *regs; @@ -426,6 +432,21 @@ static void vop_dsp_hold_valid_irq_disable(struct vop *vop) spin_unlock_irqrestore(&vop->irq_lock, flags); } +static int dmc_notify(struct notifier_block *nb, unsigned long event, + void *data) +{ + struct vop *vop = container_of(nb, struct vop, dmc_nb); + + if (event == DMCFREQ_ADJUST) { + vop->dmc_in_process = 1; + } else if (event == DMCFREQ_FINISH) { + vop->dmc_in_process = 0; + wake_up(&vop->wait_dmc_queue); + } + + return NOTIFY_OK; +} + static void vop_enable(struct drm_crtc *crtc) { struct vop *vop = to_vop(crtc); @@ -434,6 +455,13 @@ static void vop_enable(struct drm_crtc *crtc) if (vop->is_enabled) return; + /* + * if in dmc scaling frequency process, wait until it finish + * use 100ms as timeout time. + */ + wait_event_timeout(vop->wait_dmc_queue, + !vop->dmc_in_process, HZ / 10); + ret = pm_runtime_get_sync(vop->dev); if (ret < 0) { dev_err(vop->dev, "failed to get pm runtime: %d\n", ret); @@ -485,6 +513,7 @@ static void vop_enable(struct drm_crtc *crtc) enable_irq(vop->irq); drm_crtc_vblank_on(crtc); + rockchip_dmc_get(&vop->dmc_nb); return; @@ -505,6 +534,13 @@ static void vop_crtc_disable(struct drm_crtc *crtc) return; /* + * if in dmc scaling frequency process, wait until it finish + * use 100ms as timeout time. + */ + wait_event_timeout(vop->wait_dmc_queue, + !vop->dmc_in_process, HZ / 10); + + /* * We need to make sure that all windows are disabled before we * disable that crtc. Otherwise we might try to scan from a destroyed * buffer later. @@ -517,7 +553,7 @@ static void vop_crtc_disable(struct drm_crtc *crtc) VOP_WIN_SET(vop, win, enable, 0); spin_unlock(&vop->reg_lock); } - + rockchip_dmc_put(&vop->dmc_nb); drm_crtc_vblank_off(crtc); /* @@ -1243,7 +1279,7 @@ static int vop_create_crtc(struct vop *vop) ret = -ENOENT; goto err_cleanup_crtc; } - + vop->dmc_nb.notifier_call = dmc_notify; init_completion(&vop->dsp_hold_completion); init_completion(&vop->wait_update_complete); crtc->port = port; @@ -1465,6 +1501,9 @@ static int vop_bind(struct device *dev, struct device *master, void *data) /* IRQ is initially disabled; it gets enabled in power_on */ disable_irq(vop->irq); + init_waitqueue_head(&vop->wait_dmc_queue); + vop->dmc_in_process = 0; + ret = vop_create_crtc(vop); if (ret) return ret;