From patchwork Fri May 25 15:50:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136952 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3758009lji; Fri, 25 May 2018 08:51:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZomQ6jwN+4H0JKRp6g5pIXShN9JJdEHTlly04b95EpLj2Je1kAl1TccQjyYVpHzkuQAYlqw X-Received: by 2002:a17:902:8602:: with SMTP id f2-v6mr3151400plo.5.1527263463342; Fri, 25 May 2018 08:51:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527263463; cv=none; d=google.com; s=arc-20160816; b=el8rtuUetElE+cLnj0mMEU6jgAWgDyRZeXlAjm/YMFdsBH0DQr7axG7AK1ltn/aFpn eGX/IafrtFBAATtDULo/Bw0rB+ej+6fhPtJPb7gU5+h+/wtiMS6eoJaXcscz3JCBTP0g q0ePQzFektRIgj/8yRSC/XKO2KvS8Aba5nbhiXgrf1i+37oqcQrTViburUE1R1O7PeOC KIZYiXRqdLenMyQDVCu9+UYCg1VQMkXObCmi3bQTVDVzTuBH2LijZnjNSPrnP7zhvL0u igw0OP0LBIMuP1AtLp9Vu8jes1iqxSdmQyvp0B5n9ctP2HmQlqaG0jFi1bmpE2LPWupz 2n5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=PY6vLXVYxJdvXYxr72JQchrMG+VZLEIqUoFYX916jWc=; b=x5uCYY2Teqz0g8mkVUyZCnBoRhX+gmYkwQv4hI9g4vAslYjv4O0NKEVUL9hZB0hV4G Zs96oNZqm7wf2eiZP/1cuVyGzMvxxgB6gaxZgQIw2oOqIl9mvGZpwd5qwzkrerdSgvGe eIir7/WSLt6U4YzRv6Xk49MHZGR6QNXfIf6uGgmqR9Wo/bPI5vRWloxWqFH6DUSLgmgz +wvjzDUtn/Het72n4d5PItmyiNZuRJfBxoRASlvHe/+ogk/YI7hNMK/VIb2oMGMmokJ5 VcSvu9waCOAQ13wsIftCN047zh3WrEHUyoT+4yQz/+kuhJ7gl41YorPQcQYh0MCncFDw 81mA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s129-v6si24360352pfc.33.2018.05.25.08.51.02; Fri, 25 May 2018 08:51:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966694AbeEYPvA (ORCPT + 30 others); Fri, 25 May 2018 11:51:00 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:45901 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965666AbeEYPu7 (ORCPT ); Fri, 25 May 2018 11:50:59 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0LZfCu-1g3FmX01NM-00lRZa; Fri, 25 May 2018 17:50:33 +0200 From: Arnd Bergmann To: Maxime Ripard , David Airlie , Chen-Yu Tsai Cc: Arnd Bergmann , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/8] drm/sun4i: mark PM functions as __maybe_unused Date: Fri, 25 May 2018 17:50:08 +0200 Message-Id: <20180525155030.3667352-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:C/yJg6rPGXVjaNrv1fHhRuKBVYGdzfq1JK3YSQ2ZG+cGbZyTPs5 vlmW8dyp6S5xpAU+GUJdaaXkpx/IW6hE7J7JWqJnhHhzqi+TUmPvwbSuhvsYZJJ5CWkNvP7 QlR5SkT4YMx21P2Yfh3rO/1HpUxVjpjol3hXP4Mm6VmIp3+on0S4FX17TXVqmjZCGMItWGM stdvVRqNIlCxXZswkjoAg== X-UI-Out-Filterresults: notjunk:1; V01:K0:ICEUGuBysa0=:/RdXe88a1HgZl263Agmy5Z 0cXfG3cm1jTHR1YFx1urayjBwQkg3oAt6ZvNJqaMIlbx2pGIEjL/q1Xv320Xw7irS0xlfPrpx bgTj1ZffVtZzHlJuw2RDEaOAKeAIkivyRHNMvxkIESLSAChrvJzKTqtP5AfRJQORXmzLsJ7p+ By55q5S+kgz74c17SV+x9viTkZp8j6OjAZ2SUs0U60af0tnnqZlHamu8+1zUQTkOqqlQxanZO wDLcvC25ioOvOzg84wkXtt6i3VW2DlIytC37swbgMmTL5hAZD6QPLHavqpYLZcZbSw1IussuR 1Zm9nQu0i3jA+k8BlJd8xWt6nTAkejuQVXwwXiJBys6NiEi25aYKfbtlqK6ECUpDN79pgidix ue0RlZA6UISdH8MstQA0RsZnD7egA07LQeozUSv/TNsRsZT9ugHZX0X/2E6DSofL978WrCfZI r/OFKqAQwLIrT95iEpR/a5TkFF2lw2inpe61fQpbFlnUKK7e76XibMVF/jmOVjDWeI8McOJvP eR8GPtDsUNNKGcMS4MGvNSiDdI151WJer0qY+GZIovRHoENkB5XQTmGpF5XAkAnR1QLPMASUH LoqzWM14n4rphxSD+4lzY7ddEWxZU0zKrNyQ+hXwZ9A3bgRQydq33XVS4C2t+rChdDu2VuPKV C8jAPW0gkAlAx2sWkJyXtaQgQ5OkkF8biBEIjR3kB6w0F3uPURACiXKAatrfltVk3fZA= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Disabling CONFIG_PM produces a compile time warning when these functions are not referenced: drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c:1072:12: error: 'sun6i_dsi_runtime_suspend' defined but not used [-Werror=unused-function] static int sun6i_dsi_runtime_suspend(struct device *dev) ^~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c:1043:12: error: 'sun6i_dsi_runtime_resume' defined but not used [-Werror=unused-function] static int sun6i_dsi_runtime_resume(struct device *dev) ^~~~~~~~~~~~~~~~~~~~~~~~ Fixes: 133add5b5ad4 ("drm/sun4i: Add Allwinner A31 MIPI-DSI controller support") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c index bfbf761f0c1d..d4e7d16a2514 100644 --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c @@ -1040,7 +1040,7 @@ static int sun6i_dsi_remove(struct platform_device *pdev) return 0; } -static int sun6i_dsi_runtime_resume(struct device *dev) +static int __maybe_unused sun6i_dsi_runtime_resume(struct device *dev) { struct sun6i_dsi *dsi = dev_get_drvdata(dev); @@ -1069,7 +1069,7 @@ static int sun6i_dsi_runtime_resume(struct device *dev) return 0; } -static int sun6i_dsi_runtime_suspend(struct device *dev) +static int __maybe_unused sun6i_dsi_runtime_suspend(struct device *dev) { struct sun6i_dsi *dsi = dev_get_drvdata(dev); From patchwork Fri May 25 15:50:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136953 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3758079lji; Fri, 25 May 2018 08:51:07 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpKnBdvZRN60Z+GwCgo/e8r6thzWsi209n88sTNhfDpm4S3sU3gYj/V0mgIg0bjneEq6Ho7 X-Received: by 2002:a17:902:4203:: with SMTP id g3-v6mr3223327pld.315.1527263467358; Fri, 25 May 2018 08:51:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527263467; cv=none; d=google.com; s=arc-20160816; b=yGs1KBSvqYIkNEXQyojnD3/10cLdIGjzyh1wX0+6GAlUzWwFz2w9gxMcVgn8e3oL0G 9b03kmtJtxDEbZrySAouhn7+9PiJeiOjjqWDEcCurNQWDSgKU3oA+4JElqbboCD1nfn8 gZ3upmL/plGBNNQtt5vVegLqqH2BH+ufZsuX8fqbQBN+Wgq5yDNdwz8nhN7K0GVi6xCg ZEXoBNmqiu73f97cez4Sa7QLoSEtKuYE1uGCWY5UTQoWbfVRcGhCEHeBkVHQEWc4Ql2N G+BMK17yddFMUyunSS5lAE7rLTIQrnEWsSoVs+7kpODwth4EYdpMdvgd2ZsBD+Fh+3Cv fBSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=0MynI0YbYtNDujLXkkxXUlAONz+64Zif0GTPLUR7rs4=; b=FkFzNUf4Bs08BbhFxgUdbLtQ+YBmu20K5z+5JzHgCO2zJkWB6NcDdQKzBhyw9a6A50 NBHBne9UHUW3pbjLVssWXh4Q2MHJrL3WjDHSuC5uuzdMFXtMn5LfQS6UA9uIrnaoDMua aMlHks0Qf7raiEQqofJMBbxy8d9sDU5tdzSPmUya8nyFBaF2nTGSP/CaYFPCFZk5tn4M RlHAWAzl4KO434Ew/2zhAObi0eS9PWj7M47uYHEI63be7qfROjRYbFLiR3IgCVRmjc4Q hK53zUYiJQozF/ApPETohsOA9YddQvInbLWU+UB6fuRBiJBjbq6c+tQLee09MjJBB1UP X2WA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u15-v6si24921044pfk.82.2018.05.25.08.51.07; Fri, 25 May 2018 08:51:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966807AbeEYPvE (ORCPT + 30 others); Fri, 25 May 2018 11:51:04 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:57579 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965666AbeEYPvC (ORCPT ); Fri, 25 May 2018 11:51:02 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0LmLB4-1fw7yR1oqg-00ZvWm; Fri, 25 May 2018 17:50:53 +0200 From: Arnd Bergmann To: Oded Gabbay , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , "David (ChunMing) Zhou" , David Airlie Cc: Arnd Bergmann , Felix Kuehling , Andres Rodriguez , Kent Russell , Harish Kasiviswanathan , Colin Ian King , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/8] drm/amdgpu: fix 32-bit build warning Date: Fri, 25 May 2018 17:50:09 +0200 Message-Id: <20180525155030.3667352-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525155030.3667352-1-arnd@arndb.de> References: <20180525155030.3667352-1-arnd@arndb.de> X-Provags-ID: V03:K1:tLTWrYXK1XmFzZLwisy/MzqQOimKFZ/gBKSKdg92DpoZEKoM3d6 taKR1iy1GFRGryEPMWpUBJeb65etS2e2S5yQ7BkZTsOj8GUYkNfPVlaoMmngou1h3FM9e3X Vug1UAWFHUD8h//gmV9DvaI5zH6u4Mc4TNcSVbicSNsntGJKNzWStqD9Q5pqfJzWF4cB4u2 jPcLUOMUphxjvEKM0ACjw== X-UI-Out-Filterresults: notjunk:1; V01:K0:uC9nKQETneQ=:yV19KX2xB6NE4AtlRCzm8g B4vAN/r11tARlk2OlpuPKLyQgIsLQb2AasLCDmVmAM84vZ7GIy8uliv+tB2npf/YSOF3LFirf 3J/g6VXdIQyBaF4TLnzJxhIJJp7ekGVqheOKeCyTFa6d1KTogNAsCxxZSUyL/u7psjOkjm6yI qfAXZYzNAExlyTxbG5YG6nR/wTqKbSgAabtDM3mZcsmRzia9UlCcy+PEwq6AWKYEX6l+KgXNT YJcXvK6/Lk7OBPWcQ3RiTpgEnIhpuvS8f2JpAoNGSbuPFmGa9UMYfd8Nu0B5xS2u9lMcncRxT VogqBMjU05BTdVS2tqyxvb/W/+GPbcS5vZ44p+g7I4nO6ns6lBEZbYVX5fo9Naj94cVcRR/QL Bf3ob/z32LeNfR4DkexaEgP40yf7ECNMgHyvQnStkX199h6BjV+04L9aU+JubwSIZQ6Ru+rIl EKJx21LW0DXwqEdPbVj3vzDaVV9LPWHaA/pFN9TS4Mf1VjK/hN9mJp99MVKQCVovf8air9DNw 1ivB8qG2wca+UpAEsqAVxABCWM4OaxirS0y174kLDC/h485ZY2Rd4DTFa6aV2KIHEFDFMbZfQ YvySz8pcmyxRIKLr/sA+O7Ne/7I5RG8f4CbC65v8w2MHS0w5UFS0eitZJTP6nMdIZObps0QT0 PFWM57j/3n3SEUXyM6kv/eES4Le+uTBy1YzkWWBqI29Gg11v34CXXiltwADRnbuiK+V8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Casting a pointer to a 64-bit type causes a warning on 32-bit targets: drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c:473:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] lower_32_bits((uint64_t)wptr)); ^ drivers/gpu/drm/amd/amdgpu/amdgpu.h:1701:53: note: in definition of macro 'WREG32' #define WREG32(reg, v) amdgpu_mm_wreg(adev, (reg), (v), 0) ^ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c:473:10: note: in expansion of macro 'lower_32_bits' lower_32_bits((uint64_t)wptr)); ^~~~~~~~~~~~~ The correct method is to cast to 'uintptr_t'. Fixes: d5a114a6c5f7 ("drm/amdgpu: Add GFXv9 kfd2kgd interface functions") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 Reviewed-by: Oded Gabbay diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c index 8f37991df61b..f0c0d3953f69 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c @@ -470,9 +470,9 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_HQD_PQ_WPTR_HI), upper_32_bits(guessed_wptr)); WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_HQD_PQ_WPTR_POLL_ADDR), - lower_32_bits((uint64_t)wptr)); + lower_32_bits((uintptr_t)wptr)); WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_HQD_PQ_WPTR_POLL_ADDR_HI), - upper_32_bits((uint64_t)wptr)); + upper_32_bits((uintptr_t)wptr)); WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_PQ_WPTR_POLL_CNTL1), get_queue_mask(adev, pipe_id, queue_id)); } From patchwork Fri May 25 15:50:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136954 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3758728lji; Fri, 25 May 2018 08:51:42 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpJd4HiOSITn+N+JV6wglg5MNbXQ8cvA1kyw1ZNUMgh4L8cuCn2wAbUXdB0/T2pqLyt9S7P X-Received: by 2002:a17:902:7883:: with SMTP id q3-v6mr3202587pll.71.1527263502501; Fri, 25 May 2018 08:51:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527263502; cv=none; d=google.com; s=arc-20160816; b=ISjaabbjSmHUXBVeoTEWxvxcU3MzEDJbK4W7n0QynWS7nG4yk7UXbPk/6do3hIeMnU ecM+Fuje0Li0Xx8dDvgeYjZbRRDj+SCn8BtODSSz9JjOvSqnlSMNuwQgZRRCji7IVqJ7 EZ19HqroeiSTTGllVu0sAiedhBxlJj9UE153mAuRy5TBkgcjfYH/frplZQJ7QHaxXh68 P9i4QMgqsub4sInkWH3Qc2OFkhm4mBHHns6Omu4vFmAEi803JURBmMeICX1fNbvzf+/n eChev8xTy3g3BW03LRu1iwv8pHZzTgd/oGZQv24WdBziDgwS07nHdUdXNn9DK2bUciQR s5yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=NG+33xHtW5FWb+DYG8hT35iBPrdq+McC+LHfhVHADNo=; b=EB6jDTxLsK+60H7cqljiN4FOVImDjmYycO5nsphqTXK9jhx9JzlqIhXJSPMt8qh62y 2P/WQRKajyaZg/6LR/qGErDtNbyC0B3RpE1p78B/OwI4eMnX9ZpYViBK63xGHwoaPS85 ykpxKKDW78dBxS8GyieaVNHU+I36UuIRsmeWKP+PDkBvjCNPm+V+IQWMEFTpUhkSB4XG Omd58sVl/4SUexNmBWD5kQkOt8VOQxh/nYSUW5RxQmDlTfsitWv0SLaj8kFCb1x120T9 8hohs0dngf/gTtAZGDm0jLqb6vy8qHNY6EVp0wNQmeWxm/vyo/it0Qgg/nnsoHUunbPv GbaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k9-v6si19068400pgo.340.2018.05.25.08.51.42; Fri, 25 May 2018 08:51:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966958AbeEYPvk (ORCPT + 30 others); Fri, 25 May 2018 11:51:40 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:42297 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965666AbeEYPvj (ORCPT ); Fri, 25 May 2018 11:51:39 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0LvAri-1gMYtu12iw-010MMW; Fri, 25 May 2018 17:51:28 +0200 From: Arnd Bergmann To: Oleksandr Andrushchenko , David Airlie Cc: Arnd Bergmann , Daniel Vetter , Boris Ostrovsky , Dan Carpenter , dri-devel@lists.freedesktop.org, xen-devel@lists.xen.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/8] drm/xen-front: fix 32-bit build warning Date: Fri, 25 May 2018 17:50:10 +0200 Message-Id: <20180525155030.3667352-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525155030.3667352-1-arnd@arndb.de> References: <20180525155030.3667352-1-arnd@arndb.de> X-Provags-ID: V03:K1:ddItXKM++H9uoM10jODuwDQmtzeUlfdXwaNe+h8Gc45QuVb0Vjv vj8p5lfr9ZUYWoZi5rIzYdO+S0EwAiSLJrbHSBGntelCdaI5GcOO0T0tpSr6xD2IrVD4VIf +G4B4Qno+W4OMy0OFaP3oRbWLgVciurqY9PPvb/pxJrM6Z/ZuRYHOz8BOtYlg/XU/vtBj3S RzNFOSMsWuLZMQZ8xo/5Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:GVuNtDLgXEs=:MZa0Sr4rSDFUigfEOJjDRW 5b88AJTYzyeyOwri29jS2qCSg7gjHwCPLbtrWEe9lXm0+8NIDBO0xmUkLijeBKOg9rRc/nTXR JiFteRLzTVSeJiwqMmLsK8hOMu7JLfJ2vYrEkKf0VqB19cFZ7qvZBrR9vENfDHLb57aeLB+4x f2wMChkD3lOAuSk3XOmx05Qh18YgV0cc2qf6Gxcy2tiajYU+j0cgrdoUov11JaizoyqlkvJz5 l+5jENN11PP8lpE9w9g8L4U8HPCS5qN3CIr57T5lxVB1Sbkx9mIpP3emCryhgXn+eJ3BzzdTe v7uGxjTBViRvJ7RoO/I+vImMjBICg98bmNv+uBG6fEkwWu4E9LvCma8e5povV5uQtNrvxoqbR w5hcvZ74dIGQbR4vFraBcVnrmeXly5pfwSvH9k25pGl426+POoX2fIv4kzsdQeE3NukdyBazE WPeFHxpFliRJ4qniixeyNuPhiX+sIWT9pRdnARpZ66ZURSDY3Gten0RV13YiXUezHkcGGt+r+ eRy7Bfch9vinQGszqPOYH2KoNgEWfbq32+7kwdFTrpH27WMeuxk3O9B94VTrNaBy66AgSoNvZ E9fL+LakVFjl6xnC3FfdJpQKjsv485d4HoztJe3GTBGOpblfmQji0N900k/yj1AEIEgh0Mfwo 0kLlzklYn52RqwsHa0XmEDOtOc1Y+H7PyIH98yP3Yb4nUTozdftlxMDvEMI/OF0YKdUs= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In 32-bit kernel builds, we cannot cast between a pointer and a 64-bit type: In file included from drivers/gpu/drm/xen/xen_drm_front_cfg.c:18: drivers/gpu/drm/xen/xen_drm_front.h: In function 'xen_drm_front_fb_to_cookie': drivers/gpu/drm/xen/xen_drm_front.h:129:9: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] return (u64)fb; drivers/gpu/drm/xen/xen_drm_front.h: In function 'xen_drm_front_dbuf_to_cookie': drivers/gpu/drm/xen/xen_drm_front.h:134:9: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] return (u64)gem_obj; drivers/gpu/drm/xen/xen_drm_front_shbuf.c: In function 'backend_unmap': drivers/gpu/drm/xen/xen_drm_front_shbuf.c:125:4: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] ((phys_addr_t)pfn_to_kaddr(page_to_xen_pfn(page))) Using uintptr_t instead probably does what we want here, although it's not clear to me why we assign a virtual address pointer to a phys_addr_t in backend_unmap(). Fixes: c575b7eeb89f ("drm/xen-front: Add support for Xen PV display frontend") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/xen/xen_drm_front.h | 4 ++-- drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/gpu/drm/xen/xen_drm_front.h b/drivers/gpu/drm/xen/xen_drm_front.h index 2c2479b571ae..5693b4a4b02b 100644 --- a/drivers/gpu/drm/xen/xen_drm_front.h +++ b/drivers/gpu/drm/xen/xen_drm_front.h @@ -126,12 +126,12 @@ struct xen_drm_front_drm_info { static inline u64 xen_drm_front_fb_to_cookie(struct drm_framebuffer *fb) { - return (u64)fb; + return (uintptr_t)fb; } static inline u64 xen_drm_front_dbuf_to_cookie(struct drm_gem_object *gem_obj) { - return (u64)gem_obj; + return (uintptr_t)gem_obj; } int xen_drm_front_mode_set(struct xen_drm_front_drm_pipeline *pipeline, diff --git a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c index 8099cb343ae3..d333b67cc1a0 100644 --- a/drivers/gpu/drm/xen/xen_drm_front_shbuf.c +++ b/drivers/gpu/drm/xen/xen_drm_front_shbuf.c @@ -122,7 +122,7 @@ static void guest_calc_num_grefs(struct xen_drm_front_shbuf *buf) } #define xen_page_to_vaddr(page) \ - ((phys_addr_t)pfn_to_kaddr(page_to_xen_pfn(page))) + ((uintptr_t)pfn_to_kaddr(page_to_xen_pfn(page))) static int backend_unmap(struct xen_drm_front_shbuf *buf) { From patchwork Fri May 25 15:50:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136955 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3758909lji; Fri, 25 May 2018 08:51:52 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrGv52LiOG98oBEe0HH7Fq1LB31yHl9TB6TMti+DVO1ULoeedNUGAjnikJ7qrz4rRQ2P8sF X-Received: by 2002:a63:b00f:: with SMTP id h15-v6mr2418406pgf.90.1527263512674; Fri, 25 May 2018 08:51:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527263512; cv=none; d=google.com; s=arc-20160816; b=QpOjQh3pNPyqcp/m9n3BhDpkycfo4zYSLFOwt3Rsi8qeNJ2aSi0Sy/My+NEZPbRTYl BV/M4Y+1SL0iSrkqCGdUZqIXiMD3bR6G7OOQjDHXrRznrN00lh+gIJeWGZ2MRwA9+Ear Q0sX7obAs8ByzRFsygwZskf3eyJamYfhou+/P6utr+0u7578djhYjAi0vf5qADfac33/ TBP6rfY/OG3zNKz+bs+E0YMuIgZCjvuTB6cUMZFxFJ+/h1oItJsMXS3UtYq7sikZhrFs OEiQsg2l2jNOdFWCzqthCIfO/UeHiNs+PJCwNxtBJp1KoYB5y/s0xg70XiBScl/hoJmK 4I/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=X5m0DiWQt9bqTYFu6u7Efj31wbIgEzBH2ShHuyBnxRw=; b=weWT9k6GrAOsQ5fbo4WtUECbFlIHW6eOdoJPBI6M/o7RrxHT7f7VopMYKBCEl19iy2 nxRqwARqsMFGWCggr5um9h64ghCChZa1IMr3Soxiqam+Lw5oElavZyQPZkz9CRDLFpIQ vgLIGa1GyZuEKcAwpTJ4X46hmos7BghwAFhiva5dyQpfuDivVixYE7t6/4yZ/3pRoGoT A9vmPCAEmPgNdtvhR+YuEO7wLW2wdKLqmlWs9lh6YZ81zKVUImhs3vWYQZxsP5m5vMrZ RSuiAUJs2cmMbLkR+pj0lrWQyOhGO3I6OqMwntSWO8AGWiLbHj4UmkvjuOyFB5CrdRGB vSFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bf3-v6si24544033plb.105.2018.05.25.08.51.52; Fri, 25 May 2018 08:51:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967002AbeEYPvt (ORCPT + 30 others); Fri, 25 May 2018 11:51:49 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:59035 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966527AbeEYPvr (ORCPT ); Fri, 25 May 2018 11:51:47 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MZDyO-1fcp0q3XG0-00L0jq; Fri, 25 May 2018 17:51:41 +0200 From: Arnd Bergmann To: Laurent Pinchart , David Airlie Cc: Arnd Bergmann , Kieran Bingham , Mauro Carvalho Chehab , Liviu Dudau , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] drm/rcar-du: fix merge conflict for state->alpha Date: Fri, 25 May 2018 17:50:11 +0200 Message-Id: <20180525155030.3667352-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525155030.3667352-1-arnd@arndb.de> References: <20180525155030.3667352-1-arnd@arndb.de> X-Provags-ID: V03:K1:qfk7ta7aMUU5lUiyEuDc5IWKERsiJdt/aUVbBE5HdjYR4gX6A6l UMJVYSlXedaBgrIzHJKqwiLHj4N846MnGwE4uXeIBS2jp6F4ILsg9URWnWRpDR1BssvdkCD ANvUghPks2zeWC1YtuoBKOO4wp8NJLQA0xaiQppnf0/c3JEECO2iMHiBRySd/OnzHMGVtDT 9tWwrhNmLVkvqFnkjw6xQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:heOmzYMTLIc=:dAGRfhrZQTxAG6lx6Faea0 +4X2K8kosOda45QYYIaPX6EI2srMSZrG4HM4rHBlJD0vH8yknGK/l87ih41JFdbonNroS5T5e lPEg7DBtacupmEG8y3DB3qYjKTb1M53CJYkvhzeAi3OHnKqltVLsPMSxWzXRPk7267auMiccq Dzr3scJjAl2KWFnIERaYrM4FYpzrqzMMRXhX40wz5sVudtAtBe+5y7V8aWEpdXHlWrqhL2big rTk5oqjFJ+UtTXxsv1DVbCXWAnjJ7ga53DR6cGBP0YLtJ3wTmM3vEKRndkpOz+C2SYJiGoJld bhrl3NHQwmCgPFpmkThNVWf8nSDZ9pfbiL9aW4HTVnp9yrCXEchKEEPBl6rHHDe9YVDT0wEZK XDJKBJjGVfdVmTpmBMKjseSYZ/epoROjqDoIRWz5NWZlivuR+452RM+DdNX6VnMHPcsVHhnCV yB4+a/q9/rC/1w0hwZTRISmmtuUKaZ2rvGugvx+CsEjWe+dYRMeqQ2y+EBWwjyek+cNTnAMJo euIO+ZmQQZQtEjcKS8iPnrhyY6SsHkSlZwWlpYC2BjdjQgyYlvbNUNYSPYRsPU2+p/Wna4MEb OOY0XXwa82fl9jYVaRgSUcXw10c2y0Oxn8FyyO67U3YENrYfk+qIY2ASYhx5YC0mrEvUVpWDB inBlqxZSchQfSNIboJaHt7jEv8o28hHK4gdDJUHKYrofRNDXmcXXUN+6UByzw9OVmfIE= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The "alpha" struct member was removed in one commit but another user added in another, leading to a build failure: drivers/gpu/drm/rcar-du/rcar_du_vsp.c: In function 'rcar_du_vsp_plane_atomic_duplicate_state': drivers/gpu/drm/rcar-du/rcar_du_vsp.c:325:6: error: 'struct rcar_du_vsp_plane_state' has no member named 'alpha' copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha; This fixes up the merge by using the correct member. Fixes: 75a07f399cd4 ("drm: rcar-du: Zero-out sg_tables when duplicating plane state") Fixes: 301a9b8d5456 ("drm/rcar-du: Convert to the new generic alpha property") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index 4a98470626d5..d9232e749b6d 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -322,7 +322,7 @@ rcar_du_vsp_plane_atomic_duplicate_state(struct drm_plane *plane) return NULL; __drm_atomic_helper_plane_duplicate_state(plane, ©->state); - copy->alpha = to_rcar_vsp_plane_state(plane->state)->alpha; + copy->state.alpha = plane->state->alpha; return ©->state; } From patchwork Fri May 25 15:50:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136956 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3759113lji; Fri, 25 May 2018 08:52:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZokY1N55gEP68tCzuTN0g7ryOY8gM50PeJS42Z6U4dqlg/DLOTI7564NdYvzvphvJ2nPXF4 X-Received: by 2002:a17:902:bf0a:: with SMTP id bi10-v6mr3091684plb.235.1527263523070; Fri, 25 May 2018 08:52:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527263523; cv=none; d=google.com; s=arc-20160816; b=dFashByxD5Y2ePvqxbcBJt2cIvAYzvH8STTf+xhl4vjVcbSpR75XBObYl/ya87ArUZ DEDAIgrZ7hHsQWwzQUcC6fiHHlyTh2u0lMXK2GUWjt2lbUH4PflblokASGvxuAbMvbag v5GptXKw4YSKYJBhADd/sgBsIheC0WfbY7mHHT394JiSrnXKud1/3uxirHeHaSQ5bByD eaoYBgkps+MYrEePW28Ftdu6/bW6YMAuodaghKmGWfB4pHGFYsm4tZbP2dm1b8jR8ocH rM0PlQRue2QPuAEEM3LJgqZGpl3y3P+ul+BxZP7nSz2CgQNIh65gvRX267qDWBkLITTe zmOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=P15RsBZPBnL8YSfDQovWWG2+/HdmOrSIks4uDPSzTTY=; b=RF0E1Jp+iXyn18vurBWEdwo03jdVML3oYedH6qGUOgEndbqwYeDCbNu0G2I2tmxlW+ RBwfzY6IKnZ+Ecut6q1fYnsWm9DBMi8M4s4uiWznuunGUxdQ/8XgLMndF7wG0auTgrX9 BA8YxHfYlOlSvQgfLHo7+MU1I2KVf2ATVmcMPyGOHtZe1SuGNgYa/LzvgWQDIO8jsDl8 epmk2EZFctT83S7kJH2jLrB+B5RHD4yYsdHTTelhwqH8gcr+kvxSTZmusxUXPI6ehBrX mPDfR+bMNtx55aa/moljXgqYS+qqd1ZNRAmiv1GO/ZYJcTblFc6Fm1jwfgPVhCygJPVH QGNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bf3-v6si24544033plb.105.2018.05.25.08.52.02; Fri, 25 May 2018 08:52:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967034AbeEYPwA (ORCPT + 30 others); Fri, 25 May 2018 11:52:00 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:35663 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967009AbeEYPv4 (ORCPT ); Fri, 25 May 2018 11:51:56 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MMFQL-1fPoJ12yoX-00829j; Fri, 25 May 2018 17:51:50 +0200 From: Arnd Bergmann To: Eric Anholt , David Airlie Cc: Arnd Bergmann , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/8] drm/v3d: add CONFIG_MMU dependency Date: Fri, 25 May 2018 17:50:12 +0200 Message-Id: <20180525155030.3667352-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525155030.3667352-1-arnd@arndb.de> References: <20180525155030.3667352-1-arnd@arndb.de> X-Provags-ID: V03:K1:6T3Ud88LEAdQJdKJHT0oMDM4g9lJpFi/VazujwBMEEqHBcOpQVJ ZZZj+7YCZORAkc+Wcb1XYsO04cymWjGa715bXUX5aX1avmyMsu5A1yly4TVI0zQoYAskFXG vzRacFrzfy84xw8q7pXujFRlN97zfkL35KfszYAwxRfJEGKQBkvIxFXJ2Hig6SQyuk1eIDI o04YlXLAcGS4k0JHQxxbg== X-UI-Out-Filterresults: notjunk:1; V01:K0:NfT+Q2RFkTQ=:3bqtg0g0FcJmnDWRdMfpBN DKimFMckwaETwQ3H2gCYqKSGR0qlTzeePaj+kaYilsNGq4dBa5drizBy5SL1rynehau5EMBrO tW6NXFtzg1AFcK34+UD9fLYCnOYuVbqUMtZKkIXJ7YO6p4A1V0oGHtzZ5ta/JDo3/hEPn+EJG qoM+DTn/8vo+5yzMN/il7N1EWjUkNq46B10VHVa6CC8TTIZgv8xtSIgN1hFO128QI/R+sOwXM GVGjBIgavaGHaEJsMmNxfXaht7h9lEbsUY/J5oSRg/dCKl3/Wrt4d2Lp57U9JATgp1bn9bdE9 UKMglzncK6II7R9JSJtgflRvpKqjL/CJM53deO6i2OEXZ4HIq2R74nbb2jmZGIW2MLvxccOiC savlntfUdXTUvS3Be57wN9Emufe1ZafoOIP1l81BxKes4BeZFWTdI6b6bFt4OIN+MsnqsNvOM P6ThdmcUSjPfNaWnwQyzq8Oam2aHh+UhZSAn0pOu7dpMT31uJ3wdnrjVvMvEH66UESNBEg/v7 ciWoY6kbmOkzvSMAZjXDu9Oo8tE6R0l8Vz5BjsNNNCwNdYhcqv5WbmWpEWtx8wy/tVGPb20aU 6R9Po0D5taB2oC+ddVn/acY39N8BffnS+dg+bYL6F74ZbuPqX8hWdQvrZjT73fYVDedCFYwAO wJSmaGLjJlCZvwM+2d5U1HXGpKU+iblb97qJtR8C1MIZKYN/PYAo1Ku3In/GRoEYBBS8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Without CONFIG_MMU, we get a link error: drivers/gpu/drm/v3d/v3d_bo.o: In function `v3d_gem_fault': v3d_bo.c:(.text+0x3ca): undefined reference to `vm_insert_mixed' The other drivers with this problem already depend on CONFIG_MMU, so let's do the same thing here. Fixes: 57692c94dcbe ("drm/v3d: Introduce a new DRM driver for Broadcom V3D V3.x+") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/v3d/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig index a0c0259355bd..1552bf552c94 100644 --- a/drivers/gpu/drm/v3d/Kconfig +++ b/drivers/gpu/drm/v3d/Kconfig @@ -3,6 +3,7 @@ config DRM_V3D depends on ARCH_BCM || ARCH_BCMSTB || COMPILE_TEST depends on DRM depends on COMMON_CLK + depends on MMU select DRM_SCHED help Choose this option if you have a system that has a Broadcom From patchwork Fri May 25 15:50:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136958 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3759855lji; Fri, 25 May 2018 08:52:49 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoTQLAEjN/MEgN5B14wYW0M9IA1bRYZLZoPxcgXhz9NeM4p5P+sx+9z5d62M/O6rbyVhkqN X-Received: by 2002:a62:4353:: with SMTP id q80-v6mr3131733pfa.228.1527263569028; Fri, 25 May 2018 08:52:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527263569; cv=none; d=google.com; s=arc-20160816; b=vVVLGMGWeTr4mZhsNfwzCOf8osIRgwCBuQEx64K+tsgJbUNSINAfa5sCVj7AzkfKSs rscft3kFey5kqoQNZSs0k5FviE//g6zMxvvQK2Kxvpo9cSixQhjiLIUe7Hpq7IcmRHvT Gd+hV+iYBarcoBsdA6Tx/UFKcEfS5RXPEwNL3EBOovGIFyQoSt9W8vFjdgPTaS5Y0Q2U ABlexa+jF0jT7GFt8NMf6K67101yGz5dCksmyFN64tKGih2zCssqZmXZ3+gRBXfNIdG2 2Y0KvvGNMA7JvyOAOLnSim2suyAgs468xYD72sTLpXIWyDCLrFpJO5AWw34u5b9f2ypV pSlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=H3Ru5npA/9QTkyG3W9WB4y53LxveCKsuzPGAB3jQ4Z4=; b=0JEeyzzf8brC7lt5AgwCEpKj0oAlmT3xByuURmhkGkMMShQm12e8QhrnJ041czP5L8 7APK2A/aymgZ033Ll3YDe6cFKJcdeZlthDQWeYBWueW89fjYTVwfybh3Ds2fgXM0ZofE 4GwT/Jpehp1W6ZYbAaSq6r8K+PF//RyKOMGBUtGOZXyWAmcP4AGZTO6vSfl7K+NxdC5N eKvv6lVTD9++kN5NrGwyGJXu9KN6vG0xe2TouMnraaUNlOxh9ZF58dZyL/HjhcLM53H9 KaKm/35KsyXwvgGLMVAd3WwBe+P155Pv9cLBBNB7UDo2bSF9fDmcWuvvQUilF23N0n5B 6DHA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e2-v6si2313094pls.575.2018.05.25.08.52.48; Fri, 25 May 2018 08:52:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967091AbeEYPwr (ORCPT + 30 others); Fri, 25 May 2018 11:52:47 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:34175 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966801AbeEYPwp (ORCPT ); Fri, 25 May 2018 11:52:45 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MUEZG-1fnE5314Dq-00R1Xo; Fri, 25 May 2018 17:52:27 +0200 From: Arnd Bergmann To: Archit Taneja , Andrzej Hajda , David Airlie Cc: Arnd Bergmann , Laurent Pinchart , Eric Anholt , Boris Brezillon , Maciej Purski , Linus Walleij , Jacopo Mondi , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] drm/bridge: fix dependency for lvds-encoder Date: Fri, 25 May 2018 17:50:14 +0200 Message-Id: <20180525155030.3667352-7-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525155030.3667352-1-arnd@arndb.de> References: <20180525155030.3667352-1-arnd@arndb.de> X-Provags-ID: V03:K1:LVIm6kSURKg4YU6GswfLEU9yE7ciQXHXfcl8nw6OGCM7qyrhxIr wkG0QUw7qvQXlv2yL8kJvbCffpfhPVWQhif46Oj6ywv/aw5eNpWBop9pD1RV7e+c0f6+xAK jFbR1xEh5xVOGpFow1G9KsYDNBcJYqZfGDi0KFal4Pn8T5ZUTK6H/HUgTEX01aaOiaLI5so xHxHgN2/tzytokmlXx/AA== X-UI-Out-Filterresults: notjunk:1; V01:K0:9Z5UrJCXXQI=:oCvGf7Iep/lJTdqjFyI2px Gl5cV3v9ylGW3kwtIlwlv62ZSyCJeNHaqt58PaP9h+lcjYf6dJIMXZw0WN/56KtrZvXokUGzx nRp0onJf43joWFwF3/GgfzQ1PZc7DSfkUHFCruvDVfGA3vMbGwhklOTeboHrKGtpYfouvtGCJ 2Pc727v3Ut53aPndJ1xrO0i0EKpTKELo6VcGCaqw0OtBXV4IRsmNN//j4T5+j2DkTbWhVSVY3 fbt2OkSAM1Lguj2b+rgg5i3EE9kWlszRwpNH4u5k0jBkMlIe8lGfSV1EHq1JITOnrY322/Gl5 uf/XCBvTST/Vm1KH32lXriUjZKNSJEyQbQuMCmF1DJ6ufEsfWMqhMcc1YAlmlRiKEOfgZ9nFY iDuaTfMkLKAR0N9UD0eZf1AvioBZ/juxM+OUdR7SZSvRLN7/ymL1giM8wnXhajf3wwtFeDzpx ognuHGv+bLXgrXeeB8B5lalj/r2gwTwwQOpAE6f6Wh+WeBm2b7qNaqzHjXGUcOVrc9R4P2+rj rwYm9bZwgIjDIWpqQKbktEYP7FJuUbQVt02/huJXVtZK0FBaYhdaqcqCcT3nSf17xbuHan+JP KBtcqBLUi7jkvhffZ7inb7AjKL7c+tnuOIjQPa1PNagRxMU1GuEBnQAtz0TUcV+NoRxn+JG3V t6DSsUlBQ6Jkw3l2Bz4w2h0QQcJ9KElZnpfeBsUhZqa/fJYcKgn6/BTq/JpqM1qLOZqE= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The DRM panel bridge code is built into the kms helpers module, so we get a link error when trying to use it from a built-in driver while the kms helper is a loadable module: drivers/gpu/drm/bridge/lvds-encoder.o: In function `lvds_encoder_probe': lvds-encoder.c:(.text+0x124): undefined reference to `devm_drm_panel_bridge_add' This adds a the same dependency in the lvds-encoder that we use for all the other users of the panel bridge. I did not bisect the problem, but from inspection it seems to date back to the patch that separated out the panel bridge from lvds encoder. Fixes: 13dfc0540a57 ("drm/bridge: Refactor out the panel wrapper from the lvds-encoder bridge.") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/bridge/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 Reviewed-by: Linus Walleij diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 6caa47834194..cf47bfa7a050 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -46,6 +46,7 @@ config DRM_DUMB_VGA_DAC config DRM_LVDS_ENCODER tristate "Transparent parallel to LVDS encoder support" depends on OF + select DRM_KMS_HELPER select DRM_PANEL_BRIDGE help Support for transparent parallel to LVDS encoders that don't require From patchwork Fri May 25 15:50:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 136959 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3759981lji; Fri, 25 May 2018 08:52:56 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrXxQSfjWggXYzB6/4rR2TFSLVkRnn/6lSdWDGQlWM450HyDPf6o/9ONvV4S8IkHhd5+d0o X-Received: by 2002:a62:1411:: with SMTP id 17-v6mr2970967pfu.3.1527263576264; Fri, 25 May 2018 08:52:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527263576; cv=none; d=google.com; s=arc-20160816; b=DPIYGGGdOQsTt592mtazYhFqGlyNMgohQTsy7ndZu7wMrUNwZAyVYePJ0Ewe44+oBe UFVVf1nvMY4DqmqikUJbtgO2U34oFdIjr3rv2h7qqj6ovGVKLjnrfWoh04tfwIHHQGPq jpEXqXkEbv1X7gMNw/QnoWQ74e1xEw4yWrINF/TM99MRao4V/5MLuSrB9zDfoLL8TkJ7 d0v0zmqOULEPHc0803RSEF6LZzDGNjFcDyw8ZGtZuQgVzyO0OX0o1AUrAslVzgGmsS7W klw9pxycH4fCHmcsM+Ktlr96cGXLknyjK5t64fXssKHpDQ8XFJb+9oXYisTgTLd5WoiR tV+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=vSCW4m4Xm2pJ5JIPnZ5jtJHT4GTSl01JOl95/3tHTTo=; b=utwskVPexoCsokDMeC49Zemixuuedv+8sCgIKTbVBm1/hLtEU0LVejLZ2SkeGG+4UX IvQlNdlW/wKvyyKMYSccMlw71Ql93f1AYI60saL3TP+i6U3ayMb/3MKCiiKJ4q4lDf/c bffrnOLGKnSQ0YME6HSGWtj5deQ+CAmdWlNhX6LkmG4y+3tMEdrcbu3fN9f3/+VGwh/x Nfv13xnJ5Jt22Ci620cOQ5L23//QfAh6zYn4Hck+BtD2Hq3Km91+mGGXbnNbEAEX7IgP RinD8vMVMS1pgytEN+6HIeXbelGAGFcxWddHRWgCW3gXgHQugvBuaevbHPjvfC1BU5Pg Rurw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o189-v6si23613376pfo.20.2018.05.25.08.52.55; Fri, 25 May 2018 08:52:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967111AbeEYPwx (ORCPT + 30 others); Fri, 25 May 2018 11:52:53 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:37085 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966593AbeEYPwu (ORCPT ); Fri, 25 May 2018 11:52:50 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lnjgd-1fzhNH3EMh-00hvCj; Fri, 25 May 2018 17:52:40 +0200 From: Arnd Bergmann To: Archit Taneja , Andrzej Hajda , David Airlie Cc: Arnd Bergmann , Laurent Pinchart , Boris Brezillon , Eric Anholt , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 8/8] drm/bridge: cdns: mark PM functions as __maybe_unused Date: Fri, 25 May 2018 17:50:15 +0200 Message-Id: <20180525155030.3667352-8-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180525155030.3667352-1-arnd@arndb.de> References: <20180525155030.3667352-1-arnd@arndb.de> X-Provags-ID: V03:K1:lga64+uz/9QQLDSfmMLk93/z4dpHilERqvwweRQ3nvCYM/n5dOf KhLeBcrOw+yHwoC6zoQDwlcSz+SY6MqXXoswc6OfdOV3u+fnF1kbIW449aakeUmVqwU5xJC 5HMSBlq8bH90k54rDhcRvQ1BlufcFYoLVvBF/1YTSIh3XQQxh7Gp/rozJD/If8OSyBfOxOn 0aJZORYE0iuXx5YoEpsmA== X-UI-Out-Filterresults: notjunk:1; V01:K0:uwXKNT78spY=:SgwoEUxWbdiAKSZSBx5Rb+ g0DxNsmyNQ/ZB3swW/LALHS2iVgnzgZwvBB92sVZTK755fbd0eAfOyCAgRIBihCsPRacPobKk zvzqItRPY7bbof902upNr1cEFl88xlf6+/yl/48LbsY+A5c5PgkD1b5SRZT0UPsrlGkuW4Fc+ lWHTAqipCtJnDXMK0brije+fSRMUYBxZ/3AQzVg85VCbd1xFnCVRdcRQZZMbe+kR+Dz8tuoli 7FgqGk3GfKEHMNOxZ8qtewFDFb0DFj9yGhlKSN/WZTKyw9QEhLEvtBbuLj6fsX2hshL6f97XH TGLxRIU4Ur4SjV3ID3OF1fTJqFZ5bqNDrixhVxGsvVonV9tU5IQ0LtxSk7YxNRBwIu2tbiydG JoRSzIiAS2bZlJ4Kd9QN6NEGqpbx5BpI13GcySllpefYpMZjySft1z/PVd7KanqI51uIi49ZO +CsCjz+YoxK4/v7l1PfSoKNIS9bMbelY3FF4L8Z7sf5vY9Som5vTXfqd2CCydE8+zz+ccvn34 C78tI65OdyVDPhJ4VTEK81JHh99jZYZFQ/U7VuIX3sowA91yiFHyCu7sNvwk284FCGMCsm0pn Fnbc8twVQmL5rk6Ah6B6ObyqAmi0LYpzvhAetH0H66t6pZ9SGANOKLzg9fA3mFtSouMLICo6x Dvf8IStz03AxCskh/ZUVsGjxzZ7/ZK/h9Nr6IJfqCsyjHXlIIQLQM92jpW8hCnwlQEuE= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These two functions are unused in some configurations, and using __maybe_unused is the easiest way to shut up the harmless warnings: drivers/gpu/drm/bridge/cdns-dsi.c:1353:12: error: 'cdns_dsi_suspend' defined but not used [-Werror=unused-function] static int cdns_dsi_suspend(struct device *dev) ^~~~~~~~~~~~~~~~ drivers/gpu/drm/bridge/cdns-dsi.c:1340:12: error: 'cdns_dsi_resume' defined but not used [-Werror=unused-function] static int cdns_dsi_resume(struct device *dev) Fixes: e19233955d9e ("drm/bridge: Add Cadence DSI driver") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/bridge/cdns-dsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/gpu/drm/bridge/cdns-dsi.c b/drivers/gpu/drm/bridge/cdns-dsi.c index c255fc3e1be5..f2d43f24acfb 100644 --- a/drivers/gpu/drm/bridge/cdns-dsi.c +++ b/drivers/gpu/drm/bridge/cdns-dsi.c @@ -1337,7 +1337,7 @@ static const struct mipi_dsi_host_ops cdns_dsi_ops = { .transfer = cdns_dsi_transfer, }; -static int cdns_dsi_resume(struct device *dev) +static int __maybe_unused cdns_dsi_resume(struct device *dev) { struct cdns_dsi *dsi = dev_get_drvdata(dev); @@ -1350,7 +1350,7 @@ static int cdns_dsi_resume(struct device *dev) return 0; } -static int cdns_dsi_suspend(struct device *dev) +static int __maybe_unused cdns_dsi_suspend(struct device *dev) { struct cdns_dsi *dsi = dev_get_drvdata(dev);