From patchwork Wed Dec 16 12:21:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 7861161 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5CE629F71A for ; Wed, 16 Dec 2015 12:22:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E746D203B8 for ; Wed, 16 Dec 2015 12:22:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 160A5203F7 for ; Wed, 16 Dec 2015 12:22:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932775AbbLPMWS (ORCPT ); Wed, 16 Dec 2015 07:22:18 -0500 Received: from mailout4.w1.samsung.com ([210.118.77.14]:61908 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932862AbbLPMWR (ORCPT ); Wed, 16 Dec 2015 07:22:17 -0500 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NZG00CUXAD3YN80@mailout4.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Wed, 16 Dec 2015 12:22:15 +0000 (GMT) X-AuditID: cbfec7f5-f79b16d000005389-c2-567157771bfe Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id F0.7F.21385.77751765; Wed, 16 Dec 2015 12:22:15 +0000 (GMT) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NZG0012YACWHH70@eusync4.samsung.com>; Wed, 16 Dec 2015 12:22:15 +0000 (GMT) From: Marek Szyprowski To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Inki Dae , Joonyoung Shim , Seung-Woo Kim , Andrzej Hajda , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz , Tobias Jakobi , Gustavo Padovan Subject: [PATCH v3 6/7] drm/exynos: mixer: also allow ARGB1555 and ARGB4444 Date: Wed, 16 Dec 2015 13:21:47 +0100 Message-id: <1450268508-15028-7-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1450268508-15028-1-git-send-email-m.szyprowski@samsung.com> References: <1450268508-15028-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGLMWRmVeSWpSXmKPExsVy+t/xa7rl4YVhBoveC1vcWneO1WLjjPWs Fle+vmez2PlgF7vFpPsTWCxe3LvIYvH6haHFjPP7mCzWHrnLbjFj8ks2i7bVH1gduD3udx9n 8vh3jN1j56S9TB59W1YxenzeJBfAGsVlk5Kak1mWWqRvl8CVcWxbC2vBX66K9ZOfszUwTuXs YuTkkBAwkdj2fB4jhC0mceHeerYuRi4OIYGljBJTly9nhHCamCRef3nGDlLFJmAo0fW2iw3E FhFwk2g6PJMVpIhZoI9Zoqn5IVhCWMBb4t//W0wgNouAqsSMvyeAJnFw8Ap4SLz/EACxTU7i /8sVYCWcAp4Sa4/PBJsvBFTyYPUO5gmMvAsYGVYxiqaWJhcUJ6XnGukVJ+YWl+al6yXn525i hITe1x2MS49ZHWIU4GBU4uHViCkIE2JNLCuuzD3EKMHBrCTC+1CuMEyINyWxsiq1KD++qDQn tfgQozQHi5I478xd70OEBNITS1KzU1MLUotgskwcnFINjPwK/F/23PXteKrRnei/P0fmcILc nq1i27xeM/FO3b9HKrGla9nGtqLpGp7Tebcs02Y82fyyNUK+U3BT60X52YYud5frae9hOtn/ +MNXlvY9Wk8vHL0QmiHHVLlJ/1d5ONt/Jcf2ng6JV+KHPoaJrhe4cG1lSKTj7vR4Eefoswt2 KLL4zL8qqcRSnJFoqMVcVJwIAEKCqhg5AgAA Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 From: Tobias Jakobi Allow the remaining alpha formats now that blending is properly setup. Signed-off-by: Tobias Jakobi Signed-off-by: Marek Szyprowski --- drivers/gpu/drm/exynos/exynos_mixer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index ae7b122274ac..31a9a228744e 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -76,7 +76,9 @@ enum mixer_flag_bits { static const uint32_t mixer_formats[] = { DRM_FORMAT_XRGB4444, + DRM_FORMAT_ARGB4444, DRM_FORMAT_XRGB1555, + DRM_FORMAT_ARGB1555, DRM_FORMAT_RGB565, DRM_FORMAT_XRGB8888, DRM_FORMAT_ARGB8888, @@ -169,6 +171,8 @@ static inline bool is_alpha_format(unsigned int pixel_format) { switch (pixel_format) { case DRM_FORMAT_ARGB8888: + case DRM_FORMAT_ARGB1555: + case DRM_FORMAT_ARGB4444: return true; default: return false; @@ -595,10 +599,12 @@ static void mixer_graph_buffer(struct mixer_context *ctx, switch (fb->pixel_format) { case DRM_FORMAT_XRGB4444: + case DRM_FORMAT_ARGB4444: fmt = MXR_FORMAT_ARGB4444; break; case DRM_FORMAT_XRGB1555: + case DRM_FORMAT_ARGB1555: fmt = MXR_FORMAT_ARGB1555; break;