From patchwork Mon Nov 27 10:09:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 841588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YsP4Fcnv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yljGX3Pgwz9s9Y for ; Mon, 27 Nov 2017 21:10:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751723AbdK0KKK (ORCPT ); Mon, 27 Nov 2017 05:10:10 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:39201 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751701AbdK0KKJ (ORCPT ); Mon, 27 Nov 2017 05:10:09 -0500 Received: by mail-wm0-f66.google.com with SMTP id x63so33465746wmf.4 for ; Mon, 27 Nov 2017 02:10:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gpEqQUsWkJn9d6oTj+kNg2eDAbsyjPrEaf2PN3cg59M=; b=YsP4FcnvfCkkYBS0jzHXZtDAtiITtWG8cV/IPJk6JridKNI0ONoNB2480IIF2NfkeF doZhJSc91PXaM+CZLfW8vwe03FMRj6ccGWfl8ugkOJeGokwkqnCTK1+GNiT0P0ItUs/h us58XqvLCP9rjoYD3pw0CBB5v07XyuX9wFzwAwRSfoHTbggZjAJp6paLpgtCY/J0iDWe 4rvnNPWpk5jEbBbvNbrAxDAmhWvrYG+x7EYSBzCZW/JxVasJ4c6fr0A1pO0ejHOvYVmW +GwMfpiLGA6ZXOeh/P2FaQJoCy35Fb5+QvMQPDniz8PU+OaGccDvKKnNETxxYio67hKi nc+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gpEqQUsWkJn9d6oTj+kNg2eDAbsyjPrEaf2PN3cg59M=; b=jznYP6X2TOkMuk1U9chGUTmt4l3qK5ISdykhikvbDqXR5NuTYwO+W8Mt0o6ZzSBXc0 9Q2jClGeimXdNP3WH5Dg88z3EbMRDkWOHZnGBR3eJGaq7YZIWwaaNc16T7IyR3CKEw/R FNWDPffhmzq+Nmr2dJZ+82+mgPkwfowVmXOIHHNePk9Qjn5+iAkpa0xCSfgIVL6LrLTo mWYrKjJLkYs6+uCRlFT5p9zB1ulqiuJlI/TszbllTMLPoWBLKdbp/ia7zI6Jrp7ErnGs XkkERBV4W5mKRA31NYfifcMM06orMMSfDFU7BLdXouXH9aDx6NSOhM7xJ5Th7MHx3bxi Mlwg== X-Gm-Message-State: AJaThX7mCP40C7Hi6K1yNhYMHrWwOtEvjVwSmIMLzIBL2faO9U7ef0Cc JBzPkVVHAxMentAsSFkmFuU= X-Google-Smtp-Source: AGs4zMYxWYuPG5h/HZ14jqm899UoTxcWCWKuGlVUyFbUoW1uh+BqVH1N+afU/QJU6SGMRbJ5Yt7gGw== X-Received: by 10.28.245.11 with SMTP id t11mr16478287wmh.113.1511777408478; Mon, 27 Nov 2017 02:10:08 -0800 (PST) Received: from localhost (p200300E41F200F003F65F430A8AE2E44.dip0.t-ipconnect.de. [2003:e4:1f20:f00:3f65:f430:a8ae:2e44]) by smtp.gmail.com with ESMTPSA id 10sm14104549wml.27.2017.11.27.02.10.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Nov 2017 02:10:07 -0800 (PST) From: Thierry Reding To: Thierry Reding Cc: dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org Subject: [PATCH 09/12] drm/tegra: Support ARGB and ABGR formats Date: Mon, 27 Nov 2017 11:09:49 +0100 Message-Id: <20171127100952.22465-10-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171127100952.22465-1-thierry.reding@gmail.com> References: <20171127100952.22465-1-thierry.reding@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding These formats can easily be supported on all generations of Tegra. Note that the XRGB and XBGR formats that we supported were in fact using the ARGB and ABGR Tegra formats. This happened to work in cases where no alpha was being considered. This change is also a fix for those formats. Signed-off-by: Thierry Reding --- drivers/gpu/drm/tegra/dc.c | 4 ++++ drivers/gpu/drm/tegra/dc.h | 2 ++ drivers/gpu/drm/tegra/plane.c | 8 ++++++++ 3 files changed, 14 insertions(+) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 2d54657b538e..e40272493235 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -287,7 +287,9 @@ static void tegra_dc_setup_window(struct tegra_dc *dc, unsigned int index, static const u32 tegra_primary_plane_formats[] = { DRM_FORMAT_XBGR8888, + DRM_FORMAT_ABGR8888, DRM_FORMAT_XRGB8888, + DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565, }; @@ -649,7 +651,9 @@ static struct drm_plane *tegra_dc_cursor_plane_create(struct drm_device *drm, static const uint32_t tegra_overlay_plane_formats[] = { DRM_FORMAT_XBGR8888, + DRM_FORMAT_ABGR8888, DRM_FORMAT_XRGB8888, + DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565, DRM_FORMAT_UYVY, DRM_FORMAT_YUYV, diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h index 47f43663adcb..018fea74fb50 100644 --- a/drivers/gpu/drm/tegra/dc.h +++ b/drivers/gpu/drm/tegra/dc.h @@ -598,6 +598,8 @@ int tegra_dc_rgb_exit(struct tegra_dc *dc); #define WIN_COLOR_DEPTH_YUV422R 23 #define WIN_COLOR_DEPTH_YCbCr422RA 24 #define WIN_COLOR_DEPTH_YUV422RA 25 +#define WIN_COLOR_DEPTH_B8G8R8X8 37 +#define WIN_COLOR_DEPTH_R8G8B8X8 38 #define DC_WIN_POSITION 0x704 #define H_POSITION(x) (((x) & 0x1fff) << 0) /* XXX 0x7fff on Tegra186 */ diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c index 1847d0204e46..1fff98fe6962 100644 --- a/drivers/gpu/drm/tegra/plane.c +++ b/drivers/gpu/drm/tegra/plane.c @@ -111,10 +111,18 @@ int tegra_plane_format(u32 fourcc, u32 *format, u32 *swap) switch (fourcc) { case DRM_FORMAT_XBGR8888: + *format = WIN_COLOR_DEPTH_R8G8B8X8; + break; + + case DRM_FORMAT_ABGR8888: *format = WIN_COLOR_DEPTH_R8G8B8A8; break; case DRM_FORMAT_XRGB8888: + *format = WIN_COLOR_DEPTH_B8G8R8X8; + break; + + case DRM_FORMAT_ARGB8888: *format = WIN_COLOR_DEPTH_B8G8R8A8; break;