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: 11049305 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 0748C912 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 E9F7D283B2 for ; Thu, 18 Jul 2019 16:16:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD48B28607; 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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5460A283B2 for ; Thu, 18 Jul 2019 16:16:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=680ouvHdn4r1W9l/IXPRyITB1y0Bo9fBVvZQwA1NYzU=; b=BWyioWPOdbBpR+ OByRWFnlOrJgICEQmLxZ2zahKyl6X3mTtj3tr6rmPGT2RL8BryI1V3o69CxvbCax4AJ7kGeYSDkDG SY06zpFr+Do51G0M5gZP9alcJ6v+ilNWgnmWBk/sOXZoDg521rhSDDdlqxRQEmHqJdtrszD2Ho0po WlaTIOMXv3JzcB8roa5HOug5dcXJ41CoxlkYid7H9zg5LsAWCsVb2i0stbpsHJeFKc7KbYpNUYLPw 9BlAcQd676nuSHhM5k4W82kywoUCQoWYH8lHU4Yv4Olezntk/WpvVieJMEMoooAhllC4m1m7XXTKs 5QTH3Xs9l42lE3/xlhYQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho94T-0008DP-Pa; Thu, 18 Jul 2019 16:15:53 +0000 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho943-0007ku-M3; Thu, 18 Jul 2019 16:15:29 +0000 Received: by mail-lj1-x241.google.com with SMTP id y17so3354742ljk.10; Thu, 18 Jul 2019 09:15:27 -0700 (PDT) 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-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=V9NPad4C/zPnT95EVimLYtRbl/HCbvbFPo/RaeEI1JdA5UKeWsw1SRfUGxKApmWBei Mc7tdpwjHsE6UUSpBXR/OrwMZTjYbIcyz7/Ce1HFsIrkMTv8jpcJKoAYCP9Jt6KXkQLB F4qL6VFzDrr7B4xN00DK0kTJr9G2Ai7pTIp3p4LZ2Dby7u1BXDScx1oAarE8TPpyAXCJ XefnzG9ovHGA6cgpgQw51iI4zmc0qYgMlKgjIx7Yres1eiI2VRqWU9GGMllLoapYkgWV XGBHNbmA7R+ZHoSs56XHSwgAXFBzFJfXItTDJY8PSoOdkVKGP5+d/Ykhadj9xhbKVOLR Q3DQ== X-Gm-Message-State: APjAAAWQWFsV1ngDJSwgn2CllQu/qO2qNiR+ZnkFG1LSg3oBQL/0OxhM AzGEKo4dEd0Lf5BfsyUwQPc= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091527_719433_ED37B07D X-CRM114-Status: UNSURE ( 9.82 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , Boris Brezillon , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049313 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 2F8526C5 for ; Thu, 18 Jul 2019 16:16:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ECBD2874B for ; Thu, 18 Jul 2019 16:16:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F36628802; Thu, 18 Jul 2019 16:16:30 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9BE3B2874B for ; Thu, 18 Jul 2019 16:16:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+Lrbcik3ddr0KaEoYNm9DK6aqPHz0xpYVxJMIKeceKc=; b=JeIsLH97F3vDfj UUbYAGIf0R+oj7Q+F949U4YhFqYnxOI53EocK49G5X6GPmXPYxQ9u9WLo0MsHVBgSDF9/CHRNLpbz bSta/6D9S8ggZTCofTWe+3ORKmvSuY3pfx+QyWEQJahKYs76dszW1pHQD1WXznUPY39dljlIpfvuc TWpgKkNM3OmUz3BK6p3JkaXiEaIYCfMVQMg9H7al0qXxSoKKs34hGxy+eH7pGECk9iqGetlHdhRn4 D1szIYQ3XoD7ybasRUj48H066gtd0hx47l/zfp1DjzbS0u4N51u0lq/3p1kbLo9L69+x870RHieG/ wgbZ6fe5ntYxDfK/KvFw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho952-0000dy-T8; Thu, 18 Jul 2019 16:16:29 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho945-0007lK-AJ; Thu, 18 Jul 2019 16:15:30 +0000 Received: by mail-lf1-x141.google.com with SMTP id z15so15343069lfh.13; Thu, 18 Jul 2019 09:15:28 -0700 (PDT) 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-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=XfHhz2oTBVxPjV9m9Zwb4Hog6AEBZohQUIv9JF/7OBUoZZhJ3MkzGI+tIAI+6Ty4oR bUz1Xax8alv0/as2iE85Vrlx3NyYaSU2SCKdPpGMSl2QqhI/9k7hZgSuP1sCPpuX/tAC WK7jwNbbwq65efTipd8SCeRtlaWTOdzLXTFwR06WzcsoFwVu8Ir2BeSpogmKa8MgdSJ8 d88lZGnxetI9fWs1EH+Nkbz3pwg9C7vkTLcMuMom2O5WRMiraSjHfD1DpPl4o8DTz7t2 lNMZNs2O6DFz3PCxOlYpENQJ3j7YhqBDtlqtyabmC1tlcHqgHIRpwmE7D3bSbgQDS3Ns OcEA== X-Gm-Message-State: APjAAAUD6bzU3Ti1uNGBqiXT7WNLsBs2rMTJEB+qZMx14c4KXDglgLEN jA960AoMVI0vgaaUGLUyvjY= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091529_372810_2A4DECA2 X-CRM114-Status: GOOD ( 10.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , Sean Paul , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049317 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 BE22214F6 for ; Thu, 18 Jul 2019 16:16:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD9012874B for ; Thu, 18 Jul 2019 16:16:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A10CF2880A; Thu, 18 Jul 2019 16:16:52 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 427142874B for ; Thu, 18 Jul 2019 16:16:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FsuRmT2J91nb84feZ36zkytJ7ryof5bJop4bSkMuuOU=; b=WLu0YY7xgVGf4v l2sonvrcbqJtXab3ANNqVGe4VfJ4KeeEjGzOktiCKX8aYGDMwGBut82R9wz/ZG8+/v4/61Oaaiv8W D3aSI+P+MMkFcgkIOKN/xzeK2qkky9rfkc+0s2ikN95SDx0YTYQ70jfxDaX8NH8JAFj6nOpFHDR6Z b/R6UG4lV4rBslYVdGEwel1gXe72EZO0YuUJ7pisY2WwF8tBNG5nMWV+NO8bUXySGk/lUffKFkhtb 619KRrZ6LXsujDPcNyl9Lu4/fuxZM/WmoDMTbZXfLONCZGPbylzgUegMf/KrFUyybi3RGH+Rtex62 DlYgnKmwBT6L0BZ1sQYg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho95K-00017S-6D; Thu, 18 Jul 2019 16:16:46 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho947-0007m9-07; Thu, 18 Jul 2019 16:15:32 +0000 Received: by mail-lj1-x244.google.com with SMTP id v18so27900740ljh.6; Thu, 18 Jul 2019 09:15:30 -0700 (PDT) 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-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=N0UIZ9NmSOnNj1Ln72y64CowEbRBKG5UO/lRlu5+uvRE7CXHYGeoolObWPKg7Iv/wS XZr3gDk/crYXKrjs3+WW3QOP1+/vs6M/1zLEQMSJ+NSMuK55YKGg0GK8j5Vqf83hrEB/ qWebC7BgvjvQ3pgULA795XXSrbHZmdMPQt7pB/3Bk5vpnP406DN2Whe1XoryHHNZ19S/ PLDubXFuHxY3YTcnh4/r+0EKDbtW/yYe9SXW8LgOFtW2DfXW1V9ioJu9KKXOEhPBsyYF 7+BkkfPjPGy1oa6VR09bP/Vomrz6JzBbqboXUFbJ0GtIo6VFVnJjFgbGVPEeFZvvIZHk sfAw== X-Gm-Message-State: APjAAAWfLE2H/JrU2oOKykzIbZGM7mPqqb26s2Qu9OoDQNAF8XGPjKMm Zfu7L8IPE9GZu95bfzNpvQY= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091531_278242_F7555417 X-CRM114-Status: UNSURE ( 9.78 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049319 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 33BF21800 for ; Thu, 18 Jul 2019 16:17:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21BC82880A for ; Thu, 18 Jul 2019 16:17:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1547E28814; Thu, 18 Jul 2019 16:17:06 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A56F92880A for ; Thu, 18 Jul 2019 16:17:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=F0fuJgK2X8dwEAQfySyLpi09low5zX6cn9XCJ0Ktb30=; b=M/35I+HSTP6pS6 9Ot+4DtDci4cnoAkX5D7EwRdNfOUq35PVadQeAQezjk5NJebD9dcI3HnskrZfrGI5L2lSU717ectf FJcLS//UZHO4gQPoiDUJ3oIMAvDp8mQUT2eSZN+XFQfx7D9m2ZPmeBbQzSoA11A70FqOYDd7KoH9l lq5KJlh85SHcqpsLeQAn2aKu8acj4xqEthgGV//ztjdNU/fV82HCoVgfl8RAlQpBpWPY8wn5MphnD 54JZyPt0TPMtfmg/GZ2fkN/azPNtqpoP/jFBeiJsqGzcdUJyeSkm0DB1/DH+HNW3JM2I1CxICd0C7 OiZr680oROFhdUs2sEIg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho95c-0001MU-LV; Thu, 18 Jul 2019 16:17:05 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho948-0007og-8V; Thu, 18 Jul 2019 16:15:34 +0000 Received: by mail-lf1-x141.google.com with SMTP id b17so19642962lff.7; Thu, 18 Jul 2019 09:15:32 -0700 (PDT) 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-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=nv+u+QQFKgFAOw7sASK+mCjyuXZYZrPB9mFQ2wE8Vgqf9iBmQemcmdD0Z4QIXwHWRC i95M+cM2HIXwO+auvh/ngBH1D+I9K7BjQj8MsD9W4ITCXFMUkhXeOYgDaJfUPy1XKaSa nc51GY+3Yewz42sYKIMkxENkXVEggtbAM/C5NWFy9pdcyaDinxdcOnIdrE4qZqUdy2Sq W0l9bJzSVA2Fi3001PgguAq0rF2sx8i+brIOQX72BeqFI5C0I0JIsJZ3+nCsj//sHQvy H8TkiYYNMAlKfO4wW/nOJOU/RxdykTueIaLoE6YGmVanpuX4gWN13ArhAo0dt3YLiPCy Mfrw== X-Gm-Message-State: APjAAAV96MK+F/CY4pkZJLW5Ha529h13ldY2wevYnLGBOQq+q50z10Oi wIz3YXOXERaApc81/skJ/iU= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091532_365784_5A62F7A9 X-CRM114-Status: GOOD ( 11.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049321 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 E155F13B1 for ; Thu, 18 Jul 2019 16:17:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF77D2874B for ; Thu, 18 Jul 2019 16:17:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C361728802; Thu, 18 Jul 2019 16:17:27 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5C2732874B for ; Thu, 18 Jul 2019 16:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/M+FC8+U4KxCBiFTUl5FBV3qZaTm0qSmNPI5xYF3Wwc=; b=bgzi4wRHbqCcNp UBrOctdOzBFAJJVAVZraSNMT6iJ4LHFGamqQPZF1Dboz4IN6iIDF2JLvbmxBS6KOcpM/5UnSFAo9/ MbmyvvDFL45Khi1YB+csj/fUI63fpEnLuZqj8TSXnyIsicqNh7h6vPt3PmL3ICYxLNZstADElScHL oD7FHVpNKmzbjeyaInGfwUzzBxTdd885qFp/dOjbNBXZXdkCwCRF3YXYluph46tqW3s0wja/YjgIs zxaR+EN9qpAATnwbfH6BSQKYci1FgPwVQccGNjxpP2rrBnv+fD4CZoQS/CQSTJ5ldnR7V8HC1G8v7 0SoWsST/w4A5nnTRZ+Nw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho95t-0001d1-U0; Thu, 18 Jul 2019 16:17:22 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho949-0007sY-Ut; Thu, 18 Jul 2019 16:15:35 +0000 Received: by mail-lj1-x243.google.com with SMTP id v18so27900877ljh.6; Thu, 18 Jul 2019 09:15:33 -0700 (PDT) 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-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=LqbK/+jZVxnm50TMxZKpqmoBc06FIUJekbIkibPN24RYwGYGQSRp36XhEvV7CFkHXo yBvkoU+PG1eH2NzcQ1wTZPFuqDvfDM+qgDjHoF6LJYIl4s2d6yqcSgEUvrZwH2uOkNOL b32MPYEpzrp+YZLfc/Mt2W0sXrzK/5SJrT9RWAahQGRsTP8lDj5jOf5prgHNRsIWwIRl +d7mR2OeHc+Czs3Sg/y4qHEBdIHZB2vyFkhWdZok/LIA+6ffNvOUVC6k7piiJw3YWkqn B6CL0H22Whf2wmbJlw/K1eaXMVakqTBw8zV7UqcRDJ9WThZ0RQA0uJ1QlQEheItwzBJj 0DCw== X-Gm-Message-State: APjAAAUe+p/ZN9d/MQiSFFKowg4XgTfSIW6hF6CSHeJZ5zdrRV9SIXeL MzRwTjEc4Dpccdu+1pH1fYA= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091534_009385_AF96F885 X-CRM114-Status: GOOD ( 13.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049327 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 0220713B1 for ; Thu, 18 Jul 2019 16:17:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E50222874B for ; Thu, 18 Jul 2019 16:17:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D853528802; Thu, 18 Jul 2019 16:17:44 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 743DC2874B for ; Thu, 18 Jul 2019 16:17:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=L74YPbzvCEV4BkjQKewLK7p0D4tAlRcyjoY9qs35KFg=; b=lghAGibEV3SjLh YvhOmVEqJxcaLvcFLy26/iMOhrj/+wATNgyagBa93fiMPYQmrGaRtigUwTtiwwnmDaR7Dgt9B+Cir VoYKOqxtqUe78i3VlPB9oUMF1Bk+g8ODkMkNJCPllQEbIkclCThKVewfW9eHXobHYMQZMwh5KvzxU B/d73pR46OsioS4TDZHn53W1J9pbvb1q6v8NmD3XDPTGjRKCLi5GRdEu+60eV6pBCu8qcVZiwtaJf 4hU57JVj/Bsj3LNetcTTd8Zn4Fq4gObLQB864katbGfm7eNq5lVMEV2NSH6MHGyg3Obyhc71WSs5X dNwIfsghWLzUadG5mdIw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho96G-00023x-0F; Thu, 18 Jul 2019 16:17:44 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho94B-0007w4-9N; Thu, 18 Jul 2019 16:15:37 +0000 Received: by mail-lj1-x243.google.com with SMTP id r9so27930993ljg.5; Thu, 18 Jul 2019 09:15:35 -0700 (PDT) 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-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=ohPE3+FmL3URULouBf6mq+GDx+CabHGxECZMCpFHzTKhIYueMMkf1q4XWu/xjd1NAw I8XuOkSX9QlOxtbqQnV6pZJbD+2zFNVfLpQi5Ol912sJ/USBufCxDB9T9q9M0tLHteD/ klQxPe14kyYCI8l6B/oTEXoR4PtC7T5bIqF6Yo6Nltbpkjr7QB/spR6M9bcGO61oiUf/ AmWjEyWZUcmWBp5QvmBOczVLgpz95gPQQFFlzIsW2YiYpClJLcnah+YJOMVHD15ZfTrI 4HivIHYf0d8sgKNzioEF10/FhCjZqWll3aCgJeLQW3lQTIReuiir+jQc3JvQ4aUjpNx8 W0ZA== X-Gm-Message-State: APjAAAUI2tVKdCLpmRJy5reaWcnTGgTiC7EoLyEAPy+fV1JLRCBXy1eC rAiCaQDUnGsINA1KG5QwXV4= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091535_384327_A6C7977A X-CRM114-Status: GOOD ( 10.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049331 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 AED4414DB for ; Thu, 18 Jul 2019 16:18:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9C8AF2874B for ; Thu, 18 Jul 2019 16:18:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DEEB28802; Thu, 18 Jul 2019 16:18:16 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 19D662874B for ; Thu, 18 Jul 2019 16:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=d7W953ewlMDLiXGIHs2vBH2Et+M0Yx+6CrUfYkZB64o=; b=IZpV/piD/ouNzt NrgCoL/s0EPiVPzSZtbNpniQCiGWbJezc/PmRm1HBP38ALxFEkdxr5opJ+hVZesy14i52mCcH4VSC nVCHCpyOicB0Ka+eOJlC5NUp0J+BnGuQnXkaktmOpqzG4xfPzTa/c8vFjXim+xMWMRiBBvpcYFpSH jIYW43XrXdsAbqozJR4NpywW+pvGm+xI5Ytbn2avqV0am8wFJo34W0/stIl1sb+3UcsT28yYALC51 d3zytw8ltmnN9s9BSXmKZMg7gk68ff+q0+yBzOl+jlVGy+qv48iBIcYChCIbq0o9g84BXHfzO5HPd 76vkvoxt/6vdfPS5NZCg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho96g-0002Uz-RX; Thu, 18 Jul 2019 16:18:10 +0000 Received: from mail-lj1-x241.google.com ([2a00:1450:4864:20::241]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho94D-00080Z-17; Thu, 18 Jul 2019 16:15:39 +0000 Received: by mail-lj1-x241.google.com with SMTP id v18so27901041ljh.6; Thu, 18 Jul 2019 09:15:36 -0700 (PDT) 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-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=AVZbyI4K7kDG16GqV1trYiRCRWEcFqJPO6CGQWk3w6+EmDjfwZfcbV3mHQYwDVrAO5 1CER9NCKaodhoKdUyDRA2e4RXK4j+4Nm3K2cBfbJqcpJ5dLtbn6kaIt7Nxt8iU3p4wZv N9sKOXc5o7//eYp7PkddJLatgkIsO1WzhWWZAzew6jdWe0c0Ez5FTktQutC1/hpZZ8aH CfWQnMmWy6oLBjgDyW6BvOaikKSqu/9SmVZ1ybI/JQ/Zk4/dJg8aRCXLNDTqX1N6MAuG 5QUEzX0CrAU+7kG390Zcw/XmSjoAAbAZ2bs1GjudWHfz5f1WTr19WZHVQqv5+UfPkcbk daIw== X-Gm-Message-State: APjAAAULIGFh5H4yuCKTzD1kJa7qPZwdSxo+WMdPZQ+vldt1DyoXavkU PeKzdDoDmKzQydv8JZd2Z7A= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091537_306448_3FEB7DAE X-CRM114-Status: GOOD ( 10.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049339 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 E2423912 for ; Thu, 18 Jul 2019 16:18:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D13892874B for ; Thu, 18 Jul 2019 16:18:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C510728802; Thu, 18 Jul 2019 16:18:48 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 691BD287C8 for ; Thu, 18 Jul 2019 16:18:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TAz6YRuNHmW7DcK2l/1lU2dgR4gGn1Oe+F9caXL/xvQ=; b=IPgCdhxh3Dzeiu JbknTL5bhUap4n/j4OVKKRqCWxav4qSO0Ghkf/muhAxRPJV/NfnKX3DIfP2D4pamdSpVmSZnMggZ1 yrnmhvDW6nf0z2ykvOIrkkBzb32Bih864OU6SdOXLFQ7Gg05WB12Y670pHPXB1NZrsEhxKrH74xUu tcrdGAxHmXL2acVV6PqnRkX+XZn8n0OjUM2aH0taEvTVSqBVj95RgwnIoAOTZMY0m/xlxXX4QXNzd aqwlQH40+kogqHp5kzE2f7q58Qrkp9Dludc3Fe0N9Y/3c9fBaK/hUrj1tERHSvT8W7bkHpXGBY4sX bIQY+5LCSe6ZN4YK5Ogg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho97H-0003An-UR; Thu, 18 Jul 2019 16:18:48 +0000 Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho94E-00082A-M0; Thu, 18 Jul 2019 16:15:40 +0000 Received: by mail-lf1-x143.google.com with SMTP id x3so19711865lfc.0; Thu, 18 Jul 2019 09:15:38 -0700 (PDT) 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-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=uNkGUP/fIS+MEAGZnxsUA5yEnWpJtjpLkysSIgxfMtUWOvD5p/alqWlOQw8j0t/j7V Z/qwsln4qRowAmV5gEBgNY0jEb4n1gWetPK0cA5iKdOIJ6wmwc55oLnx/GLIhvGOekjh loa4r44IqSoNGjTV9JvP2bnpFSWNAV64seZSgm7yduGxDLS1hvt1b4a1noO018p1fprH sGFxbuwCWT/AxHfde6KnfzdgonETE6fzNvAnB4nSr3eoKJM7pfpfwXLdfJ7UeBzs6KLD AMdg3akYYg8/ctg8MPNLwaoiTB4A4q3mW/Y5b25uMDSRUPA7btaFqxA9u4EX07DeKbBj fDFw== X-Gm-Message-State: APjAAAUcrDdIAhXcBFci935e8YurvcaTCv/svEBJfDMpIJ7vfmSbJgxL 7REZdPrs0iNVRW3Lmd4uNTI= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091538_819333_9EE92645 X-CRM114-Status: GOOD ( 10.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049337 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 DFDB814F6 for ; Thu, 18 Jul 2019 16:18:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF8E02874B for ; Thu, 18 Jul 2019 16:18:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2B1028802; Thu, 18 Jul 2019 16:18:31 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 416F1287C8 for ; Thu, 18 Jul 2019 16:18:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uvefHiZllyUoZ9XR8rwIgVpQwfYFeqYGtT8fKZ4AF9M=; b=GE5LdULwQa+jYe 6s/to3jLVjGcVnNLSCkIOlsMo0jbP9T7qF1PxxsTR6pTn5PrtO5J5T9oP0qx1xc2ZJ0Vq/IhkDUBR XEUpKnHpaWVbNPm+a/xJ5ec3RY9hqJ+upgAIdeu3hHZa3nA0tWgcVsPPoQUQC/FPQeV4P79QXcjIF yN93HdUb/c2S6tBjs3n/t10ZnYi7ilccYVNZNEgAvejdqpij79uS/k4FXMDTzK/ypPyyM73nBL7ix XJmf/xeHWb/Qr93DNEpsgXFN6MbxWGrwAcyRbX6P479lkiLM0PnT068bleAx0GatC+PX6Tv+PMWif vMBvogSdDACUIj4lglDw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho970-0002ua-3v; Thu, 18 Jul 2019 16:18:30 +0000 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho94F-00083L-Tf; Thu, 18 Jul 2019 16:15:41 +0000 Received: by mail-lj1-x244.google.com with SMTP id h10so27963118ljg.0; Thu, 18 Jul 2019 09:15:39 -0700 (PDT) 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-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=N5fw7EllSypXiOJpSyqYPguNGUrGYfA6kjnzWLah0+Qmg6TAb28LpIn3PmWvypzxiw kT89yBUAfS49Kg3YqmeXXaImVR8Hu04ruii4fozyMGeIhhqlOXTb/AK9hdFfCFwMjVtB 2xWwFjbg5vsh6gHgKG04MY5iB3unv/Xkb9LFPNWoQB/ZP6nU1WsjIgCBzITTiH4GwSPN KgEVkfVWV/4qOAC43qL5+oZnH/OltxsDZ7K3Rm1dK8gWzdEL+/UntP3R86OYlL/WSDdI SysbogyrKEdi2HeEs0GDrxs+7e2wCfRFdjqwhdeEU+gi43mdBvkcNjlpG2KjgTiCZMFg PypA== X-Gm-Message-State: APjAAAU4EyHs3qme9clc2ECqrdCs0wtR7kfTZ/gKr6S1WmbxKcFtIaz/ 62FBtCMvEQXHNNscr7BdY8Y= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091540_035364_C8AD6BCB X-CRM114-Status: GOOD ( 10.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , =?utf-8?q?Christian_K=C3=B6nig?= , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049343 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 411DE14DB for ; Thu, 18 Jul 2019 16:19:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D28A2874B for ; Thu, 18 Jul 2019 16:19:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FE8428802; Thu, 18 Jul 2019 16:19:14 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 679992874B for ; Thu, 18 Jul 2019 16:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=D0ojCSC8sr6EW54zL5U6WCxUgN9Jogfdu4YtsrT/+jM=; b=geKDlxBqXftueY zikLPyYrF8XNYY1v2IJgk4CDsJITskJNeQoBHk/hL0uONrVTDzNFjq1tbM1d6WeHXxWjfj6M/JlI4 RLhHQGfHoKpM8wpAnNqv9TC1i/0ZJCXCbFyqC309hzCSpOfHQR9TqP063VcEmmtOEyevzYl3AOVon xKw0WRrQvGekbNavTS9Hoy8ixJbdjJrtz8pIY5FrUuXftucnhv8FPzlS5GxOJls3fnIy++YpoboUF dl1kgIHQbmEOxCP7Sx1GRPXU2tDv91AETZ+KfTZA/P29AfNgIg2pehFfHF2M5qWqJrtQDEsNWxOeX Nw4s0neUqNXd4Kd9OjJA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho97b-0003bx-Ke; Thu, 18 Jul 2019 16:19:07 +0000 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho94H-00084D-Jf; Thu, 18 Jul 2019 16:15:43 +0000 Received: by mail-lj1-x243.google.com with SMTP id h10so27963191ljg.0; Thu, 18 Jul 2019 09:15:41 -0700 (PDT) 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-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=M5k9uuhpyZRhXlLiOIbyYOcT56qWBweFAHEOZx834cWkGZWGNLwn0yj+NgTuu7ENcd iewS3S4+k5MTQQrb0CajLUwALEV1ty63jUZZ9iCpGDCDfYGKEtdgyB05/l4YHvzdtqlf Jr3aI6dvr8ZV5gZpn212gqns6psMpoqCgUSiJxYgXot6MR4K8uPVlTFL1SLLWWfwwWx4 0iYifzlZ+Tiw5DmZhR5UQBduIAjucB2+8mlUZktFQRJBJKIHXaJIsMa3a1s/dmTBN1nV R085JiXLd2aaaC8zAKTKdEQ/Ag2WEVTyWZdc+jRsife+Qb3MLuKYkUY5Wlz2Kfgx/cP+ DLzw== X-Gm-Message-State: APjAAAV4ojAdNhtziY212yf6csyO9qg/6hABluF86jRVPfcLYnKF1FDX eH6CHtwq5cxC4pw/VW2wYiI= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091541_766675_0334D5A3 X-CRM114-Status: GOOD ( 10.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: 11049355 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 434D014DB for ; Thu, 18 Jul 2019 16:19:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30DB12874B for ; Thu, 18 Jul 2019 16:19:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24A0C28802; Thu, 18 Jul 2019 16:19:39 +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,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B85332874B for ; Thu, 18 Jul 2019 16:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V6IIlNz9YEahiGEZMRaL+SalaRzrDISuk3NZ14lpxTM=; b=J/FegugoYgogJH jc7PT3TQcT+lbSRLkavsU9XbkunT4Q/6TjhfVtOeaUjgwrHSaofIUaiCSpYF7Bsj/XwAhca9517z1 VYVZonnDKKeXhXaC5J2obNRr6UbwKW7NznH8Zf0ReJs23j6IGBV9dzLsJ5y06Uinoxr0XWgly9LRr e0MVA/NiQqr+q9jKTFoRwguLisAFxYd3maJi3ol+WC+uaDPElPouP5T97Ixba0T+gSStuwV7bcpbw bljouJEjKKWpfxG7R/GawsE7gcHLTAZEADMmkBinxgJGukddg/lq3D43x8VIpfdDyQF6FNdoZewgY i9ywS/qqSdSMiw/H3YXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1ho986-00040x-0j; Thu, 18 Jul 2019 16:19:38 +0000 Received: from mail-lf1-x143.google.com ([2a00:1450:4864:20::143]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1ho94I-00085X-SZ; Thu, 18 Jul 2019 16:15:45 +0000 Received: by mail-lf1-x143.google.com with SMTP id z15so15343619lfh.13; Thu, 18 Jul 2019 09:15:42 -0700 (PDT) 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-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=nEnNEwl8JIvN1+Di8204SRXLHR47xydt6uuTi5uJl+mhaPLLgCg5j1UQU5a2Ho3fqX DkE9b++FIYbNYjNwWs5fS4t43PMKQ2EeXZmq0VSLzTJkt6q6OVMxf//EzLyJuyNEsSyc cn+jz3wPa5th/umk5yKVxqTXdSjXLKdQ28MOVuex/GI2vDKJWbfDlR5P6k1fB9oa1Jyq tiN3e6cpxCWqxX0KvYoDZpZu3iEPi4Gw16z7zOOAa0TgiIPHnHJnG0ZEzVzhq+XOG2sn PA4VkPkIzTcraN3gJjXEt045re7Bb4/QsfCPh/9uWxO04xmx37KFbtyN4whmp8A3aYS3 F9xQ== X-Gm-Message-State: APjAAAWGZpJtC5CwpcCAMbwx1eRu6YXHtMdJHlrBGqr1rSeWKAhzSJ+1 BrLOdeZSkb6nNGeuMpNZ4PE= 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190718_091543_219115_8F9EF1CF X-CRM114-Status: GOOD ( 11.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Daniel Vetter , Liviu Dudau , Lionel Landwerlin , Chris Wilson , Eric Anholt , Sam Ravnborg , Rob Herring , Maxime Ripard , CK Hu , Thierry Reding , Daniel Vetter , Chunming Zhou , Jani Nikula , Maarten Lankhorst , linux-mediatek@lists.infradead.org, Stefan Agner , Matthias Brugger , Sean Paul , linux-arm-kernel@lists.infradead.org, Boris Brezillon , Thomas Zimmermann , Rob Clark , =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Philipp Zabel , Sean Paul , =?utf-8?q?Christian_K=C3=B6nig?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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: