From patchwork Thu Jul 18 16:14:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049267 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 C4310912 for ; Thu, 18 Jul 2019 16:15:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3421283B2 for ; Thu, 18 Jul 2019 16:15:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A668E286BE; Thu, 18 Jul 2019 16:15:35 +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=unavailable 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 65CDC283B2 for ; Thu, 18 Jul 2019 16:15:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 472AD6E435; Thu, 18 Jul 2019 16:15:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id A6E466E432; Thu, 18 Jul 2019 16:15:27 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id i21so27952733ljj.3; Thu, 18 Jul 2019 09:15:27 -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=xuHi/x4to3SX7TRrtv62bR81bCU79XMtB/fuZqAmK/4=; b=A1J5OQualNXE0U0mphkRKMr6I7gnDL55/Q4/eIFsJJ1qh/eNLipXKXkAccoWCa4QJI +mteQ3sIgn3gXiParkRI0AYtRxEK29j5Im5mapm6oDXa3rDv1bU2Je7VxxHSqj3RRsIL lLeKBngonm0NSX1/YE4d6tEonqTU7kLR7cSqmMvPauqjsy8c1f3JIQIHhWOMltzFjOje ufy7iPRAc3HKRHoDzj5bhWRDubjbuP09vfCfGI7iHt0UpV+Fe9H3A/Ycf8AEp33zdF2J RiRfizN31CJhlt+ftY5/H2+2C/2TG6AfOqP+T8eIJhtT9OoYxhO4FrwEXl6wUPhS1v3d TqBg== X-Gm-Message-State: APjAAAXNcpl8wngdHrWKRxKzNqhn+JvjNLfA4FK2hWQJX/5e/xX40gNE wHWONycatuJqBG1zTQ0jOuwRjFpSp7xMew== X-Google-Smtp-Source: APXvYqxopRd2EXz7d6DIiAHotDUEDdlvCMB5sah0WnzkQlftdAyegfCZa4HP9SqflNRkyus/8Vkv5w== X-Received: by 2002:a2e:9753:: with SMTP id f19mr24655350ljj.113.1563466525895; Thu, 18 Jul 2019 09:15:25 -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.24 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:25 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 01/11] drm/panel: make drm_panel.h self-contained Date: Thu, 18 Jul 2019 18:14:57 +0200 Message-Id: <20190718161507.2047-2-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=xuHi/x4to3SX7TRrtv62bR81bCU79XMtB/fuZqAmK/4=; b=ccIpMj7bhqxadUhNYMQ8D6hZbjvh1AFYYDWwpHuL4jXZxpIWt1NRNWHGGxm/4zWkRX OjFGkqH9blEdvYLUOfyXGZ+I5aCmIUdxkPhT78M1nxDqGFphQCPafb8D+kaFVnoxB9OF pjCBT8Y1UHgxZgDNYGw5y+89GY17TgS0OytKu4Bv93YoVbtU6hiC+hf00a3CNSsLasKd MEUK0SZrZ7yHvSQVNPdPig/hu3XSvMNtoXVNBVZdQrF4lNvyH5r6YEzisPPOVdCRv3JK RPbsQsokKKabA/u3yRc5DJEXGwUhjcH5bBsdJpASfO2qWGblFfltPmUDAE0hO++IeSx6 FRLA== 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: David Airlie , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , Boris Brezillon , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Jani Nikula Fix build warning if drm_panel.h is built with CONFIG_OF=n or CONFIG_DRM_PANEL=n and included without the prerequisite err.h: ./include/drm/drm_panel.h: In function ‘of_drm_find_panel’: ./include/drm/drm_panel.h:203:9: error: implicit declaration of function ‘ERR_PTR’ [-Werror=implicit-function-declaration] return ERR_PTR(-ENODEV); ^~~~~~~ ./include/drm/drm_panel.h:203:9: error: returning ‘int’ from a function with return type ‘struct drm_panel *’ makes pointer from integer without a cast [-Werror=int-conversion] return ERR_PTR(-ENODEV); ^~~~~~~~~~~~~~~~ Fixes: 5fa8e4a22182 ("drm/panel: Make of_drm_find_panel() return an ERR_PTR() instead of NULL") Cc: Boris Brezillon Signed-off-by: Jani Nikula Acked-by: Thierry Reding Reviewed-by: Sam Ravnborg Reviewed-by: Sean Paul --- include/drm/drm_panel.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/drm/drm_panel.h b/include/drm/drm_panel.h index 8c738c0e6e9f..26377836141c 100644 --- a/include/drm/drm_panel.h +++ b/include/drm/drm_panel.h @@ -24,6 +24,7 @@ #ifndef __DRM_PANEL_H__ #define __DRM_PANEL_H__ +#include #include #include From patchwork Thu Jul 18 16:14:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049265 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 022FC912 for ; Thu, 18 Jul 2019 16:15:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3C08283B2 for ; Thu, 18 Jul 2019 16:15:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D423B2880A; Thu, 18 Jul 2019 16:15:33 +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 A75C7283B2 for ; Thu, 18 Jul 2019 16:15:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 09ADF6E433; Thu, 18 Jul 2019 16:15:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 588CE6E431; Thu, 18 Jul 2019 16:15:29 +0000 (UTC) Received: by mail-lf1-x143.google.com with SMTP id z15so15343081lfh.13; Thu, 18 Jul 2019 09:15:29 -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=ZMM3AoTDxthXTgGf4L3oHv9Xw8A43N9eoN7QWgZY2HA=; b=LqmEoisozdRWGpHjl0uGx0W8jTyLe4+cb7reAB8lO6IBKLxgrCiVwHpZtWpmTrpRmA DzWTYG0/9cJpLuVUInQSobVdNm7OLxLqgkSanp/bKfaoUqSJcnoOsQoyuWIKFLLfgWad gNjP6L2n/wIIC1LUcwM93QF7SZ2MxggLKUJ8ZLT6A/oH8r6IeZAHq4RGvxMumlTiJPOR Heu7fu7wyml6df0x1T1MqrHDUfNUW9XO+MVLZNrJeKOviiqpo1mB2YKyWGSBtOpL21ek +6PPG6AIYJg+/2Fuz4HTKTD5SZ8i5KgsFK9qyGOk2zRf8ux5ODwgDB3N2HeBiBrRsFqz gBvg== X-Gm-Message-State: APjAAAVKeIICbdT3BbtIbsyxPaW3ve2dnf/PE2O4RCqmfGa5IIug5FWn cR0dndTlI0+TNDPky9KCkHbqboWpJhH18g== X-Google-Smtp-Source: APXvYqxjOhgC8N6n7ZnOJ74I1kbAhFiifIbk15ykKdzDjD5ivSxzoVTvrE+Xh/kq9CdAYpSgPT/Trw== X-Received: by 2002:ac2:5981:: with SMTP id w1mr21168038lfn.85.1563466527477; Thu, 18 Jul 2019 09:15:27 -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.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:27 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 02/11] drm: drop uapi dependency from drm_print.h Date: Thu, 18 Jul 2019 18:14:58 +0200 Message-Id: <20190718161507.2047-3-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=ZMM3AoTDxthXTgGf4L3oHv9Xw8A43N9eoN7QWgZY2HA=; b=aM3juu6pRx62RK8ZsZjl3w2sEqjDvq1T9hwgF2fi2kslQZ9EVXRy1TrnvCoAA6wRjy 0Hpa2xhbcQlNmWLfKyJ7d7t3Pe7t1boHg1EoiH8q2Yx6V6SuQml6DDhpfRmZhzTX+Z5V 7ttwmNtHmnE89Xb9pXYXsvarcZWZTALLRTmPEeR6B3Kw/Dyycfa2IlODdlQg0SiwGqz0 /gVPZFpXU6MohWNT2XzAkCuqQd5fFixQrnuDs22LDOt4CTm2M0C+o2awH9UGs9ajFJLw oqw+1J5RU3riDwdphpwIcpkaQzsHX6YgVfn+tXrnTmAWg7zoNE2VEG9zF19ChGelU3Oc 5+FQ== 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: David Airlie , Daniel Vetter , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Sean Paul , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drm_print.h used DRM_NAME - thus adding a dependency from include/drm/drm_print.h => uapi/drm/drm.h Hardcode the name "drm" to break this dependency. The idea is that there shall be a minimal dependency between include/drm/* and uapi/* Signed-off-by: Sam Ravnborg Suggested-by: Daniel Vetter Reviewed-by: Daniel Vetter Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Rob Clark Cc: Sean Paul Cc: Chris Wilson Cc: Daniel Vetter --- include/drm/drm_print.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index a5d6f2f3e430..760d1bd0eaf1 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -32,8 +32,6 @@ #include #include -#include - /** * DOC: print * @@ -287,7 +285,7 @@ void drm_err(const char *format, ...); /* Macros to make printk easier */ #define _DRM_PRINTK(once, level, fmt, ...) \ - printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__) + printk##once(KERN_##level "[drm] " fmt, ##__VA_ARGS__) #define DRM_INFO(fmt, ...) \ _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__) From patchwork Thu Jul 18 16:14:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049273 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 5EE256C5 for ; Thu, 18 Jul 2019 16:15:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FDA6283B2 for ; Thu, 18 Jul 2019 16:15:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 43F11286BE; Thu, 18 Jul 2019 16:15:41 +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=unavailable 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 81BD0283B2 for ; Thu, 18 Jul 2019 16:15:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E54BF6E438; Thu, 18 Jul 2019 16:15:36 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1566C6E434; Thu, 18 Jul 2019 16:15:31 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id m8so27902057lji.7; Thu, 18 Jul 2019 09:15:30 -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=6MYIEn1ZPyuv1rXYHIstqwkz6PcLGLc7Ica5A/O2ta8=; b=R+2uhOCgrKzKRGfQxcmkUwJT3Nk245WN64aPoKrqkJdplHThdl4tO9A6qbtkT/IuBW 7Xn29GuLBXfZHNgQlKVHfGhUm1jqZbmcmQ5t7KN2krZNygA+pUgWqajmAql9cm55NThs hd+KUe2IoPKiaIIxpiWp1w++c6mUKRT05YDEPSrzOkfcevkbQlJQGA3Hjrh/RySRKt4w tpC5XgYo/1W10AodNABnR9BxflqMzj/fKhJjE6OIzwujB6tkXi4fQtuMlYtovjdWgMyq 06tS8or9WulhnYnCmjH7qom60mEbGzWhaq0g/G7Qp9Udn0Dl4v1RROQ8fNXldpQCTG/c 9uJQ== X-Gm-Message-State: APjAAAWGan27rgO/CmBC4E8KUKN10uc618u3QpUyhFbnU6FJ+/q/WpjL BzY7hUMi1xwodvvmULxTUK4L6/iTj5zcNQ== X-Google-Smtp-Source: APXvYqx2GdlPCoRvteVmwbMwCMh5PJuLakxwccuByFw+yBBnrjbiYfadk2aOmQ7u2DxEu65vuBdQrA== X-Received: by 2002:a2e:8ed2:: with SMTP id e18mr24703434ljl.235.1563466529166; Thu, 18 Jul 2019 09:15:29 -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.27 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:28 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 03/11] drm: drop uapi dependency from drm_vblank.h Date: Thu, 18 Jul 2019 18:14:59 +0200 Message-Id: <20190718161507.2047-4-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=6MYIEn1ZPyuv1rXYHIstqwkz6PcLGLc7Ica5A/O2ta8=; b=l/+A5TefNobm66FT7NA+1L1326lmg05N3R1te0STjlI/DicLKKwWdKIY2ffs2mhBOL kkjv9qFYw15vXqqFFAU9sEJM8CKG+KSw7PRGlqcLJa/9F7LsquNb3BHtsONIORKzC2qd N7+NAPnu749BDYCKNMo1fmjSOX1joYwHLHnffqp/TAgyjt/VDreMIqOFsazjOz5yvMRS qJhujeZDJuAY0Chs5hTRgGU3dzpNox/cPHJRbdEmZHk21I10l1L6lzfKzsmdsDEy0zN6 yA3s3GZcX62oNEzKWMAHA3TfZUlL7L1P2nP6AYCTPrKLyMJ5Hj2RrA65pTnKp2PnEYRt Nf4A== 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: David Airlie , Daniel Vetter , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drm_vblank.h included uapi/drm/drm.h. It turns out this include was not required - delete it. Note: uapi/drm/drm.h is included indirect via drm_file.h, but there are no dependencies in drm_vblank.h so the removal is legit. Signed-off-by: Sam Ravnborg Reviewed-by: Daniel Vetter Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Cc: Stefan Agner Cc: Thierry Reding Reviewed-by: Sean Paul --- include/drm/drm_vblank.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/drm/drm_vblank.h b/include/drm/drm_vblank.h index e528bb2f659d..9fe4ba8bc622 100644 --- a/include/drm/drm_vblank.h +++ b/include/drm/drm_vblank.h @@ -30,7 +30,6 @@ #include #include -#include struct drm_device; struct drm_crtc; From patchwork Thu Jul 18 16:15:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049277 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 5BD9B912 for ; Thu, 18 Jul 2019 16:15:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D258283B2 for ; Thu, 18 Jul 2019 16:15:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40F5428607; Thu, 18 Jul 2019 16:15:46 +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 E03DD283B2 for ; Thu, 18 Jul 2019 16:15:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A4E4B6E431; Thu, 18 Jul 2019 16:15:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 C6F4C6E431; Thu, 18 Jul 2019 16:15:32 +0000 (UTC) Received: by mail-lf1-x143.google.com with SMTP id p197so19602727lfa.2; Thu, 18 Jul 2019 09:15:32 -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=TBzEtdfCBC7JeGboomJdNlsAe05PLJaxt5wvtDjrcuc=; b=O/KQihKvdpoYqpoEE3MV6RGsi9hmb0NNG4hwZ4U/LhxItLPIhv/qaYVtvCxsh7eolm e+YNMMHNlZWYX7ZNZgFkn/HzEcBnBPTyEqxAcTxERWk4xFx+thlK9qhRoGO+5nNWtMi6 N/jnvy2wk6UisA0DYuEYncVg66XAUZKH+tiUGRQD+jDtoQ4vxqIXPpwCihWyI6Non9Ku 71D6uZKqhyaoGO91/fHh8/AhFceODjXpMFxiL0PptdSwfvDcT5LzCdPIQwdffi1vgn07 G6dT07XlguF8Casy80P2wCaSw7DeFiuj7c02Ztav9JqEVrkVgyaBdSBhoY1pU10YbohK 5zRA== X-Gm-Message-State: APjAAAXBCTxFwI/MYICdYvSfRE5a/n0yaGTAcuzciBdc6KoZxbxfKf0E ZMpswYvLb7f4exQRchC9NlCp6ifr2GwS2w== X-Google-Smtp-Source: APXvYqxR6UJvyzBrpoBKJ1t/MeC7+3uFD4fwDUCOIFsQ9De/62GDc97lhKJZ2LBIEMtYzSPi07yrWA== X-Received: by 2002:ac2:5a01:: with SMTP id q1mr7852749lfn.46.1563466530686; Thu, 18 Jul 2019 09:15:30 -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.29 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:30 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 04/11] drm/ati_pcigart: drop dependency on drm_os_linux.h Date: Thu, 18 Jul 2019 18:15:00 +0200 Message-Id: <20190718161507.2047-5-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=TBzEtdfCBC7JeGboomJdNlsAe05PLJaxt5wvtDjrcuc=; b=rCmwKJR0Ch/XIKuvX/iHVKTyWuto858/ULPTJNZuoxCPXol4vTi8kjxj+OdaXRHT2p 6X2P9wZze0CqOaL4cU4Fu+dF5nzao2U+If/3C1Ki+1MGinO/FNJEwAznmWmf3mgwZopF cjQJhUjrAaTQ7iESM5EOl8nbtN5Kd82P/bCbjr9z/u0JOwcVUoQoGQeIsjyTbQwtPb8x rzCup7ZkSowfDduPVWmrzvT/m59PrUV7GE6LkJD8zixS/9mAKNe5A+RJhaj0lUXzlkhN 2V+r1O1M7tPiHg09aIT6VLwMqOplw0dPGxu03kCzU5Too4xcj+CwW98qLmBs2roVk8GE 0sJQ== 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: David Airlie , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The drm_os_linux.h header is deprecated. Just opencode the sole DRM_WRITE32(). Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Reviewed-by: Sean Paul --- drivers/gpu/drm/ati_pcigart.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c index 2a413e291a60..580aa2676358 100644 --- a/drivers/gpu/drm/ati_pcigart.c +++ b/drivers/gpu/drm/ati_pcigart.c @@ -35,7 +35,6 @@ #include #include -#include #include #include @@ -169,6 +168,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga page_base = (u32) entry->busaddr[i]; for (j = 0; j < (PAGE_SIZE / ATI_PCIGART_PAGE_SIZE); j++) { + u32 offset; u32 val; switch(gart_info->gart_reg_if) { @@ -184,10 +184,12 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga break; } if (gart_info->gart_table_location == - DRM_ATI_GART_MAIN) + DRM_ATI_GART_MAIN) { pci_gart[gart_idx] = cpu_to_le32(val); - else - DRM_WRITE32(map, gart_idx * sizeof(u32), val); + } else { + offset = gart_idx * sizeof(u32); + writel(val, (void __iomem *)map->handle + offset); + } gart_idx++; page_base += ATI_PCIGART_PAGE_SIZE; } From patchwork Thu Jul 18 16:15:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049279 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 DB774912 for ; Thu, 18 Jul 2019 16:15:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8F3B283B2 for ; Thu, 18 Jul 2019 16:15:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9EE428607; Thu, 18 Jul 2019 16:15: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 5D4C7283B2 for ; Thu, 18 Jul 2019 16:15:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C32226E43C; Thu, 18 Jul 2019 16:15:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9713E6E431; Thu, 18 Jul 2019 16:15:35 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id z28so27998928ljn.4; Thu, 18 Jul 2019 09:15:35 -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=vfJth78zrsCE8EvAkb2q7xxIdGu3poPk3dyoAqmz7bA=; b=paVj8PyKinyf5ARQBNEY9lEK/fsCSPVhMvKdwOOKycAWuzpzRsNT/vpI5J3h8epIwd mGtwSRat/bTCLwoMvPGXBv4VirdDtTAuW4kNF7ubyMb4/YChzmA1ot8V1tLsBmWOmBPq VfQ9nY75juvFgrAe5r7Qvjx4e4Qb8Nzm10UzKh5dsYKPu9djSfrHYX8UuaI/cNchYuEk MPe8Mr3WU+BaZgH2X3MekHqvaFxxArQW0FuHhWVJWAVbZVG+qLAgsWRaQmmvbe9XA3fw FC+YEdJeL3U6uOW7ZJZV225Z9cmbN1PlhnYgwiy3zeBmv9Xcu9V8J8sXDFS9pBpmYstG 9hfw== X-Gm-Message-State: APjAAAWlBPwDw2jv1fLEFSraFshwrr9ndwXspW+r361p1IKeCLuM80G7 yFJIGDhY0GEF8ouZWym7z75tfhC1DmH94A== X-Google-Smtp-Source: APXvYqz+lvIEFfsf44rKsdxmLLQVJPn5lk9Rv8gUung+m8ggZXDMg+iNeOqEP6Hx4DqN5fgQu97mtQ== X-Received: by 2002:a2e:3013:: with SMTP id w19mr24846595ljw.73.1563466532065; Thu, 18 Jul 2019 09:15:32 -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.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:31 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 05/11] drm/vblank: drop use of DRM_WAIT_ON() Date: Thu, 18 Jul 2019 18:15:01 +0200 Message-Id: <20190718161507.2047-6-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=vfJth78zrsCE8EvAkb2q7xxIdGu3poPk3dyoAqmz7bA=; b=BbtCb9g2DsNiEp4NQaoJ4QYlf9TOBMn5FNfXAILkgRxVvjMv4oYQ2QWQur2QpY1oDs tY+hq6tQpdn6sv4GaAaRN3zqoKMtOJxKTS+CE/FeurecYR2py7DmD+wOYqDqFPliavRD kUvnCwNnxdpmg77SNaygFlJnpzjhLEFeu3r3pjJqPBA1qYv13+DJUC4oqyBIegVvlLUf yV55m8LLBBHpOjCBjccG83p4/fiVAPoDBnjNwfJNh1ay525CqTZIoid4MD9BRXItWgVc N7jdcGxdFSDusx5NEMh0a+wZcDux71kNRXlqKP3VfMBmJJZlGukoBFODa+OKNFpsR1xe 1F0g== 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: David Airlie , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP DRM_WAIT_ON() is from the deprecated drm_os_linux header and the modern replacement is the wait_event_*. The return values differ, so a conversion is needed to keep the original interface towards userspace. Introduced a switch/case to make code obvious and to allow different debug prints depending on the result. Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Reviewed-by: Sean Paul --- drivers/gpu/drm/drm_vblank.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c index 603ab105125d..8e9ac187500e 100644 --- a/drivers/gpu/drm/drm_vblank.c +++ b/drivers/gpu/drm/drm_vblank.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include "drm_internal.h" @@ -1672,19 +1671,31 @@ int drm_wait_vblank_ioctl(struct drm_device *dev, void *data, if (req_seq != seq) { DRM_DEBUG("waiting on vblank count %llu, crtc %u\n", req_seq, pipe); - DRM_WAIT_ON(ret, vblank->queue, 3 * HZ, - vblank_passed(drm_vblank_count(dev, pipe), - req_seq) || - !READ_ONCE(vblank->enabled)); + ret = wait_event_interruptible_timeout(vblank->queue, + vblank_passed(drm_vblank_count(dev, pipe), req_seq) || + !READ_ONCE(vblank->enabled), + msecs_to_jiffies(3000)); } - if (ret != -EINTR) { + switch (ret) { + case 0: + /* timeout */ + ret = -EBUSY; drm_wait_vblank_reply(dev, pipe, &vblwait->reply); - - DRM_DEBUG("crtc %d returning %u to client\n", + DRM_DEBUG("timeout waiting for vblank. crtc %d returning %u to client\n", pipe, vblwait->reply.sequence); - } else { + break; + case -ERESTARTSYS: + /* interrupted by signal */ + ret = -EINTR; DRM_DEBUG("crtc %d vblank wait interrupted by signal\n", pipe); + break; + default: + ret = 0; + drm_wait_vblank_reply(dev, pipe, &vblwait->reply); + DRM_DEBUG("crtc %d returning %u to client\n", + pipe, vblwait->reply.sequence); + break; } done: From patchwork Thu Jul 18 16:15:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049275 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 28FF36C5 for ; Thu, 18 Jul 2019 16:15:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19E79283B2 for ; Thu, 18 Jul 2019 16:15:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DC4F286BE; Thu, 18 Jul 2019 16:15:42 +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 B4F2B283B2 for ; Thu, 18 Jul 2019 16:15:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B4BFE6E439; Thu, 18 Jul 2019 16:15:37 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id D23646E43A; Thu, 18 Jul 2019 16:15:35 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id r9so27931002ljg.5; Thu, 18 Jul 2019 09:15:35 -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=frt3PhKQBylKx3tn0yMJrH+277gjX7vmRE3rzWAOnE8=; b=VhAXbxaDLNzjSxSYzHjgfN3/Y4o+5VMu60GRJN6q6wraWbCIWZYt4/8BRpdTFDTx8F gwJqjODKTenI1YVWh82433uDTHenqT4LYOKylmKJB0zsiWCiOU0WRHvxjb2Unn8U5hOK twY5CHF/ShaFc/LtZu+uh8DLwDKyHwonwBrmaC+mGXF6HZeFlXTzCgqedNWRLf1r/oUh jai/iKW0AadXi3WrKGT8Xaa1zy5AW1LM7ohLtdlFDheBZrWdvhnrH9CghhJGd0M2OIBV r20Nubsi+uS8vft0ZgLwYGMXu9abUZIM1YUL76GLCvMLkReRg7w6/iaChL+pizPpGLJl mw2w== X-Gm-Message-State: APjAAAV09PCnBRtxTcnxKYqf+IgLQK6VRTf7TlKAjE+x4bhm4TWNdRKB v+Pqueaan1SLosviByBMSHTfN+4dTkf9Vw== X-Google-Smtp-Source: APXvYqz/RnnkqyLtk3obXJqtNg+i+wdOYBauoGyguf1eiAnrv5wKKJGQGPe8OZoel1lFzRD+6rhT2g== X-Received: by 2002:a2e:3807:: with SMTP id f7mr11394109lja.87.1563466533469; Thu, 18 Jul 2019 09:15:33 -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.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:33 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 06/11] drm: direct include of drm.h in drm_gem.c Date: Thu, 18 Jul 2019 18:15:02 +0200 Message-Id: <20190718161507.2047-7-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=frt3PhKQBylKx3tn0yMJrH+277gjX7vmRE3rzWAOnE8=; b=sor6nM1ennhFjpJNXT+dUZW2uvyNCzkQJQRqB632N4GQ876fQQFM/wgqZsa1bMU6B3 M/KjIDrmU8AGE+Oe9pZMW6fBGZKFarfZ/nqedHcps4Zy/nfngrk4qOQil2ISENMPYqJe vNzgB+H/7gRCrZfLczjmymi0WS+3so2KJaOqwVA3DYOdCDMRZIAL7DlQAEJVdLOTLLcR vPl05yR+hc+5wI7LGtSJURbTpSSaqGGQZB5W1jFB2caPRc4o9WxyKS+vJ68YDkqd0J7o TiNzz1ZT1MG7h+Id5PVwEQmix9WnOtmMplqQX30/Okmk/+DRu755WLWbnSTNnRh7y/LT cyFQ== 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: David Airlie , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped. Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Cc: Eric Anholt Cc: Thomas Zimmermann Cc: Rob Herring Reviewed-by: Sean Paul --- drivers/gpu/drm/drm_gem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index e6c12c6ec728..243f43d70f42 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -39,6 +39,7 @@ #include #include +#include #include #include #include From patchwork Thu Jul 18 16:15:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049291 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 522FA912 for ; Thu, 18 Jul 2019 16:15:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42E69283B2 for ; Thu, 18 Jul 2019 16:15:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3677F28607; Thu, 18 Jul 2019 16:15:54 +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 D5E47283B2 for ; Thu, 18 Jul 2019 16:15:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 44DC76E441; Thu, 18 Jul 2019 16:15:44 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 95B836E431; Thu, 18 Jul 2019 16:15:37 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id h10so27962942ljg.0; Thu, 18 Jul 2019 09:15:37 -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=5iHBuVq6OVoL5g2SO+kAMAMUgwsbAup21Am8Hz+Y/h8=; b=qdApYe9yx7FqIV7Ip39Ol4c+2y8G0bHeS4pDT6DHnmXCCES+RPE8RT0TlJWFlgV6zl 1/lJQcczpC6YYePpyJFGgtqo60tysg3QJMBDPvqf0LyDsST5aJHFQJkYW7E+Ef85RwmS c2xpjucEDW0YPR4vuaYfYMrlzT5nGB3eZcGMrI7Z1G3k3lJdwEJMUPZ1rvlNdf6A1O+N WzkrQ4HNziEjq5SfF1hAu8P4/iVrThPSqFe94ZX1xP7oAosOq4PY68bmPYGyZqb0T8tP mOQ7cWRfD4HBho0D4sxu62Iqp442WbuWkB3vFkIs7MY4O73MSix+SCtVEGs/R9ddP8Fx AR+Q== X-Gm-Message-State: APjAAAVCG8M2g8o72BpBd6Kyoo+NHiVo91aqKb0r2dEyBqzCYZgq8YsS RjkWDk2fSoa+caGXS9rkajOKj/RAWJT9PA== X-Google-Smtp-Source: APXvYqygrJMJtCucev6Ri5vM6W9Y/vQi+gWsKgWZ7kWFT2xIA7iXrlP3B0wYUJ6SqdZxmRzieBQObA== X-Received: by 2002:a2e:8007:: with SMTP id j7mr24880722ljg.191.1563466535069; Thu, 18 Jul 2019 09:15:35 -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.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:34 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 07/11] drm: direct include of drm.h in drm_gem_shmem_helper.c Date: Thu, 18 Jul 2019 18:15:03 +0200 Message-Id: <20190718161507.2047-8-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=5iHBuVq6OVoL5g2SO+kAMAMUgwsbAup21Am8Hz+Y/h8=; b=E9gugjjWV1jLxjI45/LuVHSYg55YE91n6oSkaD3jd6eUsNv0C8K0Ovk+0vwwvx8+YS TVeVeVXEseK36WOlEQy2UyV0qhuvVuaCKZ5csLO4yo2jQav5j7MLXWtBPYRRatgSignP b6gJwXiHGR2s/H3eZtzhw/bRUeunyxT8PKYFacKSnaERK9T2ymCVsdtyVNT6hGHm2aYB Z/D6scPpvrdeZaops4w5/6dMz2egQ1NvbbE99eqmGAPFKqLmzXdm4FvRsF3cIfCgFXGE r2qFAAsP6tqaqWO6zU9IsDJX08BwWCLbg6nvlb8NWDlR0oVoxQ6UFBofC1PtR7Vq8cuW MYyg== 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: David Airlie , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped. Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Cc: Eric Anholt Cc: Thomas Zimmermann Cc: Rob Herring Reviewed-by: Sean Paul --- drivers/gpu/drm/drm_gem_shmem_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index 472ea5d81f82..2f64667ac805 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include From patchwork Thu Jul 18 16:15:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049295 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 B69776C5 for ; Thu, 18 Jul 2019 16:15:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A77D4283B2 for ; Thu, 18 Jul 2019 16:15:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BD3B28607; Thu, 18 Jul 2019 16:15:56 +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 46256283B2 for ; Thu, 18 Jul 2019 16:15:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 51BC06E448; Thu, 18 Jul 2019 16:15:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x144.google.com (mail-lf1-x144.google.com [IPv6:2a00:1450:4864:20::144]) by gabe.freedesktop.org (Postfix) with ESMTPS id EC3066E43F; Thu, 18 Jul 2019 16:15:38 +0000 (UTC) Received: by mail-lf1-x144.google.com with SMTP id c9so19605039lfh.4; Thu, 18 Jul 2019 09:15:38 -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=UMsHXLcffq4kVBGwbAWt4MyCInwVzwfnZOh0ymiPKms=; b=K9HdKg+Jz6s1XXig0bnP1Dru64g9LSaIYctQsVX3EM/Nn9oBFdluXxzcTmz4tCxqjZ 2kw3mT7ttFbixdY/3DfcSTctHwuuTo8C/mf4DubZdkZIsKv1BFbsJfvQ99d997LT0WgY YmzsKmyG+/AyvCct8p1UZQ5pCfI/xOsmx2DCN9ixaewn1Ti6jQ5qrjnHsPjwlKdW/Qdi vOPQdmMje+ffBpSm8khZw+KRihPgw6lliB35+ozq7J/OVtTDu2m7WB0nh3Fp4qqXJQJI GH4LfGYG7bUEGRVEIUxbsn15PMwkAevTSgWvBxW2+zSOpQ1mD5101NkD2P4hxWn6AnZ7 r/hw== X-Gm-Message-State: APjAAAVJSkIxVhx1/cFQU9cy0AtYE5tBsNk39MobjpeR5DygXz587H7N rJW3Vj9x3MM1pToqib2j4tcXu/XDSpx3uw== X-Google-Smtp-Source: APXvYqwKEyV/QURAB6l1p/PHUoaF3m5z/KSDHpTQLYRIw8SpxKMs5YpxVSZB62m5FHY1r6kO+3s/fQ== X-Received: by 2002:ac2:51ab:: with SMTP id f11mr8745888lfk.55.1563466536490; Thu, 18 Jul 2019 09:15:36 -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.35 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:36 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 08/11] drm: direct include of drm.h in drm_prime.c Date: Thu, 18 Jul 2019 18:15:04 +0200 Message-Id: <20190718161507.2047-9-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=UMsHXLcffq4kVBGwbAWt4MyCInwVzwfnZOh0ymiPKms=; b=EonVsOPgtzdjOmu2KTHYu6tyqRmy1CssTiTEJ6xcS0g0zslbXsaHVrlLUZkbSwX10q A4hMc7QAaF7jvVQnW9PJ814v5wKMd7WQ598kCF7ofKnIb592UuQL31JF64vkxFp4A5Zh Ofh46skvrJJDW3WCLReJoAfP0M5vJ4iofO9Mn21638S3ul/OREU9EydPh/5jATMne+JT syIQ3W2U2Ko7AWDujzxl2ZwOYG4ProQeFYyWvZQx71rpyQYHC4y29pDL1en08l8LTgXF eOU9XfPybRSU5bMM2rVzWuxPo185Q+3Gv/RkRW4Aoz2fSy0+/PQUlAYuZnC0SypdAMA6 d9RQ== 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: David Airlie , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped. Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Cc: Christian König Cc: Noralf Trønnes Cc: Chris Wilson Cc: Eric Anholt Reviewed-by: Sean Paul --- drivers/gpu/drm/drm_prime.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 189d980402ad..eca484106cc2 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include From patchwork Thu Jul 18 16:15:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049309 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 E79216C5 for ; Thu, 18 Jul 2019 16:16:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D905E283B2 for ; Thu, 18 Jul 2019 16:16:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC30E28607; Thu, 18 Jul 2019 16:16:03 +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=unavailable 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 8CC4D283B2 for ; Thu, 18 Jul 2019 16:16:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F2C96E44A; Thu, 18 Jul 2019 16:15:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 324A56E43D; Thu, 18 Jul 2019 16:15:40 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id m23so27879253lje.12; Thu, 18 Jul 2019 09:15:40 -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=10tid0SbgLAJHLT6Dj0qLt3vQF4EYXu9iEc1Prbvqgw=; b=pFNxjtcN5ICjR7KH/kUuJ5w7n+uLVi6pwMDJaNWl8MWNcceaxZv2jWOAvlwSHp0SiG SWTU2+5x9otyAJ8jzsC2KfDEZX32hppnTTe3WDuXBfOUG7R2XJDLQrMQFxjUR+z7x7g3 whWk4KUExiqO8QcYI6hmN+xF9/9b0xHgZsdOsZdTz6nvmaCOK3ROv4z92fksocz8T0rV V5MFAdRwq1IpJEM2u1+YNh4Xe/1GmtJaYxuXPyPFSOhtnY5ucNJG1XYYI8/jgipzHT4Y 7waA8yn5et6nniEybE56ciTt9Oh48P33wbs03ik8QA5M4tTRqrxqNWOguuQ59f16mJdB Xq5w== X-Gm-Message-State: APjAAAXy4sF+kmYGdpRabKvE7m8xDbkHdkEWGAl96DPZYovz2/4MQZOt xTw/xJ8Pq/OCMJeCEZsmGGYSWd4YUP3A8Q== X-Google-Smtp-Source: APXvYqyyjjeWlVtkKPLelpLxs1R+JrlmGdwZIcymn6kyrEpcWL3dqIF1rfaZdBXxlK39KQ9CMTcu6g== X-Received: by 2002:a2e:8449:: with SMTP id u9mr7397629ljh.104.1563466537982; Thu, 18 Jul 2019 09:15:37 -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.36 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:37 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 09/11] drm: direct include of drm.h in drm_syncobj.c Date: Thu, 18 Jul 2019 18:15:05 +0200 Message-Id: <20190718161507.2047-10-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=10tid0SbgLAJHLT6Dj0qLt3vQF4EYXu9iEc1Prbvqgw=; b=J4HaiI2YX0j86EbGPmKvLuVB5kkrIiE0JPi96w0PTtQJ+WeWorKnf0wnW+HqJlrJHy qSdv8E+D4s3mKf2JUwxbi4a6P4mdXz9PpqY7vzn+xQPe3zqR6ZiyipTZPLcT2I0k8qF8 rQ3A2HUaq9nSap9dOrWxZnAly25OyGD+GbK4BBXzRKkfl/R23q0KH8smJcOanrChNrxz fKDfqji2nuSzVi1JOvd+scOOlXW9E+OfV9/aelFA12KAejJMYaE623VMeVj/kf76X6UO TGiUb/sVZ3RlJ4IVwUXT2s1y+ls+gxTsIZ8c3UksOk+MVAb1DOZL5ZdI8iKOu3BxyKg1 mTww== 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: David Airlie , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , =?utf-8?q?Christian_K=C3=B6nig?= , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped. Signed-off-by: Sam Ravnborg Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Sean Paul Cc: David Airlie Cc: Daniel Vetter Cc: Lionel Landwerlin Cc: Chunming Zhou Cc: Christian König Reviewed-by: Sean Paul --- drivers/gpu/drm/drm_syncobj.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index a199c8d56b95..75cb4bb7619e 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -53,6 +53,7 @@ #include #include +#include #include #include #include From patchwork Thu Jul 18 16:15:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 11049307 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 D8BF5912 for ; Thu, 18 Jul 2019 16:16:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C929B283B2 for ; Thu, 18 Jul 2019 16:16:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC89B28607; Thu, 18 Jul 2019 16:16:01 +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=unavailable 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 82E8D283B2 for ; Thu, 18 Jul 2019 16:16:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D55386E44B; Thu, 18 Jul 2019 16:15:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id A3B376E440; Thu, 18 Jul 2019 16:15:42 +0000 (UTC) Received: by mail-lj1-x244.google.com with SMTP id v24so27979843ljg.13; Thu, 18 Jul 2019 09:15:42 -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=0RCLW68vHH+vr1sNZN/Hm9G326YwkBfSgwm6bfpQ0fY=; b=PQOvB08uoRsYeAnepkEwZoq3iA+tdGsji1jg48fKq5rXK9C23rHIHxdtD3nV24eHER 9SMluiof/tLeWCAY4lHojmfuLAuqgHqEEQ1XnEQHbeMjNnVRZcvTdQUNbmHpRCJUosFa t8NC3WyJ1+FFUD58cIU9HTNv6V0h7lY9sYTId2NaRsg6yHKIRHAodEGJsjZBS2WfCDFI P8LUeyzmq8h+zdCV30ndOaHPfx9GW104H2JAJT3rYEPIYnQ8XeoHr2kmhcc4MmYk0oLC duH7QGfXnEFWipAnipvAblDYl1hlqmPmZoEuX9efNUyau0N+02VfIVE+UQraZsu8cLzS DnsA== X-Gm-Message-State: APjAAAVvze44D0D5pSdOLhX/zjJUgu5n+nZnUC5VzM8Hib+7JsBCkX32 dvqxI7GsVZj/aQ62Fe3V5+v5hg+VUsEpHw== X-Google-Smtp-Source: APXvYqwjeajtI5jUKH3Q/AaZHjPFQyY8Vv8MP/3SMJ9zaJ0mIrocqxV1piFukjyD79ZkZiBc+JB+tg== X-Received: by 2002:a2e:8744:: with SMTP id q4mr24340285ljj.77.1563466539498; Thu, 18 Jul 2019 09:15:39 -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.38 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 18 Jul 2019 09:15:39 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Intel Graphics Development Subject: [PATCH v1 10/11] drm/mediatek: direct include of drm.h in mtk_drm_gem.c Date: Thu, 18 Jul 2019 18:15:06 +0200 Message-Id: <20190718161507.2047-11-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=0RCLW68vHH+vr1sNZN/Hm9G326YwkBfSgwm6bfpQ0fY=; b=ZnlB+CKTzEj1U0fR68ra6rOHnDCqKGUa57UveKCIjgrSEOZAuPINrHMWsT2/ZZFybt IyBjBCFm6R3c2ZGGk1CvddB3tu41MEKGeE0snLjCqLSorK9hzqtBoH2MYBLivdH1RZ/g vTwdu7tNs9Zda5r86eeZADc4HkP2/ZIw9Kmc16Ok0in8KWvYpWjpy2WJwQuEfJctkatj iXACFaRRnYnl7UAPq+Ho2DSjN9KOimFed8B88Xmz3fXzzt9zVWnMXEa9/kBqQ4td+gki x4r7kWZ72upSPvVJ3uL368I2NwX9M7HepNAzVOxrl2k3cVCDYJ/GYX80rn6ES6tg2Vvk PKsg== 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: David Airlie , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Do not rely on including drm.h from drm_file.h, as the include in drm_file.h will be dropped. Signed-off-by: Sam Ravnborg Cc: CK Hu Cc: Philipp Zabel Cc: Matthias Brugger Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org Reviewed-by: Sean Paul Acked-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_drm_gem.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c index 9434f88c6341..ca672f1d140d 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c @@ -5,6 +5,7 @@ #include +#include #include #include #include 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: 11049303 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 4702C6C5 for ; Thu, 18 Jul 2019 16:16:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3827A283B2 for ; Thu, 18 Jul 2019 16:16:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B8DA28607; Thu, 18 Jul 2019 16:16:00 +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=unavailable 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 DE215283B2 for ; Thu, 18 Jul 2019 16:15:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 112796E444; Thu, 18 Jul 2019 16:15:49 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 Subject: [PATCH v1 11/11] drm: drop uapi dependency from drm_file.h 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== 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: David Airlie , Daniel Vetter , Liviu Dudau , Sam Ravnborg , Maxime Ripard , Thierry Reding , Jani Nikula , linux-mediatek@lists.infradead.org, Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Sean Paul , =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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: