From mboxrd@z Thu Jan 1 00:00:00 1970 From: Emil Velikov Subject: [PATCH 4/6] freedreno: use local drm.h over the system one Date: Thu, 29 Aug 2013 21:31:52 +0100 Message-ID: <1377808314-30699-5-git-send-email-emil.l.velikov@gmail.com> References: <1377808314-30699-1-git-send-email-emil.l.velikov@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f169.google.com (mail-ea0-f169.google.com [209.85.215.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 0EEA9E78A5 for ; Thu, 29 Aug 2013 13:32:55 -0700 (PDT) Received: by mail-ea0-f169.google.com with SMTP id k11so498973eaj.0 for ; Thu, 29 Aug 2013 13:32:55 -0700 (PDT) In-Reply-To: <1377808314-30699-1-git-send-email-emil.l.velikov@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: dri-devel@lists.freedesktop.org Cc: emil.l.velikov@gmail.com, Rob Clark List-Id: dri-devel@lists.freedesktop.org Otherwise build will fail, as drm/drm.h is not available. Cc: Rob Clark Signed-off-by: Emil Velikov --- Hello Rob, I'm not entriely sure that this is correct as the libdrm code is splinckled with variations of drm/drm.h drm.h in both quoted and angle bracket form. I believe that the chosen approach could be used througout libdrm although such a change would be quite evasive and may lead to a broken build. This is what works for me, and looks approapriate IMHO --- freedreno/freedreno_priv.h | 2 +- freedreno/msm/msm_drm.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/freedreno/freedreno_priv.h b/freedreno/freedreno_priv.h index b10ac90..69256f5 100644 --- a/freedreno/freedreno_priv.h +++ b/freedreno/freedreno_priv.h @@ -48,7 +48,7 @@ #include "freedreno_drmif.h" #include "freedreno_ringbuffer.h" -#include "drm/drm.h" +#include "drm.h" struct fd_device_funcs { int (*bo_new_handle)(struct fd_device *dev, uint32_t size, diff --git a/freedreno/msm/msm_drm.h b/freedreno/msm/msm_drm.h index d3c6207..090c724 100644 --- a/freedreno/msm/msm_drm.h +++ b/freedreno/msm/msm_drm.h @@ -19,7 +19,7 @@ #define __MSM_DRM_H__ #include -#include +#include "drm.h" /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints: -- 1.8.4