From patchwork Thu Aug 29 20:31:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 2851800 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2365F9F88A for ; Fri, 30 Aug 2013 05:32:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0F96F201FE for ; Fri, 30 Aug 2013 05:32:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3AEB4201EC for ; Fri, 30 Aug 2013 05:32:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1FBD5E7A32 for ; Thu, 29 Aug 2013 22:32:49 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TABVjf6IYhIQPTftZ0VRzVO24ileVS6rcHXAu3l3l98=; b=jLQqZvsex4Rqwc05GmwRJtNegVdwM4tjJW2mPyvwrBWvGjxvtLWdIc5teotNL2n+BF yH/H7iDqez/ahWhyU9b3OzVSOWKa7wui/2gAZXcpUs6Pinp3AgxONzRNsyngA4GDCGZ2 81u79iiFHeWCBT0G/osrrdHKgYBi29mwiMAttKlYbSZp+KDAyFzgMS3KH0+XtV98p2fm iMm5jRlC2vK09D7CpFHrw9Rkz6wuvael9JszzRzc2HSs2OPB7lSaEro762820XzkVY9S yNLUI1uCmq6IB8Yi6Yrvt3/MXBkTKoXC528vB/72Y2uk7NB4aZY1VLgvUF1fSj+Fdj35 lrRg== X-Received: by 10.14.45.70 with SMTP id o46mr6792484eeb.19.1377808375238; Thu, 29 Aug 2013 13:32:55 -0700 (PDT) Received: from localhost.localdomain (cpc20-stap10-2-0-cust563.12-2.cable.virginmedia.com. [82.20.130.52]) by mx.google.com with ESMTPSA id h52sm49080065eez.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 Aug 2013 13:32:54 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org 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> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377808314-30699-1-git-send-email-emil.l.velikov@gmail.com> References: <1377808314-30699-1-git-send-email-emil.l.velikov@gmail.com> X-Mailman-Approved-At: Thu, 29 Aug 2013 22:26:49 -0700 Cc: emil.l.velikov@gmail.com, Rob Clark X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 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: