Received: by 10.223.176.46 with SMTP id f43csp2745703wra; Mon, 22 Jan 2018 02:42:37 -0800 (PST) X-Google-Smtp-Source: AH8x227pUD2OnDOKIsmxTkEyh3pmSHfzcNTNUYzkpaAFppY3/KZvvtGAFHqs1qfCtK9MEXe/q5Xy X-Received: by 10.101.85.195 with SMTP id k3mr6957405pgs.191.1516617757610; Mon, 22 Jan 2018 02:42:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516617757; cv=none; d=google.com; s=arc-20160816; b=gYhwLAXwmfy28R9aOxmJMysnCPJ4e37imZxQoAqShz0dc88HILl1tSTU6Xva7alXfm xsq6CAvHtA8IxyYsbSI4iuMb520nRukziIBs6uwTUBwdXwaA1U5JoCJOAfou4aC/30fl EBeE8W7YDegyw1B04SViAuIlJjJiCsi+wLmYqLrkTpSKr7pkVKgAMIm2PdkBIUp6thdw JSX1oWjbCy42jGxJ5USAAGqWgtQRN5+Q3sxatYuY1Nhn6XEm8Wr1GnzEQJtgK2JG9x7S okYFn/gp4OdbaHZ2u8Je9VdBm77xdndL9P2bYUMW+Sm5BM9PpKkOYkcx11UhPpBvktS5 OcIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=OyPSdxdDdIPzdXDZxDEM9bfswFK/fiaP2M8TU74Rs9o=; b=DsOwaT+XHwPpqZkbvCWRIcTfwYxf7uG5p0QzL3CJbOCi4lOyqxaiRilys0Wzm2gY3l AuSKEY51MFDl1TudVUW0sZoiv23msSB4Yb3QBHY+Yu8EXdForH5puJGhwOjC/+JKij7t 3J0S55t5xvNGekbfWUITm3g5hGeX3FeiVT1bka4qBU5yOwj5q74IeRlk1UHlv5nCUikE D3nMmbMh4vgeEtUCoIC1S1EVHerRmHixD/CH8fsIilPaAN31hTc8vhgt9ap7mQ9tSu8o 657xoVULthop5+QZf5r1AQ9ovguSRHmXNSZeb4mVZ47wEluymzM8xLURgCraDI0IFiZZ IzGw== 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 t71si490456pgb.396.2018.01.22.02.42.23; Mon, 22 Jan 2018 02:42:37 -0800 (PST) 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 S1751279AbeAVKlP (ORCPT + 99 others); Mon, 22 Jan 2018 05:41:15 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:46465 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751057AbeAVKgC (ORCPT ); Mon, 22 Jan 2018 05:36:02 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id DCFAB203B1; Mon, 22 Jan 2018 11:36:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id A58D4203B4; Mon, 22 Jan 2018 11:35:51 +0100 (CET) From: Maxime Ripard To: Chen-Yu Tsai , Maxime Ripard , daniel.vetter@intel.com, jani.nikula@linux.intel.com, seanpaul@chromium.org Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, thomas@vitsch.nl Subject: [PATCH v2 04/19] drm/rockchip: Use the alpha format field in drm_format_info Date: Mon, 22 Jan 2018 11:35:33 +0100 Message-Id: <5a217e8c93eea6f0a7f6bc5883424b47dbb6c664.1516617243.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that the drm_format_info has a alpha field to tell if a format embeds an alpha component in it, let's use it. Acked-by: Sandy huang Reviewed-by: Daniel Vetter Signed-off-by: Maxime Ripard --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 19128b4dea54..db6a0662be5a 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -253,17 +253,6 @@ static bool is_yuv_support(uint32_t format) } } -static bool is_alpha_support(uint32_t format) -{ - switch (format) { - case DRM_FORMAT_ARGB8888: - case DRM_FORMAT_ABGR8888: - return true; - default: - return false; - } -} - static uint16_t scl_vop_cal_scale(enum scale_mode mode, uint32_t src, uint32_t dst, bool is_horizontal, int vsu_mode, int *vskiplines) @@ -790,7 +779,7 @@ static void vop_plane_atomic_update(struct drm_plane *plane, rb_swap = has_rb_swapped(fb->format->format); VOP_WIN_SET(vop, win, rb_swap, rb_swap); - if (is_alpha_support(fb->format->format)) { + if (fb->format->has_alpha) { VOP_WIN_SET(vop, win, dst_alpha_ctl, DST_FACTOR_M0(ALPHA_SRC_INVERSE)); val = SRC_ALPHA_EN(1) | SRC_COLOR_M0(ALPHA_SRC_PRE_MUL) | -- git-series 0.9.1