Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp2124188ybb; Thu, 2 Apr 2020 13:38:20 -0700 (PDT) X-Google-Smtp-Source: APiQypJdXGqA7QoTjbaWVVl6mEOANEgL8sXzIfN/drdQcs9CZJjsVQSMEUU/vPnPkJdZflkfTF3G X-Received: by 2002:a9d:7992:: with SMTP id h18mr4069568otm.315.1585859900115; Thu, 02 Apr 2020 13:38:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585859900; cv=none; d=google.com; s=arc-20160816; b=0vnvVNnDkOgtBZb9HULhMG+RCmtfv8TvNSwkjB51a308EIt67ALfLBtifRxBFKB/V4 DB2AWHKkNFcB7h+yn4E94wkMooC/kLqnPL/PeCZQCtIMxlFRiUddpNrOVaVPc/S7Q3U9 dCGICucz6v3tGcTqd4n6Y5ZZrTGO0K9hX/OHUIfjAKmCbcXe+Pu8It0rH7lluqiY1EXJ 33lG8Wqaed8j1hB1++oJLT7hhSN4mtY3cQRrdZO9hTAD9k3ET3lJ7Udw4sIufGc+ar0P 2UlsmSaHqhSxeHJ4NETrad1P6LHuRDtXNi/QcTmMsxzoNSzshL/3/4rsHeCVa9X1ePxM 9Mfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=xjz9VfQ/qcp06gPRmgOFCZkqy7YVuSQylRbKQQtnWwA=; b=M0FQLW7B+hxISAevqlSlzyZ1DwKAHY2o2zFesOTuIjjnBfpsfz/YS/PI14gfHoYcJk PO9CvqJaNERsDlxhVeRwhfBcOd9FdoE13tNniyIVkwOtsUvmp1nUpox73G/lhzpGwcwW 4Ftw0/vVMx/GoxVYFs3ZGNRRfMjX+pFSSwhyT9DxBTPf8Nn742NT4e4p/PYf29Gcuudi SMPT/50mEK4+FOUydc0MDtvJAosVT+Sylv8Nfk8Du8tVP0PMWyy0RDS+HwtmsZViWDDI LXYEpasBjglMkD6TOZffpJEML+CFiZpJKtesDmdx5KC76Ks4Lmeu2sd//so+Cmny6MGs 9lWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=arbsatfE; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y1si2713428oti.52.2020.04.02.13.38.07; Thu, 02 Apr 2020 13:38:20 -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; dkim=pass header.i=@gmail.com header.s=20161025 header.b=arbsatfE; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389397AbgDBUdV (ORCPT + 99 others); Thu, 2 Apr 2020 16:33:21 -0400 Received: from mail-ot1-f68.google.com ([209.85.210.68]:39826 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728225AbgDBUdV (ORCPT ); Thu, 2 Apr 2020 16:33:21 -0400 Received: by mail-ot1-f68.google.com with SMTP id x11so4939574otp.6 for ; Thu, 02 Apr 2020 13:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=xjz9VfQ/qcp06gPRmgOFCZkqy7YVuSQylRbKQQtnWwA=; b=arbsatfEDTGt5U1xGl1CrxJPFSO78TybUI+NQpBL+jjl2EMsFYDL89UkVs/WXkBHrA KaHAIknSWiIVcHoBKDAvBvfo90xG0BmjvfRRErO1bxPMU9FJ8uDQQ29+lGkExI4jPa2S 4XKf8c+5I/aLSFQXA5Xwb8VS2PnbURA0WjmtOKGtcrkrjhDsSjAeUreWU+22fxF5EWkI lZNFR924dx+r0nqejtDkW/dBsmHLNA/ktPOmx0yP9lAZN7cg7c5JrGRN6gGAlPTOl/Eh Zii1TrO3UdNaq64GPZIHLtjyBLmVJbKGvPReW0EocjHQmys+wnrKj8AMaZkMQXgBFvsb Fdlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=xjz9VfQ/qcp06gPRmgOFCZkqy7YVuSQylRbKQQtnWwA=; b=LDR2AY4xST74XCQdtuVxBydx15yZtJVEUzRxHOlucGogUPvgXTAOl7S8B2bFoVQ7UQ NyV71YXHjmMiA+XQPKD3rBm5+MBCtY6rD5JlA5wVBy/j0bnbcJckeJJo59fWR3xz7OwT 3vXWX2quxqZ7rw0ydCvR5ZGdWwse2wBp4n5YfJQx8xIv5LdmZGSu3pTmiirNduggpHHe XbgvPX0HenR/KCe2wnNv2PjFr3yWaS+j4P+gVD/zzHg1jGMvnelZRUnp9QylI34cC4u0 e4i31Pl/I5KaLR8E7hdO52rf1M/8ARYY+BlKBBUYPAr7WUY8WvXELHX0jk6LqzZBiUZp Z0OA== X-Gm-Message-State: AGi0PuZ15p874RTY2ilPtg77VDjsHsOcgZp9d/STBoQzVqqZecV/ckat kxcVXx7W+yd0IbMZlz2R5j8= X-Received: by 2002:a9d:7a9:: with SMTP id 38mr3858373oto.60.1585859600152; Thu, 02 Apr 2020 13:33:20 -0700 (PDT) Received: from ubuntu-m2-xlarge-x86 ([2604:1380:4111:8b00::1]) by smtp.gmail.com with ESMTPSA id 68sm1568699oon.14.2020.04.02.13.33.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Apr 2020 13:33:19 -0700 (PDT) Date: Thu, 2 Apr 2020 13:33:17 -0700 From: Nathan Chancellor To: Dave Airlie Cc: Linus Torvalds , Daniel Vetter , dri-devel , LKML , chris@chris-wilson.co.uk Subject: Re: [git pull] drm for 5.7-rc1 Message-ID: <20200402203317.GA34560@ubuntu-m2-xlarge-x86> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 01, 2020 at 03:50:42PM +1000, Dave Airlie wrote: > Hey Linus, > > This is the main drm pull request for 5.7-rc1. > > Writing the changelog seemed a bit quieter, but it looks about average. > > I've got a separate merge for some VM interactions for TTM huge pages, but I'll > send that once this is landed. > > It didn't seem to have many major conflicts, but my git trees have a bad habit > of finding the shared rerere cache and lulling me into thinking it merged fine. > > Highlights: > i915 enables Tigerlake by default > i915 and amdgpu have initial OLED backlight support > vmwgfx add support to enable OpenGL 4 userspace > zero length arrays are mostly removed. > > Regards, > Dave. > drm: Remove the dma_alloc_coherent wrapper for internal usage This patch causes a build regression on arm32 in certain configurations (I found it with Debian's armmp config). $ printf 'CONFIG_XEN=y\nCONFIG_DRM_LEGACY=y\n' >> arch/arm/configs/multi_v7_defconfig $ make -j$(nproc) -s ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- defconfig drivers/gpu/drm/drm_bufs.o drivers/gpu/drm/drm_bufs.c: In function 'drm_addmap_core': drivers/gpu/drm/drm_bufs.c:328:8: error: passing argument 3 of 'dma_alloc_coherent' from incompatible pointer type [-Werror=incompatible-pointer-types] 328 | &map->offset, | ^~~~~~~~~~~~ | | | resource_size_t * {aka unsigned int *} In file included from ./include/linux/pci-dma-compat.h:8, from ./include/linux/pci.h:2392, from ./include/drm/drm_pci.h:35, from drivers/gpu/drm/drm_bufs.c:46: ./include/linux/dma-mapping.h:642:15: note: expected 'dma_addr_t *' {aka 'long long unsigned int *'} but argument is of type 'resource_size_t *' {aka 'unsigned int *'} 642 | dma_addr_t *dma_handle, gfp_t gfp) | ~~~~~~~~~~~~^~~~~~~~~~ cc1: some warnings being treated as errors make[4]: *** [scripts/Makefile.build:268: drivers/gpu/drm/drm_bufs.o] Error 1 make[3]: *** [scripts/Makefile.build:505: drivers/gpu/drm] Error 2 make[2]: *** [scripts/Makefile.build:505: drivers/gpu] Error 2 make[1]: *** [Makefile:1703: drivers] Error 2 make: *** [Makefile:328: __build_one_by_one] Error 2 This fixes it but I am not sure if it is proper or not (could be problematic if CONFIG_PHYS_ADDR_T_64BIT is set but CONFIG_ARCH_DMA_ADDR_T_64BIT is not, not sure if that is possible) so I figured I'd report it and let you guys deal with it. Cheers, Nathan diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index dcabf5698333..9282fd075424 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -325,7 +325,7 @@ static int drm_addmap_core(struct drm_device *dev, resource_size_t offset, * need to point to a 64bit variable first. */ map->handle = dma_alloc_coherent(&dev->pdev->dev, map->size, - &map->offset, + (dma_addr_t *)&map->offset, GFP_KERNEL); if (!map->handle) { kfree(map);