From patchwork Fri Jul 25 10:59:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 4622391 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 44DD2C0338 for ; Fri, 25 Jul 2014 10:59:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 737BA201E4 for ; Fri, 25 Jul 2014 10:59:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5FE3020173 for ; Fri, 25 Jul 2014 10:59:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C6E456E7FC; Fri, 25 Jul 2014 03:59:13 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BC366E7FC for ; Fri, 25 Jul 2014 03:59:12 -0700 (PDT) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N99003V6L6MZND0@mailout2.samsung.com> for dri-devel@lists.freedesktop.org; Fri, 25 Jul 2014 19:59:10 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.112]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 3F.E2.16580.E7832D35; Fri, 25 Jul 2014 19:59:10 +0900 (KST) X-AuditID: cbfee691-b7f2f6d0000040c4-91-53d2387e7e0f Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 42.B0.04943.E7832D35; Fri, 25 Jul 2014 19:59:10 +0900 (KST) Received: from localhost.localdomain ([10.89.71.119]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N990057EL6LMJ00@mmp1.samsung.com>; Fri, 25 Jul 2014 19:59:10 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: control blending of mixer graphic layer 0 Date: Fri, 25 Jul 2014 19:59:10 +0900 Message-id: <1406285950-17929-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.8.1.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNLMWRmVeSWpSXmKPExsWyRsSkQLfO4lKwwZazohZXvr5ns5h0fwKL xYzJL9kcmD3udx9n8ujbsooxgCmKyyYlNSezLLVI3y6BK2PRmd3MBUs5KhasncHWwPiFrYuR k0NCwERi77FNjBC2mMSFe+vB4kICSxklZjwuhKlp6XvJ2sXIBRRfxChxc917RoiiViaJ1m5L EJtNQE/izrbjTCC2iICyxN+Jq8BqmAUMJA7NmcYCYgsLuEl8637HCmKzCKhKLLx8EizOK+Au sXNLM9QRChI/L59gA1kmIXCGTWLG3FnsEA0CEt8mHwJq4ABKyEpsOsAMUS8pcXDFDZYJjIIL GBlWMYqmFiQXFCelF5nqFSfmFpfmpesl5+duYgQG3Ol/zybuYLx/wPoQYzLQuInMUqLJ+cCA zSuJNzQ2M7IwNTE1NjK3NCNNWEmcN/1RUpCQQHpiSWp2ampBalF8UWlOavEhRiYOTqkGxt5E 7XPcq7b42S3fflbtX+19T4a64LwTWy+8E2/91H545uJdxxoc9W59KChY+//RmXuOsVLcwYpK F74J/GMrm1cx+dNPjnoLJ0W97Q/MxQ3l//VYpll8uH/YV+md5iFnoat5N3ari6X94lpSvFQ8 Zd+bJ0skxTdl362+f2lD4UuzVycu5nTJ2SmxFGckGmoxFxUnAgDPxwsKTgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNLMWRmVeSWpSXmKPExsVy+t9jAd06i0vBBqt/81pc+fqezWLS/Qks FjMmv2RzYPa4332cyaNvyyrGAKaoBkabjNTElNQihdS85PyUzLx0WyXv4HjneFMzA0NdQ0sL cyWFvMTcVFslF58AXbfMHKAtSgpliTmlQKGAxOJiJX07TBNCQ9x0LWAaI3R9Q4LgeowM0EDC GsaMRWd2Mxcs5ahYsHYGWwPjF7YuRk4OCQETiZa+l6wQtpjEhXvrgeJcHEICixglbq57zwiS EBJoZZJo7bYEsdkE9CTubDvOBGKLCChL/J24CqyGWcBA4tCcaSwgtrCAm8S37ndgQ1kEVCUW Xj4JFucVcJfYuaWZEWKZgsTPyyfYJjByL2BkWMUomlqQXFCclJ5rqFecmFtcmpeul5yfu4kR HNDPpHYwrmywOMQowMGoxMPbUX8xWIg1say4MvcQowQHs5II70yJS8FCvCmJlVWpRfnxRaU5 qcWHGE2Btk9klhJNzgdGW15JvKGxiZmRpZG5oYWRsbmSOO+BVutAIYH0xJLU7NTUgtQimD4m Dk6pBkaDx5xNJbuWThX/cX2J1BSbOyIb6r4Yvj+p/sWgepbkKsOOr5xTp/v/TDdzPeVkuMtn h+fEvGVF3idZZNcdeuh2jO2CwdqvstfYd06eavT5U2F8Y8QUvt3LrpV1XHJzlVywa99i0wLt 1XZR5dumCQWwrsvd2x3xXlj151TTvYJvkkqmRatsTTqgxFKckWioxVxUnAgAJJ6UFX4CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: sw0312.kim@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The mixer graphic layer 0 isn't blended as default by commit 0377f4ed9f1aed30292c4e3c87f24e028ae26f36(drm/exynos: Don't blend mixer layer 0). But it needs to be blended with graphic layer 0 if video layer is enabled by vp because video layer is bottom. Signed-off-by: Joonyoung Shim --- drivers/gpu/drm/exynos/exynos_mixer.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 9d0c21a..0a1a065 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -365,6 +365,11 @@ static void mixer_cfg_layer(struct mixer_context *ctx, int win, bool enable) vp_reg_writemask(res, VP_ENABLE, val, VP_ENABLE_ON); mixer_reg_writemask(res, MXR_CFG, val, MXR_CFG_VP_ENABLE); + + /* control blending of graphic layer 0 */ + mixer_reg_writemask(res, MXR_GRAPHIC_CFG(0), val, + MXR_GRP_CFG_BLEND_PRE_MUL | + MXR_GRP_CFG_PIXEL_BLEND_EN); } break; }