From patchwork Sun Dec 30 17:48:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 10745147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30F141399 for ; Sun, 30 Dec 2018 17:49:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14009285A0 for ; Sun, 30 Dec 2018 17:49:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 07598285A8; Sun, 30 Dec 2018 17:49:03 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 B008E285A0 for ; Sun, 30 Dec 2018 17:49:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B5399898E1; Sun, 30 Dec 2018 17:49:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 792BA898A7 for ; Sun, 30 Dec 2018 17:48:59 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id u89-v6so22388098lje.1 for ; Sun, 30 Dec 2018 09:48:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=1EW5bqcaQm1NMvxmOz0PFniZvfEVPaRGaH3Xynt21bo=; b=BBOsSseaaOORPot04Ww4jyaFKjQwe1BMp6DSafmORTqho15d2julZcnamHWCZ6zzO1 g1wblVwIpb8zcgV9RpCqsyB7pgyBQekFWPk37NlE7/1SA9i1p5JVfsg9T1ZTHSZRpNAS pojK/igeGwzzCC0Xg4vNESmJp+EcA6piYHp0Iqdbb7FHEEr3bQUxBwla4eKyoOPnqm/X Mmr8X4OzwSbg8TmwcMzeEP5UknUbd44PLPhRluGd325Gc60V/umY27Xtxt4vXnUCtWCj KlMVxIB0KXI69L4odYj4mSP/Rj/+oKY3avCwR9l/MnZNKo6+AtB4ya4x2JcNycTYKrmA nTZA== X-Gm-Message-State: AJcUukeDGAr3eySrEjDiOHeGtkxXkCSi5D1RCkSdhqxrNwxEa1lWyPhR r2w5T9rfUJ5lT1QMG+mEeJQ= X-Google-Smtp-Source: ALg8bN4m5t8Vq+AewAUVSqCuQ80HdMYKfMnGKFyLtc0hC2JSOSq2q+23lrFVrhayO7W+44WUvfvlhA== X-Received: by 2002:a2e:3e04:: with SMTP id l4-v6mr19100068lja.148.1546192137849; Sun, 30 Dec 2018 09:48:57 -0800 (PST) Received: from jupiter.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id q11sm8853170lfc.92.2018.12.30.09.48.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 30 Dec 2018 09:48:57 -0800 (PST) From: Sam Ravnborg To: Daniel Vetter , David Airlie , Maarten Lankhorst , Maxime Ripard , Sean Paul , David Lechner , Laurent Pinchart , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH v2 01/14] drm: move DRM_IF_VERSION to drm_internal.h Date: Sun, 30 Dec 2018 18:48:25 +0100 Message-Id: <20181230174838.32330-2-sam@ravnborg.org> X-Mailer: git-send-email 2.12.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Sam Ravnborg MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Move DRM_IF_VERSION out of drmP.h to allow users to get rid of the drmP include. Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20181226210353.13993-1-sam@ravnborg.org --- drivers/gpu/drm/drm_internal.h | 2 ++ include/drm/drmP.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index c7a7d7ce5d1c..331112b2ae88 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -26,6 +26,8 @@ #define DRM_IF_MAJOR 1 #define DRM_IF_MINOR 4 +#define DRM_IF_VERSION(maj, min) (maj << 16 | min) + struct drm_prime_file_private; struct dma_buf; diff --git a/include/drm/drmP.h b/include/drm/drmP.h index bdb0d5548f39..db94ef00940e 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -94,8 +94,6 @@ struct dma_buf_attachment; struct pci_dev; struct pci_controller; -#define DRM_IF_VERSION(maj, min) (maj << 16 | min) - #define DRM_SWITCH_POWER_ON 0 #define DRM_SWITCH_POWER_OFF 1 #define DRM_SWITCH_POWER_CHANGING 2