From patchwork Wed Jan 27 13:23:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 8133451 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 EA384BEEE5 for ; Wed, 27 Jan 2016 13:21:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC6ED202FF for ; Wed, 27 Jan 2016 13:21:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 005F520270 for ; Wed, 27 Jan 2016 13:21:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8D13288F94; Wed, 27 Jan 2016 05:21:33 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by gabe.freedesktop.org (Postfix) with ESMTPS id 602CB89048 for ; Wed, 27 Jan 2016 05:21:32 -0800 (PST) Received: by mail-wm0-f66.google.com with SMTP id p63so3340817wmp.1 for ; Wed, 27 Jan 2016 05:21:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=/EKfaXwsXJXpRC7AUKoiIu44NdolauHNHwtunMKxzgc=; b=WQTXO4pobgYMmt/dTkqHwQrEWMMvk1b6qAJezanSTsUl8FqJkjRtEtqIGoEWFJfQLT 3UCAemT8qhtqXcWc3M+rhIfHC+Q6+KFLKY11A5lQUTp94bPFg9vNxeSOL2pyVfzbuzi+ I/rvq4KyCWFBeXxGlMfN0wMJ7lDcbJmLcbpNkq+QouPYmwrBVXvykhpDkM24zqk9Anrz VTsrUexA29rxljR1dBgql6E6YwwVAVS82OWLRBQ9P2HpsXLjbIou+BCdyaR0Ky1kr5FJ pxM/b6Sv/LiTCa2YinRn9fSMP63dRLMYrI9TlwQlQAlIZKxnERJkxKxFLb/CqMAl8sIJ yzjw== 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:mime-version :content-type:content-transfer-encoding; bh=/EKfaXwsXJXpRC7AUKoiIu44NdolauHNHwtunMKxzgc=; b=lZ9M1HHjgymPXbmlqICGbR81inZDAH3WidvqjaiJ3HztzWJiObIL4FouRw0jk3f08t OHo/t+TR1GXVpS+8BDQ4N95tD2u5oSDmwz44e0/+2w4wZRcCVyKPth9/mQJfuTyygIj+ lNK/BLKc09W+D0IOH+K5yW/uzxrpsBZsDov+zeiWJCTgIvsfDzfslrmJvSVsti1VEZPG cZojfbyZgkL7q7mMzplhdItpQtZsY44pKALdhiXY7SYTdFc0Zb4yKcHkUYbMtu3nH2o5 jyvxzsvVtZZqMf76E/MKZXIvOacDKB9VH7eAYKK2EcMoUqCXkz6RoLEY3p8Dkl9K1CTe XHWQ== X-Gm-Message-State: AG10YORLEYlcwiarnay8owQlBnIAjAmBNv8TOza09bph2DlnBFldGeKd0VhsWcVCcbdylg== X-Received: by 10.194.123.103 with SMTP id lz7mr17408662wjb.140.1453900890723; Wed, 27 Jan 2016 05:21:30 -0800 (PST) Received: from arch-laptop.localdomain (cpc4-croy22-2-0-cust704.19-2.cable.virginm.net. [82.14.182.193]) by smtp.gmail.com with ESMTPSA id kb5sm6253722wjc.22.2016.01.27.05.21.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jan 2016 05:21:30 -0800 (PST) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm] Update/fix the {copy,commit}-headers targets Date: Wed, 27 Jan 2016 13:23:11 +0000 Message-Id: <1453900991-906-1-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.6.2 MIME-Version: 1.0 Cc: Daniel Stone , emil.l.velikov@gmail.com, =?UTF-8?q?Michel=20D=C3=A4nzer?= , Rob Clark , Tomi Valkeinen , Ben Skeggs , Daniel Vetter , Alex Deucher , Dave Airlie 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: , 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, 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 As some headers do not reside in include/drm we need to tweak our rules, and exclude headers that shouldn't be distributed [XXX: clarify why ?]. To avoid the extra magic of diving into the kernel tree running `make headers_install', just sed out the only reason why we need it - __user. Cc: Alex Deucher Cc: Michel Dänzer Cc: Ben Skeggs Cc: Dave Airlie Cc: Daniel Stone Cc: Daniel Vetter Cc: Inki Dae Cc: Rob Clark Cc: Tomi Valkeinen Cc: Daniel Kurtz Signed-off-by: Emil Velikov --- Gents, As one runs `make copy-headers' we get a massive diff stat (+1500/-800) and a handful of issues gets pointed out. Please let me know of your prefered solution (regardless if one will get to it soon) and if we should consider it a blocker (B) or not (N). Thanks Emil - (N) Header license miss-match - omap, msm, exynos. Update the kernel ones ? - (N) Broken compat ioctls - exynos (and the UMS drivers) - using unsigned int as opposed to _u32/64. Considering they're 32bit only, we can get away with 'breaking' the ABI and using the proper ones ? - (N, keep local for now) C++ compat - libdrm has a hack/workaround (virtual is a keyword in C++), which I'd like us to upstream plus some extern C wrappers. - (?) Missing UMS symbols - see _DRM_GEM - (?) Non C89 compliant (see DRM_DRAWABLE_CLIPRECTS) - do we still want/need that ? - (B) Using include as opposed to include "..." - drm.h, nouveau_drm.h. Should be fixed in kernel. - (N) ABI 'break' + drm - struct drm_mode_get_connector extra pad + tegra - struct drm_tegra_gem_mmap extra pad - (B) API break + drm - missing DRM_MODE_OBJECT_* + nouveau - missing (gs)etparam - both structs and macros. everything else is fine/unused. + radeon - RADEON_TILING_R600_NO_SCANOUT, CIK_TILE_MODE_COLOR_2D* and CIK_TILE_MODE_DEPTH_STENCIL_2D_TILESPLIT_* - quick grep shows no users + omap - struct drm_omap_get_base, DRM_OMAP_GET_BASE + IOCTL - (N) (unneeded?) API additions - nouveau's DRM_IOCTL_NOUVEAU_GEM_* - (N) __KERNEL__ condiditionals. Is it really an issue - sure if looks a bit spurious but that's about it. Makefile.am | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ca41508..6c71d3a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,7 +126,14 @@ endif copy-headers : cp -r $(kernel_source)/include/uapi/drm/*.h $(top_srcdir)/include/drm/ + sed -i "s/__user //g" $(top_srcdir)/include/drm/*.h + mv $(top_srcdir)/include/drm/exynos_drm.h $(top_srcdir)/exynos/ + mv $(top_srcdir)/include/drm/msm_drm.h $(top_srcdir)/freedreno/msm/ + mv $(top_srcdir)/include/drm/omap_drm.h $(top_srcdir)/omap/ + rm $(top_srcdir)/include/drm/armada_drm.h + rm $(top_srcdir)/include/drm/etnaviv_drm.h + rm $(top_srcdir)/include/drm/i810_drm.h + rm $(top_srcdir)/include/drm/vc4_drm.h commit-headers : copy-headers - git add include/drm/*.h git commit -am "Copy headers from kernel $$(GIT_DIR=$(kernel_source)/.git git describe)"