Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp326631imm; Thu, 2 Aug 2018 20:12:29 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcUuklGpGR4aPrpgxjXo+kkR0hBhnwb0oV0tuuNQIPpBYc2lQ3p91rVKI7GVn6RQLYBtcvO X-Received: by 2002:a62:d10d:: with SMTP id z13-v6mr2357200pfg.98.1533265949205; Thu, 02 Aug 2018 20:12:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533265949; cv=none; d=google.com; s=arc-20160816; b=gjRX+xyJMlAVlgl+z1nkhUKc57QVu/3jly9MSPI29DrNw9NFhIszF8CuAlHuES0MZ3 27PHRmAPQGWBhvSvH92+VfrCPt3UUl4du1BiswMPZYDZcszr9V3Te8sM93pbbQNnclRi c/pWoiFTWtAV70ak212g5PPU38Xcg0vVHvdQ1qntZ0oNFVG39B4ZLwP9tSjirWiC/NgI TocpXb1kvuuRmm2A4Y7IxMIrnsro/9WVpHNPtkXdnfhVKlY+SuPbtiDDhBZ5XPj2xGzn DL0MmLb7BCfAdY7tsgM5u6rmdR186jw5TETH20VPKa2dlALusBAJ/mD2K5TwYyw8/uoC Vgzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=L5SvpCtuayLgnNcgR7xvVSY43NbPr+32DaBa7hGlqfU=; b=f+Zs7Y2TVYZmrYpfL5SYPo84s5n4C9gcxpAlYn4OIPOkai9IL9d4Os4IEfdVJuLgvh 9yz5HBM1r2IAbo3IpQuIo/iyCRQdHM4vKthD02al5G/vuSdLn0EdR24oGMT5RcUuGqv5 2WQE8xqH+6zHsxPrrKCfg4bSauOoDQnObHGS0si71eZup5WjH+ANdKF6WVXgz7ckQg/9 b6jJF0Rq5PTHo4lygEQKChualeTj0acTVkoUVjfr1Q9GqgYLxv7c+dnBmBsZPfCSLjsg b6YuH7vGZrEZjMTVflKJ7IRD6AP7sFk42xVSOIOyMOoxt/5a/H8iaE+7a0uOazTge8Jr 1MkA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v84-v6si4172561pfa.103.2018.08.02.20.12.14; Thu, 02 Aug 2018 20:12:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726841AbeHCFFd (ORCPT + 99 others); Fri, 3 Aug 2018 01:05:33 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:37586 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726182AbeHCFFd (ORCPT ); Fri, 3 Aug 2018 01:05:33 -0400 X-UUID: 2e2550024a844e4884951ff3b1624dba-20180803 Received: from mtkexhb02.mediatek.inc [(172.21.101.103)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1963587853; Fri, 03 Aug 2018 11:11:15 +0800 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Fri, 3 Aug 2018 11:11:12 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Fri, 3 Aug 2018 11:11:12 +0800 From: Stu Hsieh To: CK Hu , Philipp Zabel CC: David Airlie , Matthias Brugger , , , , , , Stu Hsieh Subject: [PATCH v2 07/15] drm/mediatek: add layer config to set RDMA for plane setting Date: Fri, 3 Aug 2018 11:11:00 +0800 Message-ID: <1533265868-28110-8-git-send-email-stu.hsieh@mediatek.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1533265868-28110-1-git-send-email-stu.hsieh@mediatek.com> References: <1533265868-28110-1-git-send-email-stu.hsieh@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch add layer config to set RDMA for plane setting Layer config set the data address and pitch to RDMA from plane setting. Signed-off-by: Stu Hsieh --- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c index 1985035451ce..51ee5f0734df 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c @@ -35,11 +35,16 @@ #define DISP_REG_RDMA_SIZE_CON_0 0x0014 #define DISP_REG_RDMA_SIZE_CON_1 0x0018 #define DISP_REG_RDMA_TARGET_LINE 0x001c +#define DISP_RDMA_MEM_SRC_PITCH 0x002c +#define DISP_RDMA_MEM_GMC_SETTING_0 0x0030 #define DISP_REG_RDMA_FIFO_CON 0x0040 #define RDMA_FIFO_UNDERFLOW_EN BIT(31) #define RDMA_FIFO_PSEUDO_SIZE(bytes) (((bytes) / 16) << 16) #define RDMA_OUTPUT_VALID_FIFO_THRESHOLD(bytes) ((bytes) / 16) #define RDMA_FIFO_SIZE(rdma) ((rdma)->data->fifo_size) +#define DISP_RDMA_MEM_START_ADDR 0x0f00 + +#define RDMA_MEM_GMC 0x40402020 struct mtk_disp_rdma_data { unsigned int fifo_size; @@ -145,12 +150,28 @@ static void mtk_rdma_config(struct mtk_ddp_comp *comp, unsigned int width, writel(reg, comp->regs + DISP_REG_RDMA_FIFO_CON); } +static void mtk_rdma_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, + struct mtk_plane_state *state) +{ + struct mtk_plane_pending_state *pending = &state->pending; + unsigned int addr = pending->addr; + unsigned int pitch = pending->pitch & 0xffff; + + if (pending->height == 0u || pending->width == 0u) + return; + + writel_relaxed(addr, comp->regs + DISP_RDMA_MEM_START_ADDR); + writel_relaxed(pitch, comp->regs + DISP_RDMA_MEM_SRC_PITCH); + writel(RDMA_MEM_GMC, comp->regs + DISP_RDMA_MEM_GMC_SETTING_0); +} + static const struct mtk_ddp_comp_funcs mtk_disp_rdma_funcs = { .config = mtk_rdma_config, .start = mtk_rdma_start, .stop = mtk_rdma_stop, .enable_vblank = mtk_rdma_enable_vblank, .disable_vblank = mtk_rdma_disable_vblank, + .layer_config = mtk_rdma_layer_config, }; static int mtk_disp_rdma_bind(struct device *dev, struct device *master, -- 2.12.5.2.gbdf23ab