From patchwork Thu Jul 18 16:15:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049299 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 82ABA912 for ; Thu, 18 Jul 2019 16:15:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 70CC72858A for ; Thu, 18 Jul 2019 16:15:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62DC2283B2; Thu, 18 Jul 2019 16:15:58 +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 ED909283B2 for ; Thu, 18 Jul 2019 16:15:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B3A076E43D; Thu, 18 Jul 2019 16:15:47 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) by gabe.freedesktop.org (Postfix) with ESMTPS id B076A6E444; Thu, 18 Jul 2019 16:15:44 +0000 (UTC) Received: by mail-lf1-x143.google.com with SMTP id p197so19603161lfa.2; Thu, 18 Jul 2019 09:15:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=UlOLkWz9OCQuOLcSNJtSJ4+8TzZuh+LJDaeiwowcFEQ=; b=Ro/t9Sf7Lfjt3CDxONuTkkZKe+LBGAihomXcotZ2zk9yaVjfbvAkg9QnN0doomkC2g ocYtasnshLchsAoLna+rqHuEzPhb3DHR7Nvn+hjG1R9LE5jcyBgVvMDtke1cmtTkW2Rw 9LSGJ5VTppbXdHRoQJDF8VxfCr2eLGE6jC5ZXfcpzXN87B0J5LxNosquixfHYYpwSPSo FAy5+5lsRNNRq6VOVeov7NM21EE6eXRoFftAgzMNDbZ1L65UOfbekPU3JZL3NdzWVVsx 5TT8f7kVM8FRrTtvrQ/D12g9qnhwURjf9C2+On2vh614W5nOSbBKtMFNGG+80qi5eFij y0Zw== X-Gm-Message-State: APjAAAVYnN5m+qw1wtEt6FtYbSllyZ2suIqCPzjSahLCVe54KGt5HOgl gB4QR2ow8LpzJ0U8j2Ah8majFxenCu2+7Q== X-Google-Smtp-Source: APXvYqxYBrArSH1t7goxG0eRWhOTlhkk7mSDSycDPhnE9EVqrjdusk6P3foX4G6hPkEh6dmQ1VTAyQ== X-Received: by 2002:a19:c514:: with SMTP id w20mr21730371lfe.182.1563466541152; Thu, 18 Jul 2019 09:15:41 -0700 (PDT) Received: from saturn.lan (18.158-248-194.customer.lyse.net. [158.248.194.18]) by smtp.gmail.com with ESMTPSA id d21sm4057995lfc.73.2019.07.18.09.15.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:40 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Date: Thu, 18 Jul 2019 18:15:07 +0200 Message-Id: <20190718161507.2047-12-sam@ravnborg.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190718161507.2047-1-sam@ravnborg.org> References: <20190718161507.2047-1-sam@ravnborg.org> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UlOLkWz9OCQuOLcSNJtSJ4+8TzZuh+LJDaeiwowcFEQ=; b=d2LniV1TStQHaiWmIBMTYC+PjTLCHouyWKGpmJ+7CMGnK+gTJA+cBCRsj6jZDNTvJ/ 4GhmHbHYJ9hnDNp70wOSyILt3N4zZUXgBuUtjWxFlzwoSFUgshoux+3kWDF8bG9bgwD8 Vbhvgg60g5ByAdW1bL7Nif8sBeXiWyjcbHvdWeq33btV0vU4tIyw3w4Gh2tTYormeCCF OBWUfeuDa2f+CeaO3dke7aqRgwpjKQWUkbcAQ5B7wubS+besUXOgPfRYOew0FIDlu6P6 yp/dQr2mJ4MfXQexj1lDz3S+twdz7hTxdAFfA8KsPkFsQiDe7AJc02Q4zDi2Di14kEo+ noSQ== Subject: [Intel-gfx] [PATCH v1 11/11] drm: drop uapi dependency from drm_file.h X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Chunming Zhou , Jani Nikula , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , Sean Paul , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP drm_file used drm_magic_t from uapi/drm/drm.h. This is a simple unsigned int. Just opencode it as such to break the dependency from this header file to uapi. Signed-off-by: Sam Ravnborg Suggested-by: Daniel Vetter Cc: Sean Paul Cc: Liviu Dudau Cc: Chris Wilson Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: David Airlie Cc: Daniel Vetter Cc: Jani Nikula Cc: Eric Anholt Reviewed-by: Sean Paul --- include/drm/drm_file.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index 67af60bb527a..046cd1bf91eb 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -34,8 +34,6 @@ #include #include -#include - #include struct dma_fence; @@ -227,7 +225,7 @@ struct drm_file { struct pid *pid; /** @magic: Authentication magic, see @authenticated. */ - drm_magic_t magic; + unsigned int magic; /** * @lhead: