From patchwork Thu Aug 9 23:29:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanmay Shah X-Patchwork-Id: 10562129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1444A139A for ; Thu, 9 Aug 2018 23:29:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFD8F2BB0B for ; Thu, 9 Aug 2018 23:29:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E3CD22BB0E; Thu, 9 Aug 2018 23:29:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E9E612BB0B for ; Thu, 9 Aug 2018 23:29:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 95DB56E6E0; Thu, 9 Aug 2018 23:29:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F0AD6E6E0; Thu, 9 Aug 2018 23:29:43 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 357D060AD8; Thu, 9 Aug 2018 23:29:43 +0000 (UTC) Received: from linuxdisplay-lab-04.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: tanmay@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 1AB9C60AD8; Thu, 9 Aug 2018 23:29:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 1AB9C60AD8 From: Tanmay Shah To: dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH libdrm v2] libdrm: add msm drm uapi header Date: Thu, 9 Aug 2018 16:29:26 -0700 Message-Id: <1533857366-13080-1-git-send-email-tanmay@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <4edbde4f5467c9f8e36b37df8bc8a3d9@codeaurora.org> References: <4edbde4f5467c9f8e36b37df8bc8a3d9@codeaurora.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ryadav@codeaurora.org, seanpaul@google.com, manojavm@codeaurora.org, Tanmay Shah , hoegsberg@google.com, chandanu@codeaurora.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP msm_drm.h file derived from drm-next kernel uapi header. Remove freedreno/msm/msm_drm.h to maintain only one copy of msm_drm.h and change freedreno Makefile accordingly. Signed-off-by: Tanmay Shah --- Makefile.sources | 1 + freedreno/Makefile.sources | 1 - {freedreno/msm => include/drm}/msm_drm.h | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) rename {freedreno/msm => include/drm}/msm_drm.h (99%) diff --git a/Makefile.sources b/Makefile.sources index 1f8372bc..55290fe9 100644 --- a/Makefile.sources +++ b/Makefile.sources @@ -25,6 +25,7 @@ LIBDRM_INCLUDE_H_FILES := \ include/drm/i915_drm.h \ include/drm/mach64_drm.h \ include/drm/mga_drm.h \ + include/drm/msm_drm.h \ include/drm/nouveau_drm.h \ include/drm/qxl_drm.h \ include/drm/r128_drm.h \ diff --git a/freedreno/Makefile.sources b/freedreno/Makefile.sources index 68a679bf..ca89511a 100644 --- a/freedreno/Makefile.sources +++ b/freedreno/Makefile.sources @@ -7,7 +7,6 @@ LIBDRM_FREEDRENO_FILES := \ freedreno_bo_cache.c \ msm/msm_bo.c \ msm/msm_device.c \ - msm/msm_drm.h \ msm/msm_pipe.c \ msm/msm_priv.h \ msm/msm_ringbuffer.c diff --git a/freedreno/msm/msm_drm.h b/include/drm/msm_drm.h similarity index 99% rename from freedreno/msm/msm_drm.h rename to include/drm/msm_drm.h index dac49e59..c06d0a5b 100644 --- a/freedreno/msm/msm_drm.h +++ b/include/drm/msm_drm.h @@ -25,7 +25,6 @@ #ifndef __MSM_DRM_H__ #define __MSM_DRM_H__ -#include #include "drm.h" #if defined(__cplusplus) @@ -202,10 +201,12 @@ struct drm_msm_gem_submit_bo { #define MSM_SUBMIT_NO_IMPLICIT 0x80000000 /* disable implicit sync */ #define MSM_SUBMIT_FENCE_FD_IN 0x40000000 /* enable input fence_fd */ #define MSM_SUBMIT_FENCE_FD_OUT 0x20000000 /* enable output fence_fd */ +#define MSM_SUBMIT_SUDO 0x10000000 /* run submitted cmds from RB */ #define MSM_SUBMIT_FLAGS ( \ MSM_SUBMIT_NO_IMPLICIT | \ MSM_SUBMIT_FENCE_FD_IN | \ MSM_SUBMIT_FENCE_FD_OUT | \ + MSM_SUBMIT_SUDO | \ 0) /* Each cmdstream submit consists of a table of buffers involved, and