From patchwork Sun Apr 5 15:29:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 6162391 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 36D0ABF4A6 for ; Sun, 5 Apr 2015 15:26:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 20C5920411 for ; Sun, 5 Apr 2015 15:26:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0357F2040F for ; Sun, 5 Apr 2015 15:26:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5CDE66E04A; Sun, 5 Apr 2015 08:26:32 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by gabe.freedesktop.org (Postfix) with ESMTP id 6BCFE6E04A for ; Sun, 5 Apr 2015 08:26:30 -0700 (PDT) Received: by wiun10 with SMTP id n10so13478469wiu.1 for ; Sun, 05 Apr 2015 08:26:29 -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=r2WOvBv7EMGYmh5yP9HctMcSE8uiAPPeaSj3mHqJHIU=; b=uhDbzechh47oFTV4IMUNXpiaUgEJqGD47gYADZCng7GcBdI/n++HbULQGBVpiYbcMt HyIEuOk64moZxOHee26Bihd3QEs5Pk8HRErfXlZ9lvxQXu3ruiI6ronbFKRBBTE7Pq9K 8u09VAFqhOEcBARDzZap0aBDEWs4iktKQ/F7tBPgE0Qo8e74Ypwtvh0a2UoMRdzqhhQL ZXegH2LTflqdzVDhwdn8c/H6wq3I/b3ekGxwHVAYaej8kuvV1ihzNB4z3U0m4oNFMsy4 Z2DsHfyb6rzCJkvgEbt8Ndn1vQ1cXHwJ4YpcEFfspVtHd1+BrCQCe9sGDLp65n0ddrEE 60cg== X-Received: by 10.194.241.202 with SMTP id wk10mr22733695wjc.145.1428247589458; Sun, 05 Apr 2015 08:26:29 -0700 (PDT) Received: from arch-x220.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by mx.google.com with ESMTPSA id u6sm2725945wjy.13.2015.04.05.08.26.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Apr 2015 08:26:28 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v2 02/19] radeon: move bof.[ch] out of libdrm_radeon Date: Sun, 5 Apr 2015 16:29:46 +0100 Message-Id: <1428247786-24408-1-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.3.1 In-Reply-To: References: Cc: Jerome Glisse , emil.l.velikov@gmail.com 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=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 The functions(files) are used if one explicitly modifies radeon_cs_gem.c by setting CS_BOF_DUMP to 1. As bof.[ch] is used (copied) to other out-of-tree projects, keep them around in the distribution tarball. Cc: Jerome Glisse Signed-off-by: Emil Velikov --- This will essentially replaces patches 02-07 (inclusive) and bof.[ch] will be left unchanged :-) Cheers Emil --- radeon/Makefile.am | 2 +- radeon/Makefile.sources | 8 +++++--- radeon/radeon_cs_gem.c | 5 ++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/radeon/Makefile.am b/radeon/Makefile.am index 5cca394..1e4c869 100644 --- a/radeon/Makefile.am +++ b/radeon/Makefile.am @@ -44,4 +44,4 @@ libdrm_radeoninclude_HEADERS = $(LIBDRM_RADEON_H_FILES) pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = libdrm_radeon.pc -EXTRA_DIST = Android.mk +EXTRA_DIST = Android.mk $(LIBDRM_RADEON_BOF_FILES) diff --git a/radeon/Makefile.sources b/radeon/Makefile.sources index a17701a..1cf482a 100644 --- a/radeon/Makefile.sources +++ b/radeon/Makefile.sources @@ -4,9 +4,7 @@ LIBDRM_RADEON_FILES := \ radeon_cs_space.c \ radeon_bo.c \ radeon_cs.c \ - radeon_surface.c \ - bof.c \ - bof.h + radeon_surface.c LIBDRM_RADEON_H_FILES := \ radeon_bo.h \ @@ -17,3 +15,7 @@ LIBDRM_RADEON_H_FILES := \ radeon_bo_int.h \ radeon_cs_int.h \ r600_pci_ids.h + +LIBDRM_RADEON_BOF_FILES := \ + bof.c \ + bof.h diff --git a/radeon/radeon_cs_gem.c b/radeon/radeon_cs_gem.c index 705ee05..81b3184 100644 --- a/radeon/radeon_cs_gem.c +++ b/radeon/radeon_cs_gem.c @@ -48,9 +48,12 @@ #include "xf86drm.h" #include "xf86atomic.h" #include "radeon_drm.h" -#include "bof.h" +/* Add LIBDRM_RADEON_BOF_FILES to libdrm_radeon_la_SOURCES when building with BOF_DUMP */ #define CS_BOF_DUMP 0 +#if CS_BOF_DUMP +#include "bof.h" +#endif struct radeon_cs_manager_gem { struct radeon_cs_manager base;