From patchwork Wed Mar 30 14:19:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8697121 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6DCC9C0553 for ; Wed, 30 Mar 2016 14:20:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 87A6220383 for ; Wed, 30 Mar 2016 14:19:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8395920384 for ; Wed, 30 Mar 2016 14:19:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E0FF6E820; Wed, 30 Mar 2016 14:19:50 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com [IPv6:2a00:1450:400c:c09::22c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 03A306E820 for ; Wed, 30 Mar 2016 14:19:48 +0000 (UTC) Received: by mail-wm0-x22c.google.com with SMTP id p65so74278068wmp.0 for ; Wed, 30 Mar 2016 07:19:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EmkPL4rHB/zslOcuaKsZN4YZKd/YQWhUeTpDzXEkhH8=; b=bSCYh5tu4f0jUs1Qpo3uy9DmuwHvyrjQd6XMrghtzYdTbE3lDIBN1TpjWZKdxkrNza EcjmTOMhAvR7QB8lwdcFJo4l6BHiSUvrsbkddE4Bo7nGCY7CNVsXDdle7MVwPcqY12Zc y9ABGUyJIIVQabZKwb5IvLv6MdWxMadJTxDAk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EmkPL4rHB/zslOcuaKsZN4YZKd/YQWhUeTpDzXEkhH8=; b=THl93mr5u0EAJeD82pH4vzDYN53+ByCVX1dxfLRedGZamJLNZgklHFQhbtO3N8LYf0 nVwenmxDDZ61Y7kBgnGi5VjhW5ckz34saDxGEdoE5EeEjNsrNOFK+yROw2EvKZEMVF40 Vjv9IBKNSfIbmOEkFHGEtS8c60pAkhPHLABqJ+jpbDuE0sgrCDFwzRQiv+q5YY8PncZu rUa++3oQ58alPKtwZMqYHmp6YK2PO+yLICGPRyU0rxM+ba5ELt8NP0IJ/qfQNaSN1M9P 8dW+t636Xg+zN8387z3V6GszJ9Vzv4EbvYHd0g9sdgNap3yqcrebk/++O+PXtBBhLkwK Ss0w== X-Gm-Message-State: AD7BkJJKQF8gZnYaBEX5g0/zoLt+xMb14Efh/RYOaWu/blnKcafFKzUQB8NUmwyUEGJYMA== X-Received: by 10.194.75.196 with SMTP id e4mr9605198wjw.134.1459347585871; Wed, 30 Mar 2016 07:19:45 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id u16sm4728205wmd.5.2016.03.30.07.19.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 07:19:45 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/3] drm: align #include directives with libdrm in uapi headers Date: Wed, 30 Mar 2016 16:19:43 +0200 Message-Id: <1459347584-30566-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Emil Velikov , Daniel Vetter 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-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 We can't use because that upsets the serach paths in libdrm. Also, drop the circular inclusion in drm_mode.h. v2: Actually change the right headers. Cc: Emil Velikov Signed-off-by: Daniel Vetter --- include/uapi/drm/drm.h | 2 +- include/uapi/drm/drm_mode.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index d299c7749091..c7ecc3abff03 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -685,7 +685,7 @@ struct drm_prime_handle { __s32 fd; }; -#include +#include "drm_mode.h" #define DRM_IOCTL_BASE 'd' #define DRM_IO(nr) _IO(DRM_IOCTL_BASE,nr) diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index c0217434d28d..db106ab01039 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -27,8 +27,6 @@ #ifndef _DRM_MODE_H #define _DRM_MODE_H -#include "drm.h" - #define DRM_DISPLAY_INFO_LEN 32 #define DRM_CONNECTOR_NAME_LEN 32 #define DRM_DISPLAY_MODE_LEN 32