From patchwork Thu Nov 16 14:22:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Stevenson X-Patchwork-Id: 10061333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 13C72601AE for ; Thu, 16 Nov 2017 14:55:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 046452A54F for ; Thu, 16 Nov 2017 14:55:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED4A72A562; Thu, 16 Nov 2017 14:55:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8AC4D2A558 for ; Thu, 16 Nov 2017 14:55:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CE12F6E87E; Thu, 16 Nov 2017 14:55:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mx07-00252a01.pphosted.com (mx07-00252a01.pphosted.com [62.209.51.214]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6C16F6E880 for ; Thu, 16 Nov 2017 14:55:06 +0000 (UTC) Received: from pps.filterd (m0102628.ppops.net [127.0.0.1]) by mx07-00252a01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vAGENH11008631 for ; Thu, 16 Nov 2017 14:24:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : to : cc : subject : date : message-id : in-reply-to : references : in-reply-to : references; s=pp; bh=Z8bnu/np24pNSaT68pxYPEcBOjdICsDdRl0g+r1OG9I=; b=M7DRpzqhgEPwABNXmzavoKwTVshHAqUNTR1DhVs61yv7gzxfg+Hf/OuR+TGpePlUt9tR 5M9Nq+zHTkKQ0vkp6kHCVR7t9jys0SMYYXDMWDZC6VP6oVsdAHffdzdtkXEQdUwurVth F1ByzuCf/mhnjSnf3q0X4MTia5Pg9ApSCagS3vUSZCTm6FHr/0obdl1ZuXUb0CLXLBQr ZgmycdzLLjpiqXxc3fjd3YukBVTr1hJZIKBx3m8xWM/yw6ZkZnNhZlN4atusFZKK2pFG zatFdPjiMfK7p/YplaxcJ84ozi/ts3E+S+IsixzXRs6pDcMaPH7w5q/mQ1Dd3gmIiWTX vA== Received: from mail-wm0-f71.google.com (mail-wm0-f71.google.com [74.125.82.71]) by mx07-00252a01.pphosted.com with ESMTP id 2e8dpk0qx9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Thu, 16 Nov 2017 14:24:03 +0000 Received: by mail-wm0-f71.google.com with SMTP id k3so107961wmg.6 for ; Thu, 16 Nov 2017 06:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Z8bnu/np24pNSaT68pxYPEcBOjdICsDdRl0g+r1OG9I=; b=nabB3lLH2Ep8dYHnSFgNkUrLxbjYtwuaWA6bATh2RFUNTPTuzX0JhW+BgtXhbFg+8j pkiEMD5kRTfiiKCSEqbbUPu89tYplBtFkoUdhACZII6iqZsNy/I1PJGifk3M1sGKviHN gC/38uykBSTuvBRdt/QRC/WvqERxnkQ41yJsnxxVL3mFu1NwCgqI5T0O285GTv9Mplg5 SbaPE6gSUHH2jXJKjzvfOxfWjhXhQNurxXCp3O0kiofj8eT2+yq4TmTZChqxpi1tgKMR 9dr69QhFpdoUtlqWU4qo1TBLegohBPCYItZboIJvmehoFlPBR4RdE+Otm9IRQHTdFUd0 Ww+w== 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:in-reply-to:references; bh=Z8bnu/np24pNSaT68pxYPEcBOjdICsDdRl0g+r1OG9I=; b=NStRCSWJnbAnJSUW3PsyDeGPUkDZacy1hIQY7LY2c7QJ0PNZrwkI6sX4v22zzqeo9E LUrVWq4dUU1XwBm+fKpj+WNOC/PemlUGYerfNwwpqmRZm7fLbwSSXKQPPMz9qbUHRN+k qvGOPMF3THgal7WEffTVd9DFmHEBmuIVlTaqjgfk88HY72umR6dd7LI8+/Jb2kmEskAw Z7CT1YRs9JDXWEWhfb/I+r1zJO/puaCWAohoXrmkd4pLOtvinWYvomcqvSCMVOeNmZLt yST4l//1oaWZ/8DiYEAgk3wQPq0D3t4GMdS/klIKAvfEQdcQzvGc742Qex62OpvyBSHf AEfQ== X-Gm-Message-State: AJaThX7M668a2onIz/W9xlxN+FEtePXNy3F+lTQZPpR7JOflogRWbY2Q z4tJ3TeAvgIwGeJoX9LtC21rlaLC4vItB9Ih3S5BIAJAldqWWfbg/+/1lt0ZyjSyQV37rVZyl/F IK2FpKOx6Wfd2GX1bSjbnf1czPx0= X-Received: by 10.28.72.9 with SMTP id v9mr1768626wma.102.1510842242647; Thu, 16 Nov 2017 06:24:02 -0800 (PST) X-Google-Smtp-Source: AGs4zMain9t8Vo/fDuMvQFQzhwaIdDWWitkhb3ResimAVBOJ+Hwar5jMIBy8Hk4W0N1hpJw1BR0ilw== X-Received: by 10.28.72.9 with SMTP id v9mr1768620wma.102.1510842242472; Thu, 16 Nov 2017 06:24:02 -0800 (PST) Received: from dave-VirtualBox.pitowers.org ([217.33.127.173]) by smtp.googlemail.com with ESMTPSA id 185sm2463994wmj.33.2017.11.16.06.24.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 16 Nov 2017 06:24:01 -0800 (PST) From: Dave Stevenson To: dri-devel@lists.freedesktop.org Subject: [PATCH 3/3] drm/vc4: Add support for NV21 and NV61. Date: Thu, 16 Nov 2017 14:22:31 +0000 Message-Id: <1f50799525e3401551dff2b0b2828b9ab892f75f.1510841336.git.dave.stevenson@raspberrypi.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-11-16_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1711160196 Cc: David Airlie , Dave Stevenson X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Virus-Scanned: ClamAV using ClamSMTP NV12 (YUV420 2 plane) and NV16 (YUV422 2 plane) were supported, but NV21 and NV61 (same but with Cb and Cr swapped) weren't. Add them. Signed-off-by: Dave Stevenson --- drivers/gpu/drm/vc4/vc4_plane.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 6373fd5..515f979 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -153,10 +153,20 @@ static const struct hvs_format { .pixel_order = HVS_PIXEL_ORDER_XYCBCR, }, { + .drm = DRM_FORMAT_NV21, + .hvs = HVS_PIXEL_FORMAT_YCBCR_YUV420_2PLANE, + .pixel_order = HVS_PIXEL_ORDER_XYCRCB, + }, + { .drm = DRM_FORMAT_NV16, .hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_2PLANE, .pixel_order = HVS_PIXEL_ORDER_XYCBCR, }, + { + .drm = DRM_FORMAT_NV61, + .hvs = HVS_PIXEL_FORMAT_YCBCR_YUV422_2PLANE, + .pixel_order = HVS_PIXEL_ORDER_XYCRCB, + }, }; static const struct hvs_format *vc4_get_hvs_format(u32 drm_format)