From patchwork Mon Oct 26 13:17:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Ser X-Patchwork-Id: 11857093 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78AB0C2D0A3 for ; Mon, 26 Oct 2020 13:17:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4AED42080A for ; Mon, 26 Oct 2020 13:17:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AED42080A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=emersion.fr Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A0A356E174; Mon, 26 Oct 2020 13:17:09 +0000 (UTC) Received: from mail2.protonmail.ch (mail2.protonmail.ch [185.70.40.22]) by gabe.freedesktop.org (Postfix) with ESMTPS id D18386E174 for ; Mon, 26 Oct 2020 13:17:08 +0000 (UTC) Date: Mon, 26 Oct 2020 13:17:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emersion.fr; s=protonmail2; t=1603718225; bh=PTSApkk3ASYdkVdJl8Vv/zY3AnAjoynNACsXSOxnfhc=; h=Date:To:From:Cc:Reply-To:Subject:From; b=XRMggTarJWrwH4hEDcRcXaFyQMoR6/ON5hxSlyp0zbd6UrhHNcY5yrSNlrxChVSAx Fppib6YtqSebgU2iIyHCJkHxMveZFDY+x5o4i2jWJ0wP/iXi31XchkE12bq3x7hZIV B2u/kuglfKV84DRT83ouL61A2LdzcLAVGkQKQEek2x7xc5y1HKL76uNd/y0k7g34X1 clvQr0ETwjsGIv4hqjmEUfcuhnoO3JW5u1deq5ZgEP+Rla7Fusg2PvVfR19G7S1IMQ JS5ET56lWDKuKzF1o+ItD9HjfLlYGz4KWIYJlRt827uh9RtCdW7yITN9JuDZmPokM4 XoGRzbv7w3Ysg== To: dri-devel@lists.freedesktop.org From: Simon Ser Subject: [PATCH] drm: deprecate DRM_FORMAT_MOD_NONE Message-ID: MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Simon Ser Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" DRM_FORMAT_MOD_NONE is in the list of vendors, which is pretty confusing. We already have DRM_FORMAT_MOD_VENDOR_NONE. Move it down in the list of format modifiers. DRM_FORMAT_MOD_NONE is an alias for DRM_FORMAT_MOD_LINEAR, however the name is confusing: NONE doesn't mean that the modifier is implicit, instead it means that the layout is linear. Deprecate it. Signed-off-by: Simon Ser Suggested-by: Bas Nieuwenhuizen Cc: Daniel Vetter Cc: Pekka Paalanen Reviewed-by: Bas Nieuwenhuizen Reviewed-by: Pekka Paalanen Acked-by: Daniel Vetter --- include/uapi/drm/drm_fourcc.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index d720f1e8ae5e..ca1d5587b5fc 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -350,7 +350,6 @@ extern "C" { */ /* Vendor Ids: */ -#define DRM_FORMAT_MOD_NONE 0 #define DRM_FORMAT_MOD_VENDOR_NONE 0 #define DRM_FORMAT_MOD_VENDOR_INTEL 0x01 #define DRM_FORMAT_MOD_VENDOR_AMD 0x02 @@ -422,6 +421,14 @@ extern "C" { */ #define DRM_FORMAT_MOD_LINEAR fourcc_mod_code(NONE, 0) +/* + * Deprecated: use DRM_FORMAT_MOD_LINEAR instead + * + * The "none" format modifier doesn't actually mean that the modifier is + * implicit, instead it means that the layout is linear. + */ +#define DRM_FORMAT_MOD_NONE 0 + /* Intel framebuffer modifiers */ /*