Received: by 2002:ab2:6309:0:b0:1fb:d597:ff75 with SMTP id s9csp273641lqt; Thu, 6 Jun 2024 03:15:15 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWZ5m3rEHsKZ96pwK5WvE2JwwhYWt9B/W9ANzh7kak8xbw0TamGtPjz2L4qXkJn0Zz+uN8T39H1XtDXqMVK56CLDCx4KTwP0Z8nan5riA== X-Google-Smtp-Source: AGHT+IGatfHrn9qnpjP94o0/82shhgBz+9MwktPCsPB4ZwDTdsi0bTFrc72v+1s8dQoBHfaswNBy X-Received: by 2002:a17:902:eccf:b0:1f6:77fc:c555 with SMTP id d9443c01a7336-1f6a5a698a4mr66716575ad.45.1717668915521; Thu, 06 Jun 2024 03:15:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717668915; cv=pass; d=google.com; s=arc-20160816; b=LUCaIGZen1Olawj0VQFTZuca8cVrowl7Jx9PPjmaaGRTg2HhsJU4T3eEb4w5fvGSII GhRnoVZKMlLVd6+wESI/Y1bAAPR9r2K0RAxljmXHZll+VIL8hZoItcfEaRE8UXHtinEM 6zQIhCQWsOmYNybSfL6sRcRLpuUdXX11wzhTharaqkspQ4q5T4GherBxEuF2ksx/t8D8 9b4HMn6FLzrICfAhIn9o0u7I4dIQQKpRLuMvq3pikz5Ow36z8fnQWO74ZoWmnc23Kt+7 0x2ZTEihQ+l795XLfbSJG5W64UEyNgN9ZqOGks/q3UeUb5wwUUorPlEEFUszPB7556R0 jtkQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ly4e+mOLK27K/vtVWLdo/IetBGFPRRL5ZpSjzikpF4E=; fh=q/Ppq8/frEfcA3kotGB0IrpJr8gO0uNs3CtN4uoBAAY=; b=xfSinZZIV714ETu+KZioHHDBX9tcqOv2BfqMpITF77ACaMAynC016RShWbpkSGxj/h 4UCHF4erFnp9YvmlMxm6TN0L0lBmlCFj1IZ3/2bpg7WJ5ZVXg9M1bSQpEuNWung4Pd5l 8M94BjB/h0JKsLtspZpviwrOVtbWYtC5b+i2FYeeV5KtMVeACXLHcDkrb7bj7ymyDxqm 5M9Ndita53bK8GGKcWg2OpbMcDiVVCj84rAawDinULP+qtDBFhQgtcvD3iE3519yoZ8J MawIdmbq7ozxtzMvULGVePeRssxpJs+WDeT21yrR2wvOC7YdfaaUL+BxbD+Jx5VJhjA7 sTKg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=R26XsV8T; arc=pass (i=1 spf=pass spfdomain=mediatek.com dkim=pass dkdomain=mediatek.com dmarc=pass fromdomain=mediatek.com); spf=pass (google.com: domain of linux-kernel+bounces-204000-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-204000-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id d9443c01a7336-1f6bd6c2feasi9426395ad.0.2024.06.06.03.15.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 03:15:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-204000-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=R26XsV8T; arc=pass (i=1 spf=pass spfdomain=mediatek.com dkim=pass dkdomain=mediatek.com dmarc=pass fromdomain=mediatek.com); spf=pass (google.com: domain of linux-kernel+bounces-204000-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-204000-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id ABAA1B2E8FE for ; Thu, 6 Jun 2024 09:28:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 12D3C1667EE; Thu, 6 Jun 2024 09:26:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="R26XsV8T" Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3F67B149DE8 for ; Thu, 6 Jun 2024 09:26:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=210.61.82.184 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717666009; cv=none; b=vFPuk4ST/KgftkeEo6UXCL4FizmxIylI3++baNmYuot/jMMpInVr2Wu3yX2oP9NzD5dasZhiCwDRV8JCFINwbR/MLHlgRvjyTbQKrBGImR8PeJR0rM3QqaAWVglRDyNSKpPD/cbTlKeYpYAuw+SXsqQJq20mnmKcanunQtV5Vww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717666009; c=relaxed/simple; bh=KbJ2hRu+s1hz9l6BsQPvLATfWTSMg4JPseoFTio3wFc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FmSZfx9WV7BApTeLqfmTsfX9jZNuh63XtyIhopjo40WP1sYiZ+PpV7FF4lfn184MP07HzF/zMYVtzfzUGnaQIBpX2mV2YJnBX89oFMQi6nTFwuQHnaSrfxnK0WNyAYqHA2ujHTxC9qmzZMhsRxE2B7GNX87FrAvGHzo6IooU7t8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com; spf=pass smtp.mailfrom=mediatek.com; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b=R26XsV8T; arc=none smtp.client-ip=210.61.82.184 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=mediatek.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mediatek.com X-UUID: e0e00f7a23e611efa22eafcdcd04c131-20240606 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=Ly4e+mOLK27K/vtVWLdo/IetBGFPRRL5ZpSjzikpF4E=; b=R26XsV8Teaq1bnoTOVqLwDZMFTzWZYC9+gyUm4pZ64VkSYI/Vg8Gkz0VaEmhhQ/0cIaE04xGEIuiN2GkL0lq0MzKxtYfYPlxoFZE2xE+YK65JHoBqyyYWWWx80J52ETYVDMNYW4ZOKvIBJy1m27F8Ap/tKXbZ68GHv6Nc4xKm1U=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.39,REQID:bbd77293-be9f-43c7-b761-28b4f816f7d5,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION: release,TS:0 X-CID-META: VersionHash:393d96e,CLOUDID:ade0c984-4f93-4875-95e7-8c66ea833d57,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1, SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: e0e00f7a23e611efa22eafcdcd04c131-20240606 Received: from mtkmbs09n2.mediatek.inc [(172.21.101.94)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 932426139; Thu, 06 Jun 2024 17:26:39 +0800 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Thu, 6 Jun 2024 17:26:38 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 6 Jun 2024 17:26:38 +0800 From: Shawn Sung To: Chun-Kuang Hu CC: Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , AngeloGioacchino Del Regno , Bibby Hsieh , CK Hu , "Nancy . Lin" , Sean Paul , Jason Chen , Fei Shao , , , , , Hsiao Chien Sung Subject: [PATCH v8 12/16] drm/mediatek: Support "Pre-multiplied" blending in Mixer Date: Thu, 6 Jun 2024 17:26:31 +0800 Message-ID: <20240606092635.27981-13-shawn.sung@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20240606092635.27981-1-shawn.sung@mediatek.com> References: <20240606092635.27981-1-shawn.sung@mediatek.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain X-MTK: N From: Hsiao Chien Sung Support "Pre-multiplied" alpha blending mode in Mixer. Before this patch, only the coverage mode is supported. Signed-off-by: Hsiao Chien Sung --- drivers/gpu/drm/mediatek/mtk_ethdr.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_ethdr.c b/drivers/gpu/drm/mediatek/mtk_ethdr.c index bcced62e455d..d01f65819816 100644 --- a/drivers/gpu/drm/mediatek/mtk_ethdr.c +++ b/drivers/gpu/drm/mediatek/mtk_ethdr.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -36,6 +37,7 @@ #define MIX_SRC_L0_EN BIT(0) #define MIX_L_SRC_CON(n) (0x28 + 0x18 * (n)) #define NON_PREMULTI_SOURCE (2 << 12) +#define PREMULTI_SOURCE (3 << 12) #define MIX_L_SRC_SIZE(n) (0x30 + 0x18 * (n)) #define MIX_L_SRC_OFFSET(n) (0x34 + 0x18 * (n)) #define MIX_FUNC_DCM0 0x120 @@ -172,8 +174,12 @@ void mtk_ethdr_layer_config(struct device *dev, unsigned int idx, return; } - if (state->base.fb && state->base.fb->format->has_alpha) - alpha_con = MIXER_ALPHA_AEN | MIXER_ALPHA; + alpha_con |= MIXER_ALPHA_AEN | (state->base.alpha & MIXER_ALPHA); + + if (state->base.pixel_blend_mode != DRM_MODE_BLEND_COVERAGE) + alpha_con |= PREMULTI_SOURCE; + else + alpha_con |= NON_PREMULTI_SOURCE; if (state->base.pixel_blend_mode == DRM_MODE_BLEND_PIXEL_NONE || (state->base.fb && !state->base.fb->format->has_alpha)) { @@ -191,8 +197,7 @@ void mtk_ethdr_layer_config(struct device *dev, unsigned int idx, mtk_ddp_write(cmdq_pkt, pending->height << 16 | align_width, &mixer->cmdq_base, mixer->regs, MIX_L_SRC_SIZE(idx)); mtk_ddp_write(cmdq_pkt, offset, &mixer->cmdq_base, mixer->regs, MIX_L_SRC_OFFSET(idx)); - mtk_ddp_write_mask(cmdq_pkt, alpha_con, &mixer->cmdq_base, mixer->regs, MIX_L_SRC_CON(idx), - 0x1ff); + mtk_ddp_write(cmdq_pkt, alpha_con, &mixer->cmdq_base, mixer->regs, MIX_L_SRC_CON(idx)); mtk_ddp_write_mask(cmdq_pkt, BIT(idx), &mixer->cmdq_base, mixer->regs, MIX_SRC_CON, BIT(idx)); } -- 2.18.0