Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp6702761imm; Tue, 24 Jul 2018 01:19:03 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeu4olkrs+cSHz4jU/AYvOHXGFWpQpbOnN2ERx00w6Gmk5MjOOfFwk5HXJEIhapjDIkzv77 X-Received: by 2002:a63:1546:: with SMTP id 6-v6mr15431467pgv.271.1532420343314; Tue, 24 Jul 2018 01:19:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532420343; cv=none; d=google.com; s=arc-20160816; b=aZd7fKvyykAepSvFXRWrfn29WIiGntsFL7kJKEZ2Am/kyCICN2nkZwlguGgS+O9M1m EnBCHigq8X0vGEkPBmqIVrhKHZ4xc/xEq14+l0Mv13cX8BIWEAEv1pu41LY8MWthDGyp 6sM0FtMjb9i+hx8n1O0WTev8obqIUmcgtz2Xxq+hrtmAa75mm/vSD2rBtG9wZKnXU4yZ nV2x//GM3q4R1WCFvYdnqhLSufqvu1V8oRx7g+uCW+ajaHS2+XB0vfc4nr5YAL7QSRo9 NZtPbnXbXFm9ytLmyAWA1FZdix5jjDLi7278BtSJJDUIqq4uxR+BMhMpp45cLWgj5ciN +9TQ== 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=WSnAM/RgscrFmsMbwHZZ6I0ME3P0ZVlBB/4rErpcYkM=; b=kiTbNtzCbu6xBgZaaxXGabkSiZdq3HsHnUrZNQF67qJbIkQ3wOyI/VwCPknU75SNtf hw8Fthxox/9byVNNVeekQ+f6GWA9MKbErZnkhaQJf12jaNt7qu7L9vA63Cgi4IkZVorb IT2s4FxrqAJ9b0qJzUJkJNM3cr5g/HAXvrQYan378MFIjYVUuEgoa1dDJ3Qb0ynMHuh/ wdnzji5GQf0ADGOujTZYSHq1bm22bd34vQwOH7oiuv8/Wjv3MbI9P0cT9Bv8BmDe/4cB BorLQ5xx3rAYf+hEPZVcUctI8MhV4pevBxd3ysL2fT08fht7rdqmGPR0qAAxJyXBHln1 Vg2g== 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 w37-v6si10895884pgl.514.2018.07.24.01.18.48; Tue, 24 Jul 2018 01:19:03 -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 S2388758AbeGXJWw (ORCPT + 99 others); Tue, 24 Jul 2018 05:22:52 -0400 Received: from mailgw01.mediatek.com ([210.61.82.183]:27187 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2388383AbeGXJWw (ORCPT ); Tue, 24 Jul 2018 05:22:52 -0400 X-UUID: f6c5b3e521334c009d896b67961fd91a-20180724 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 1763269333; Tue, 24 Jul 2018 16:17:28 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Tue, 24 Jul 2018 16:17:21 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1210.3 via Frontend Transport; Tue, 24 Jul 2018 16:17:21 +0800 From: Stu Hsieh To: CK Hu , Philipp Zabel CC: David Airlie , Matthias Brugger , , , , , , Stu Hsieh Subject: [PATCH v1 09/15] drm/mediatek: add YUYV/UYVY color format support for RDMA Date: Tue, 24 Jul 2018 16:17:09 +0800 Message-ID: <1532420235-22268-10-git-send-email-stu.hsieh@mediatek.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1532420235-22268-1-git-send-email-stu.hsieh@mediatek.com> References: <1532420235-22268-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 YUYV/UYVY color format support for RDMA and transform matrix for YUYV/UYVY. Signed-off-by: Stu Hsieh --- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c index 5b7dadc21016..49edbae50167 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c @@ -34,6 +34,8 @@ #define RDMA_SOFT_RESET BIT(4) #define RDMA_MODE_MEMORY BIT(1) #define DISP_REG_RDMA_SIZE_CON_0 0x0014 +#define RDMA_MATRIX_ENABLE BIT(17) +#define RDMA_MATRIX_INT_MTX_SEL (7UL << 20) #define DISP_REG_RDMA_SIZE_CON_1 0x0018 #define DISP_REG_RDMA_TARGET_LINE 0x001c #define DISP_RDMA_MEM_CON 0x0024 @@ -54,6 +56,8 @@ #define MEM_MODE_INPUT_FORMAT_RGB888 (0x001 << 4) #define MEM_MODE_INPUT_FORMAT_RGBA8888 (0x002 << 4) #define MEM_MODE_INPUT_FORMAT_ARGB8888 (0x003 << 4) +#define MEM_MODE_INPUT_FORMAT_UYVY (0x004 << 4) +#define MEM_MODE_INPUT_FORMAT_YUYV (0x005 << 4) struct mtk_disp_rdma_data { unsigned int fifo_size; @@ -188,6 +192,10 @@ static unsigned int rdma_fmt_convert(struct mtk_disp_rdma *rdma, case DRM_FORMAT_XBGR8888: case DRM_FORMAT_ABGR8888: return MEM_MODE_INPUT_FORMAT_RGBA8888 | MEM_MODE_INPUT_SWAP; + case DRM_FORMAT_UYVY: + return MEM_MODE_INPUT_FORMAT_UYVY; + case DRM_FORMAT_YUYV: + return MEM_MODE_INPUT_FORMAT_YUYV; } } @@ -206,6 +214,12 @@ static void mtk_rdma_layer_config(struct mtk_ddp_comp *comp, unsigned int idx, con = rdma_fmt_convert(rdma, fmt); writel_relaxed(con, comp->regs + DISP_RDMA_MEM_CON); + if (fmt == DRM_FORMAT_UYVY || fmt == DRM_FORMAT_YUYV) + rdma_update_bits(comp, DISP_REG_RDMA_SIZE_CON_0, 0xff0000, + RDMA_MATRIX_ENABLE | RDMA_MATRIX_INT_MTX_SEL); + else + rdma_update_bits(comp, DISP_REG_RDMA_SIZE_CON_0, 0xff0000, + MATRIX_INT_MTX_SEL_DEFAULT); writel_relaxed(addr, comp->regs + DISP_RDMA_MEM_START_ADDR); writel_relaxed(pitch, comp->regs + DISP_RDMA_MEM_SRC_PITCH); -- 2.12.5