From patchwork Tue Mar 10 03:20:04 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 205 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9D17E3B8920 for ; Tue, 10 Mar 2026 03:20:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112843; cv=none; b=r2CH8Cn5Uggm7s95S0/VCTQzPDC3e4guMWgBpt+k5YruwtnJJBn3tXf4200p4iCl6/6bef1UEX9tnqhGU6Dmbx8fUz49VeBJc/pADfxHjctT6PKfZIZzPdeFvNH22+6VlVu1baGabEbvG4iT61OuGaaFosu/30RFr3jqNUCoTVw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112843; c=relaxed/simple; bh=oAfrAdUsiN0HiFEo2w26stnO59aZMIB4kMYEsBwkc3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ScpfurvvYIrE94oYU+9NeR8QO/4AdxvGzHuwSlrXugIwwPe/JQnE+I5q42UNt0bmFe3tzHMYLJPro+AIryfp31ND/QwTFjMSFrQhGMy0Q6cKwqgL8GOnMm6QEnK4ZqpmgxN0Ix9xkpOf9XaGZdLp/GWoRMFYvquXq3A90wvYuf4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Z76seK1M; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Z76seK1M" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-35980423087so4498967a91.3 for ; Mon, 09 Mar 2026 20:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773112841; x=1773717641; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uHxroCmvUbDZdSuabhWIfcDNQo8xx33ypV1WgOxP5VE=; b=Z76seK1MoKN/5zH0+Om6b0f6YR02QkFnIez/Ml+PtLcZpdlCyGuGu1PRkwBkYNkQXw BE95ZUDgGEP83YmXbx8iBh4AZe/WYsQe3tmhce/EpF6ji/PoY4WHmzpgr4kF30BY1mL4 H16c7lvf18yyGfPvjmdlQG72YTTMP7YSGZAiw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773112841; x=1773717641; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=uHxroCmvUbDZdSuabhWIfcDNQo8xx33ypV1WgOxP5VE=; b=mM83dqYw5K95HV/t2bzhlsXjpdXbCMZm0E1hzALwfh6Tt7OcaF29YjavrtHMVe2Vzk kdtCHZ/vVzR4rN9rsEPtFP2/eG8OtSw9NUmvjbx7s1/nZZwYAEMPHX+mQXf0DmoP71SR AaMBUm6XoCqwrh8D7vjeqQ40XUm3YuEIE+Nv7EmJ70smBIrdjdMxJX0fgQsgQegyFSmh JMm197OEmsmUn8dlqhj/8MkhMDDBvrN8LDUIbDOCt0hUHKCgkM5VPE3yCAOe4G/rDaJB 805SU5FMhAXjgjQdalK3yDWnMaxpJYOgWU5hy57rzKceBrs4MgrEZN8ctb0gilRIgLHP sHWw== X-Forwarded-Encrypted: i=1; AJvYcCW9nledDmcrE/BxlG24lPRMx8JS/4f10kyE1hVdLoR5dcsJt2d1huz1HXm5gfKlztzukwcbiUJz/2Utng==@lists.linux.dev X-Gm-Message-State: AOJu0YwDsznTXfPmUMM4k3jCsARtj8bFwQJVAFOp8o/WrBL0aMJpuwin oUnlNFc+WXYkD+ZaOZjq0fyiyjtLFgMc0BwUz/qgtwv7nvLMOFMFq4MIbtPJe/joUg== X-Gm-Gg: ATEYQzxfpCNhikQE/X7QPjG1y6u5g6/BqkMulpvbSYStWoyNGkzy6qwjxv7uVTlONIn YfuqdFfigY/5mjF1CcN1FZr1Ajo3iKzxDYKv+Y0xOKx31idWwuDq4PF/ghB9Ue4QRqlygag6ZNo LZa2bY9HBXcNj3Ggppary/aM35Uqr7CJku2ucus7euXbdMobHWhRqd6NOw6LosI0STzKfqKDUK4 oztc3fH31SM7MWrVeNfLvoYgTbt2Zf4eYeJw1Zbf8cci5yCV1XckUdWOpLVtMeINPtKZygTfEc7 rFOAW3a5hvPdO3x7Xupf8fwTdnfQXtnajEbqkaFte9Aa3ycG7up030JCXjC5ZZMt0p/rWJdkmGv n4JwdQ3r3E2XaXux4FZRBL5uY4Awu32T7Y/yEiUqfYHu906aVhLFFqG38tB6lGes47fq8aEtsYu nNWlFnnnAIS43B0J20/rpZAfWvA4GwRM7+49BorvzAPOA2kqec4kehtFCn+XCh2HwXojbTchGjc oPJv5YT X-Received: by 2002:a17:90b:240e:b0:359:c7ef:97bc with SMTP id 98e67ed59e1d1-359c7ef9b32mr6509980a91.22.1773112840798; Mon, 09 Mar 2026 20:20:40 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:ee38:e01e:e888:6900]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359f06f79absm1154608a91.6.2026.03.09.20.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 20:20:40 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Chun-Kuang Hu , Philipp Zabel , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Simona Vetter Cc: Chen-Yu Tsai , linux-sunxi@lists.linux.dev, Paul Kocialkowski , linux-mediatek@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] drm/prime: Limit scatter list size with dedicated DMA device Date: Tue, 10 Mar 2026 11:20:04 +0800 Message-ID: <20260310032012.2542334-2-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260310032012.2542334-1-wenst@chromium.org> References: <20260310032012.2542334-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O If a dedicated DMA device is specified for the DRM device, then the scatter list size limit should pertain to the DMA device. Use the dedicated DMA device, if given, to limit the scatter list size. This only applies to drivers that have called drm_dev_set_dma_dev() and are using drm_prime_pages_to_sg() either directly or through the SHMEM helpers. At the time of this writing, the former case only includes the Rockchip DRM driver, while the latter case includes the gud, udl, and the tiny appletbdrm and gm12u320 drivers. Signed-off-by: Chen-Yu Tsai --- drivers/gpu/drm/drm_prime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 51fdb06d3e9f..9b44c78cd77f 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -859,7 +859,7 @@ struct sg_table *drm_prime_pages_to_sg(struct drm_device *dev, return ERR_PTR(-ENOMEM); if (dev) - max_segment = dma_max_mapping_size(dev->dev); + max_segment = dma_max_mapping_size(drm_dev_dma_dev(dev)); if (max_segment == 0) max_segment = UINT_MAX; err = sg_alloc_table_from_pages_segment(sg, pages, nr_pages, 0, From patchwork Tue Mar 10 03:20:05 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 204 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 10C27385501 for ; Tue, 10 Mar 2026 03:20:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112846; cv=none; b=oqkODNQPJUfwCXolO60xLjV9iAPIFyNkQLg/seusBmMOvlGcCNr29t+M/4BVDLZTpv7v5Q7CURxGEaIF1Ko9dgh7u5XAtwGnf0BbyHwpF0Fbv1kQfeouiR1q302m680NoS3Tndqf7UlHm6tP4wQ8oABAduID63aK39HrqXETL+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112846; c=relaxed/simple; bh=1ifAvQ9YQ7quAs4EUywvSzDs8d3qnqjGmcOWLHUYZwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TXT0bGyqXHI2XlvqpDBkUwydeQh/ZE4PGhMgUeUJVFX9KjWYKEwqILZTRZJBLLfYQia/yHt9IObRP64QqjAEfTJYkb0Zv5OxuyX1mNDHeqeY+xNH8s7vn1btT0QtHBpbHJLIVvsOB/1PHQJmfWFRhTByrZJil3+crKaFKJHT75U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=N45Bakew; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="N45Bakew" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-3598581ed7bso3678926a91.2 for ; Mon, 09 Mar 2026 20:20:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773112844; x=1773717644; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9DNho1J2CisM3xAD9Y1bBejtF+SOOT6CZm5ayFQyPks=; b=N45Bakew6kBVQXcpuSNvvJo6GWi6tdtMMGkk7I3uNkUBIexmdV8xyFbfU7v+j/N3Ft 30oUybCKlh8mCQkHvK8nDHkOqVLcf4bjIT0S0xS/B6Cvs41m9K2aeUUq+gLO5/M2FdbI 2qO+T+BK36eQWTqvL6NJ/8H3tvKDIsM0ijQvI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773112844; x=1773717644; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=9DNho1J2CisM3xAD9Y1bBejtF+SOOT6CZm5ayFQyPks=; b=VyKUizHUkEWOj9rnqReEXnHsAwmOR3YkFIt3PptRYoJyOnn++/yBnoql4/w+ZDkTdW I5orDWqvih3/IhpyUb/Yma1iUTzOl5Y2BDAkvgK+aK16NyagXuz/zpRVWdhVCCpU+uSw 6HmkJLJhnsc4QnCmzWL/nY4lD1C1cfQew+tlyT4C8iZ7snKPov+gkTWpqZqIzT1MJsDg sd/HpAhqpaM7Vx1C+JsccVh7jaYKeMLD8Kh94qiu22E/VTjprRCAbmr7eHBiPC4iy0ti 1K2+l9PGlYn+ArYFY5/WOu7rnmaT5fbgAp14iKn9IUQN8yJRFHjOfjXGWHeKVvhGWCDE zx6g== X-Forwarded-Encrypted: i=1; AJvYcCWv422FjYuYjZqYs9H9ekdqB+oPDTBxHiYnzjY9MvIw+eKwZ2XlqqEJtlRlKvdtCAqIGWhC6yBSaDnMPw==@lists.linux.dev X-Gm-Message-State: AOJu0YyvK2sEUq8hIV4M+yhphKSnsrfqVE6VRUWw5akggTjELC0IIhzB HChUo7GfpCt6aTKfhd82rZVP6FLx0rVaTNAmCs4U/24haqzDMfLsgAANZjKZ9nV0YQ== X-Gm-Gg: ATEYQzx/tzusiG+h3Blj2V9/RnCV6XGbnFeOwdOO1EtbAoBzGPhqBbXdnZb+nBR8jm5 GWi8IFubsQeuXwMm6raytksxD8xsXBOF41JtvXj4K9lyH+37Pg/YgpoS+2N75VAJ5rV5b94Ucd6 amnxinNwMB8JYKvtGMLH7giQm0XmA4ZEv2sCZ83vh+idDP83wdjXnRRMShUegeqnQuFzc/UhiDs 5QXIVYwxDq4b/c45iNTHK3v1SaL3vw0FVI+RM/Gk9MuSI102V0jbT8wlca/9s2AjuO1+gsE5DCj AGE+tRInv4DdKrxBzlUo0EFa28rFWjy/se16ZOoYvze/uYs3IwhUpqjsbthiJr5ToS+B9LgQWuQ ODrtgts1RhFAOmU3xTlOb3RHkAuh0SX0B46En0dpBdjqlYqo57IR7CVxxnVVTWu1FAxTbrL7Fw4 uGsSnFb5dbpjik2Lo6b8zc9HSeWpoo6V2OaemNQ6CG1vK2NytTTBxlOQtyHXcFZgRQZ4m3NWmS8 QhjURIM X-Received: by 2002:a17:90b:5252:b0:359:9bad:13d9 with SMTP id 98e67ed59e1d1-359be29eea6mr12192211a91.15.1773112844479; Mon, 09 Mar 2026 20:20:44 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:ee38:e01e:e888:6900]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359f06f79absm1154608a91.6.2026.03.09.20.20.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 20:20:44 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Chun-Kuang Hu , Philipp Zabel , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Simona Vetter Cc: Chen-Yu Tsai , linux-sunxi@lists.linux.dev, Paul Kocialkowski , linux-mediatek@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] drm/gem-dma: Support dedicated DMA device for allocation and mapping Date: Tue, 10 Mar 2026 11:20:05 +0800 Message-ID: <20260310032012.2542334-3-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260310032012.2542334-1-wenst@chromium.org> References: <20260310032012.2542334-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O Support for a dedicated DMA device for prime imports was added in commit 143ec8d3f939 ("drm/prime: Support dedicated DMA device for dma-buf imports"). This allowed the DRM driver to provide a dedicated DMA device when its own underlying device was not capable of DMA, for example when it is a USB device (the original target) or a virtual device. The latter case is common on embedded SoCs, on which the display pipeline is composed of various fixed function blocks, and the DRM device is simply a made-up device, an address space managing the routing between the blocks, or whichever block the implementor thought made sense at the time. The point is that the chosen device is often not the actual device doing the DMA. Various drivers have used workarounds or reimplemented the GEM DMA helpers to get the DMA addresses and IOMMUs to work correctly. Add support for the dedicated DMA device to the GEM DMA helpers. No existing driver currently uses the GEM DMA helpers and calls drm_dev_set_dma_dev() to set a dedicated DMA device, so no existing users should be affected. Signed-off-by: Chen-Yu Tsai --- drivers/gpu/drm/drm_gem_dma_helper.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_dma_helper.c b/drivers/gpu/drm/drm_gem_dma_helper.c index ecb9746f4da8..70f83e464476 100644 --- a/drivers/gpu/drm/drm_gem_dma_helper.c +++ b/drivers/gpu/drm/drm_gem_dma_helper.c @@ -146,12 +146,13 @@ struct drm_gem_dma_object *drm_gem_dma_create(struct drm_device *drm, return dma_obj; if (dma_obj->map_noncoherent) { - dma_obj->vaddr = dma_alloc_noncoherent(drm->dev, size, + dma_obj->vaddr = dma_alloc_noncoherent(drm_dev_dma_dev(drm), + size, &dma_obj->dma_addr, DMA_TO_DEVICE, GFP_KERNEL | __GFP_NOWARN); } else { - dma_obj->vaddr = dma_alloc_wc(drm->dev, size, + dma_obj->vaddr = dma_alloc_wc(drm_dev_dma_dev(drm), size, &dma_obj->dma_addr, GFP_KERNEL | __GFP_NOWARN); } @@ -236,12 +237,14 @@ void drm_gem_dma_free(struct drm_gem_dma_object *dma_obj) drm_prime_gem_destroy(gem_obj, dma_obj->sgt); } else if (dma_obj->vaddr) { if (dma_obj->map_noncoherent) - dma_free_noncoherent(gem_obj->dev->dev, dma_obj->base.size, + dma_free_noncoherent(drm_dev_dma_dev(gem_obj->dev), + dma_obj->base.size, dma_obj->vaddr, dma_obj->dma_addr, DMA_TO_DEVICE); else - dma_free_wc(gem_obj->dev->dev, dma_obj->base.size, - dma_obj->vaddr, dma_obj->dma_addr); + dma_free_wc(drm_dev_dma_dev(gem_obj->dev), + dma_obj->base.size, dma_obj->vaddr, + dma_obj->dma_addr); } drm_gem_object_release(gem_obj); @@ -432,7 +435,7 @@ struct sg_table *drm_gem_dma_get_sg_table(struct drm_gem_dma_object *dma_obj) if (!sgt) return ERR_PTR(-ENOMEM); - ret = dma_get_sgtable(obj->dev->dev, sgt, dma_obj->vaddr, + ret = dma_get_sgtable(drm_dev_dma_dev(obj->dev), sgt, dma_obj->vaddr, dma_obj->dma_addr, obj->size); if (ret < 0) goto out; @@ -539,12 +542,12 @@ int drm_gem_dma_mmap(struct drm_gem_dma_object *dma_obj, struct vm_area_struct * if (dma_obj->map_noncoherent) { vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); - ret = dma_mmap_pages(dma_obj->base.dev->dev, + ret = dma_mmap_pages(drm_dev_dma_dev(dma_obj->base.dev), vma, vma->vm_end - vma->vm_start, virt_to_page(dma_obj->vaddr)); } else { - ret = dma_mmap_wc(dma_obj->base.dev->dev, vma, dma_obj->vaddr, - dma_obj->dma_addr, + ret = dma_mmap_wc(drm_dev_dma_dev(dma_obj->base.dev), vma, + dma_obj->vaddr, dma_obj->dma_addr, vma->vm_end - vma->vm_start); } if (ret) From patchwork Tue Mar 10 03:20:06 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 203 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B04443A9D8B for ; Tue, 10 Mar 2026 03:20:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112850; cv=none; b=jCVQGO4q1FYs5sw8T4RO/1TVbBWVpS1OmqA/DsiILEgpndBo8qZzjFvD3NnpJzVJ30gyzLqpJpS17PIl4qdFGwP0SpEgeI0jwW8BzoEW2fLma0zT2vXKvG2Qo3CD7u8+m72BnMG+GBhuhclVjsWAdd3ut7CcG68Ec7Tthg6vCRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112850; c=relaxed/simple; bh=ZUTtKhFYUcr1uwQQLp+Ulkj0oKOWmg5PTveRDJGrDZg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ba2IqoWSSOm3ZEViOyV2TwL+DnuL2c3zUDnlwmnjlIpS77DcIpqpn+/9rJnQJrfUgieUVx1/jTkolXH3tGY5hpCBUsj6JSomzCvhZGDhvMt8D7QYroW78qjtk3/zLSeDhgIqEkMf9wdBfr1PvSkh65JxD7ADbHIFpJHAqvzpVrw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=JsvA77il; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="JsvA77il" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-3598b95ad7dso6734394a91.2 for ; Mon, 09 Mar 2026 20:20:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773112848; x=1773717648; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DhpK4GrpeMoLnC/DzcBviTqJRmg276GHAkV9Nol90pk=; b=JsvA77iljugEW//c6zGzOOdOmfB5gVGlZ+Z0liOmsy9G07BGgmRFqnul68Xcaab/0r CJOqnf1BPkser7+CQVUL69D46/Zkc8J0wZONkv5nNtfyPu3S+hsMJ6wRAjlh1uYwrOPM 9/quauQveFr12EtNlLIzJ6ug0JzrThNwJySfU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773112848; x=1773717648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=DhpK4GrpeMoLnC/DzcBviTqJRmg276GHAkV9Nol90pk=; b=IKKF9rvs90UUbPR5Mm9aGFui2PRIJp0Xz9NT4JUm6qWhhN5bZ1qUuA/gC3MFxWEa0n ptCKgYYA0bH6mpgHduS6A+DSOIdwgfS9rPo8HXHcXkuSm/n72JK00GI3u5ovqf5gy11P UD4OCiCsgasEd4LeslrxgJJlM5ToFsXjjSqNpvfmkCj0D6tx6B/Q3lo0l8DZDqSUJ/KO doA8gG1XRSeUOcyDPxqk4f6XrJlCX8zYEYsOEsSjrpnuT+fHlphjjTrrFiAqi/hyVgEr 1rw4o8Q/KwtYNItXbGvMw/B0whZRkeWjw/Ie+OuhnHk9/iW9yzOyHs8CjU5bGW60p8Z+ K/Dw== X-Forwarded-Encrypted: i=1; AJvYcCV8IQffbD2gqk9vgpAOHKnCKcwQSYuKecCTOSER2rusmZDGBJtA+CUkBSIKCrTUdIeQl7EtxWabit8BQw==@lists.linux.dev X-Gm-Message-State: AOJu0YzfMIfIBxDEwG9UFwR+m/8eBI4+dgsi6p7VJ8YJXfnZ9zB5OTui eM0diUYk0u5fqJFtxdXJ96d6+c5yyaWAPyy98q+pImKrrU2xBvI2RCZgSlZF0Gc0Mg== X-Gm-Gg: ATEYQzwEiQZGUQRUK1ff6hZx9S2lDQ6oy/FGcWoCzKy5ny/+tvKpJIgob2JlhwZsb1T 1nExtIlhrRcz5Vq8C5SII7XXgRVP452wICYjOaCd09xOWbEHCGfr1QGLXZliX4rs0l+Lebpmwvv XpwRPS0dRHim+MHA0q6oK2jYf9Tif97J6deSqn885wocX2DOiEPTsgg7/5HsiWMiG/xB9MR7CLP bqIl+57857si9OlkFCrk0ZsoO2S7NKDkZba6ATknd2c3pA5brEq2BYlVx3GuPemS/IkVIwd0Iib KAIV+fxOiq5wtvchSrlNORhVsj/OIBoPWR5XMjraPmD9sdWxcec6Qf3FnjmDgiE3lPPbFym5I5U KdvZaD1LZ4r9w8MW/PPZSvD1CKsGc9WGQqb380tgvKbQwy3HD8SuIqUvyGnsW7j2Mg9rAn6jbx0 A2ecDCHyDCtJk2zHDI+1Ph1XGPlsQjTEGy/bdq9urT7oZPDdNRgWrVyTndWMgKLwHA9LsDibrAz lil5Am7 X-Received: by 2002:a17:90b:4b4f:b0:359:3426:c60a with SMTP id 98e67ed59e1d1-359be2822f3mr11872093a91.4.1773112848053; Mon, 09 Mar 2026 20:20:48 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:ee38:e01e:e888:6900]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359f06f79absm1154608a91.6.2026.03.09.20.20.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 20:20:47 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Chun-Kuang Hu , Philipp Zabel , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Simona Vetter Cc: Chen-Yu Tsai , linux-sunxi@lists.linux.dev, Paul Kocialkowski , linux-mediatek@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] drm/mediatek: Set dedicated DMA device and drop custom GEM callbacks Date: Tue, 10 Mar 2026 11:20:06 +0800 Message-ID: <20260310032012.2542334-4-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260310032012.2542334-1-wenst@chromium.org> References: <20260310032012.2542334-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O In commit 9b54a32c7c6a ("drm/mediatek: mtk_gem: Partial refactor and use drm_gem_dma_object") the MediaTek DRM driver was refactored to use drm_gem_dma_object, but custom callbacks were still needed to deal with using the first device of the pipeline as the DMA device, instead of the MMSYS device that the DRM driver binds to. Turns out there is already partial support for dedicated DMA devices in the DRM subsystem for PRIME imports. The preceding patches add support for dedicated DMA devices to the GEM DMA helpers. This allows us to just set the dedicated DMA device for the DRM device, and drop all the custom GEM callbacks. Also drop the .dma_dev field from the driver private data as it is no longer needed. There are slight differences in the mmap helper: the VM_DONTDUMP and VM_IO flags are no longer set. Both were lifted from drm_gem_mmap_obj(). VM_IO probably doesn't make sense since the buffer is allocated using dma_alloc_attrs(). Signed-off-by: Chen-Yu Tsai --- drivers/gpu/drm/mediatek/mtk_crtc.c | 1 - drivers/gpu/drm/mediatek/mtk_drm_drv.c | 21 +-- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 - drivers/gpu/drm/mediatek/mtk_gem.c | 231 ------------------------- drivers/gpu/drm/mediatek/mtk_gem.h | 17 -- 5 files changed, 3 insertions(+), 268 deletions(-) delete mode 100644 drivers/gpu/drm/mediatek/mtk_gem.c delete mode 100644 drivers/gpu/drm/mediatek/mtk_gem.h diff --git a/drivers/gpu/drm/mediatek/mtk_crtc.c b/drivers/gpu/drm/mediatek/mtk_crtc.c index 351d58c50b84..fcb16f3f7b23 100644 --- a/drivers/gpu/drm/mediatek/mtk_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_crtc.c @@ -23,7 +23,6 @@ #include "mtk_crtc.h" #include "mtk_ddp_comp.h" #include "mtk_drm_drv.h" -#include "mtk_gem.h" #include "mtk_plane.h" /* diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index a94c51a83261..6f6db2e1980e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -29,7 +30,6 @@ #include "mtk_ddp_comp.h" #include "mtk_disp_drv.h" #include "mtk_drm_drv.h" -#include "mtk_gem.h" #define DRIVER_NAME "mediatek" #define DRIVER_DESC "Mediatek SoC DRM" @@ -565,8 +565,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) goto err_component_unbind; } - for (i = 0; i < private->data->mmsys_dev_num; i++) - private->all_drm_private[i]->dma_dev = dma_dev; + drm_dev_set_dma_dev(drm, dma_dev); /* * Configure the DMA segment size to make sure we get contiguous IOVA @@ -600,26 +599,12 @@ static void mtk_drm_kms_deinit(struct drm_device *drm) DEFINE_DRM_GEM_FOPS(mtk_drm_fops); -/* - * We need to override this because the device used to import the memory is - * not dev->dev, as drm_gem_prime_import() expects. - */ -static struct drm_gem_object *mtk_gem_prime_import(struct drm_device *dev, - struct dma_buf *dma_buf) -{ - struct mtk_drm_private *private = dev->dev_private; - - return drm_gem_prime_import_dev(dev, dma_buf, private->dma_dev); -} - static const struct drm_driver mtk_drm_driver = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, - .dumb_create = mtk_gem_dumb_create, + DRM_GEM_DMA_DRIVER_OPS, DRM_FBDEV_DMA_DRIVER_OPS, - .gem_prime_import = mtk_gem_prime_import, - .gem_prime_import_sg_table = mtk_gem_prime_import_sg_table, .fops = &mtk_drm_fops, .name = DRIVER_NAME, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h index 675cdc90a440..1fc3df4b5485 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h @@ -54,7 +54,6 @@ struct mtk_mmsys_driver_data { struct mtk_drm_private { struct drm_device *drm; - struct device *dma_dev; bool mtk_drm_bound; bool drm_master; struct device *dev; diff --git a/drivers/gpu/drm/mediatek/mtk_gem.c b/drivers/gpu/drm/mediatek/mtk_gem.c deleted file mode 100644 index f059a1452220..000000000000 --- a/drivers/gpu/drm/mediatek/mtk_gem.c +++ /dev/null @@ -1,231 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2015 MediaTek Inc. - * Copyright (c) 2025 Collabora Ltd. - * AngeloGioacchino Del Regno - */ - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "mtk_drm_drv.h" -#include "mtk_gem.h" - -static int mtk_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma); - -static void mtk_gem_free_object(struct drm_gem_object *obj) -{ - struct drm_gem_dma_object *dma_obj = to_drm_gem_dma_obj(obj); - struct mtk_drm_private *priv = obj->dev->dev_private; - - if (dma_obj->sgt) - drm_prime_gem_destroy(obj, dma_obj->sgt); - else - dma_free_wc(priv->dma_dev, dma_obj->base.size, - dma_obj->vaddr, dma_obj->dma_addr); - - /* release file pointer to gem object. */ - drm_gem_object_release(obj); - - kfree(dma_obj); -} - -/* - * Allocate a sg_table for this GEM object. - * Note: Both the table's contents, and the sg_table itself must be freed by - * the caller. - * Returns a pointer to the newly allocated sg_table, or an ERR_PTR() error. - */ -static struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *obj) -{ - struct drm_gem_dma_object *dma_obj = to_drm_gem_dma_obj(obj); - struct mtk_drm_private *priv = obj->dev->dev_private; - struct sg_table *sgt; - int ret; - - sgt = kzalloc_obj(*sgt); - if (!sgt) - return ERR_PTR(-ENOMEM); - - ret = dma_get_sgtable(priv->dma_dev, sgt, dma_obj->vaddr, - dma_obj->dma_addr, obj->size); - if (ret) { - DRM_ERROR("failed to allocate sgt, %d\n", ret); - kfree(sgt); - return ERR_PTR(ret); - } - - return sgt; -} - -static const struct drm_gem_object_funcs mtk_gem_object_funcs = { - .free = mtk_gem_free_object, - .print_info = drm_gem_dma_object_print_info, - .get_sg_table = mtk_gem_prime_get_sg_table, - .vmap = drm_gem_dma_object_vmap, - .mmap = mtk_gem_object_mmap, - .vm_ops = &drm_gem_dma_vm_ops, -}; - -static struct drm_gem_dma_object *mtk_gem_init(struct drm_device *dev, - unsigned long size, bool private) -{ - struct drm_gem_dma_object *dma_obj; - int ret; - - size = round_up(size, PAGE_SIZE); - - if (size == 0) - return ERR_PTR(-EINVAL); - - dma_obj = kzalloc_obj(*dma_obj); - if (!dma_obj) - return ERR_PTR(-ENOMEM); - - dma_obj->base.funcs = &mtk_gem_object_funcs; - - if (private) { - ret = 0; - drm_gem_private_object_init(dev, &dma_obj->base, size); - } else { - ret = drm_gem_object_init(dev, &dma_obj->base, size); - } - if (ret) { - DRM_ERROR("failed to initialize gem object\n"); - kfree(dma_obj); - return ERR_PTR(ret); - } - - return dma_obj; -} - -static struct drm_gem_dma_object *mtk_gem_create(struct drm_device *dev, size_t size) -{ - struct mtk_drm_private *priv = dev->dev_private; - struct drm_gem_dma_object *dma_obj; - struct drm_gem_object *obj; - int ret; - - dma_obj = mtk_gem_init(dev, size, false); - if (IS_ERR(dma_obj)) - return ERR_CAST(dma_obj); - - obj = &dma_obj->base; - - dma_obj->vaddr = dma_alloc_wc(priv->dma_dev, obj->size, - &dma_obj->dma_addr, - GFP_KERNEL | __GFP_NOWARN); - if (!dma_obj->vaddr) { - DRM_ERROR("failed to allocate %zx byte dma buffer", obj->size); - ret = -ENOMEM; - goto err_gem_free; - } - - DRM_DEBUG_DRIVER("vaddr = %p dma_addr = %pad size = %zu\n", - dma_obj->vaddr, &dma_obj->dma_addr, - size); - - return dma_obj; - -err_gem_free: - drm_gem_object_release(obj); - kfree(dma_obj); - return ERR_PTR(ret); -} - -int mtk_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev, - struct drm_mode_create_dumb *args) -{ - struct drm_gem_dma_object *dma_obj; - int ret; - - args->pitch = DIV_ROUND_UP(args->width * args->bpp, 8); - - /* - * Multiply 2 variables of different types, - * for example: args->size = args->spacing * args->height; - * may cause coverity issue with unintentional overflow. - */ - args->size = args->pitch; - args->size *= args->height; - - dma_obj = mtk_gem_create(dev, args->size); - if (IS_ERR(dma_obj)) - return PTR_ERR(dma_obj); - - /* - * allocate a id of idr table where the obj is registered - * and handle has the id what user can see. - */ - ret = drm_gem_handle_create(file_priv, &dma_obj->base, &args->handle); - if (ret) - goto err_handle_create; - - /* drop reference from allocate - handle holds it now. */ - drm_gem_object_put(&dma_obj->base); - - return 0; - -err_handle_create: - mtk_gem_free_object(&dma_obj->base); - return ret; -} - -static int mtk_gem_object_mmap(struct drm_gem_object *obj, - struct vm_area_struct *vma) - -{ - struct drm_gem_dma_object *dma_obj = to_drm_gem_dma_obj(obj); - struct mtk_drm_private *priv = obj->dev->dev_private; - int ret; - - /* - * Set vm_pgoff (used as a fake buffer offset by DRM) to 0 and map the - * whole buffer from the start. - */ - vma->vm_pgoff -= drm_vma_node_start(&obj->vma_node); - - /* - * dma_alloc_attrs() allocated a struct page table for mtk_gem, so clear - * VM_PFNMAP flag that was set by drm_gem_mmap_obj()/drm_gem_mmap(). - */ - vm_flags_mod(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP, VM_PFNMAP); - - vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); - vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot); - - ret = dma_mmap_wc(priv->dma_dev, vma, dma_obj->vaddr, - dma_obj->dma_addr, obj->size); - if (ret) - drm_gem_vm_close(vma); - - return ret; -} - -struct drm_gem_object *mtk_gem_prime_import_sg_table(struct drm_device *dev, - struct dma_buf_attachment *attach, struct sg_table *sgt) -{ - struct drm_gem_dma_object *dma_obj; - - /* check if the entries in the sg_table are contiguous */ - if (drm_prime_get_contiguous_size(sgt) < attach->dmabuf->size) { - DRM_ERROR("sg_table is not contiguous"); - return ERR_PTR(-EINVAL); - } - - dma_obj = mtk_gem_init(dev, attach->dmabuf->size, true); - if (IS_ERR(dma_obj)) - return ERR_CAST(dma_obj); - - dma_obj->dma_addr = sg_dma_address(sgt->sgl); - dma_obj->sgt = sgt; - - return &dma_obj->base; -} diff --git a/drivers/gpu/drm/mediatek/mtk_gem.h b/drivers/gpu/drm/mediatek/mtk_gem.h deleted file mode 100644 index afebc3a970a8..000000000000 --- a/drivers/gpu/drm/mediatek/mtk_gem.h +++ /dev/null @@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (c) 2015 MediaTek Inc. - */ - -#ifndef _MTK_GEM_H_ -#define _MTK_GEM_H_ - -#include -#include - -int mtk_gem_dumb_create(struct drm_file *file_priv, struct drm_device *dev, - struct drm_mode_create_dumb *args); -struct drm_gem_object *mtk_gem_prime_import_sg_table(struct drm_device *dev, - struct dma_buf_attachment *attach, struct sg_table *sg); - -#endif From patchwork Tue Mar 10 03:20:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 202 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B656399019 for ; Tue, 10 Mar 2026 03:20:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112854; cv=none; b=dFdcoh3l2NYaIDXADKzObh6J8GskG/0PtC3VFKBtTyaGUsJ4jesv91KOYisNFK/ascEIUmR3U8sbdtPZfM9gmcCbzQunZhX8TiNfySpcnziGd5HJs9hFCtEInPx06IiNucCxhOGIMkgZxOp42w7VcaiXye9/yitaTL+nbgiWKiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773112854; c=relaxed/simple; bh=rfD7Le/WZjv74zhcuW0yU+5NJ1RZ3lo7zccKLiSyBcI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kW6Yh6/LTjWAo5n5/hugo3sSbcj6VX3gtn0BGaeAOQ1N7UPysEAEja3Bx0O6+23X0mw8sj6hnQXsqcGIFZlm/3p9Gh5oYROPah8cH+jZoZFusicvSI5GF/MalCyrbcbZrJ61wezRXp3YwBaJ3/pgxQLsOGSSrU9/TCRkKRc5Fcw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=CNbBKVAv; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="CNbBKVAv" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-354bc7c2c46so7471032a91.0 for ; Mon, 09 Mar 2026 20:20:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773112851; x=1773717651; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Y1z9EtizHwE3LeSySxAXfxT/FNlt1Ydhsh1vDf6WdY0=; b=CNbBKVAvXjBs++AZUUmglohogTUkunAgoCfWpkwcw5Ezn1lVzDrZtXByRJQInAKX6N xDISeYh3AmxpRDsERTgqBdaTsQC6O2nZr42VHYluVznEup0lkyYU8r26D8lwCCAieNdY lj/AbJB7fmc4Gp91AcUNahgiv9Ne//HLSQlqg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773112851; x=1773717651; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Y1z9EtizHwE3LeSySxAXfxT/FNlt1Ydhsh1vDf6WdY0=; b=PSlwEhbMcGv+YWbxlF8sB/4r1pywTffi7I5RKmgGdWpjYy7Q7xdcJn3qA7A9l5DjaZ 8xb43d/hbXimhPMuShxpVZQOLQ1XRxT0st9PdEYGVsUrWURpp9CdgayEsQMZqBg0Jg5K f3mTmFpRiJ/W2WfcNpzb8c8fw4RssrBNM3FsORqalpLh+zwAk+tlaixqxSbE567NpZlw /6fae62dxGyelJVXpiAQhyNMYY6pY2bS2TrGZw+OzlPe1vbKy0s1GtQbOc+Nd/PyIHNG 8CI+1FS7epnSu67ymwgFj5jgsfMijPG7qbvVAJzXFYxaQXW7oPjBU8+05QeQ/q/he3GZ rsQA== X-Forwarded-Encrypted: i=1; AJvYcCWkluRBYLXaDn7XCZ3zA1MfPRWpUM/gmgwesfEcFHDUfPggYXvnwb1AP9wnA5tg+0SZdpR8J7NnPCiB5g==@lists.linux.dev X-Gm-Message-State: AOJu0YzHAVgKwAYcwe7hjAe8UstjIymncHDqMj256+GDoy6yc5V9+NzX OW+VJkfKiwrHQMUzFFyir+tUorM4FGm8oEM/XyYLjhwO7+7mAXuyS3K4HSkD5UX/jA== X-Gm-Gg: ATEYQzxywahnm4+JOjWI+tXf4/tyBUEhTbrpxKG5VorpoIOqEmiQu7t4OGDr4kGa+0Q JmhemrnojzxhwUIPY/40LGghvYEgAz8SxPt22mQ5F2xuzczZqnRTOtn/DF86K5P+JWwdVCF+DAV jk3N0h5LLN9jBc/dM4V+EISUemlDi65kw60vU82CqmQNHz7O8AMGtEekTmm8Z3jVpatWXSlLUi+ zH4meXiDTqmLfo0iuf+NodKwCa1xJJL9tu+fRpZJzO05xVmDiL2chC7+cjkR7njhaqjY1ncvJAw B+0cDBkc2xmqzkcPJEDHLSpjgQevUemr6FU7FNIOATzCqWtYWpxpjsFJsz/qdS+SvZO5NE8xn+E ljhzpPh4I9wHTCdDjG18+wZO7i8Jcrts3jY5ZCb2l69tANtVFtAEeLwk9kjsy8I8gjoDtgFanQi Uh5+/Z+MSAu0OqEW8w+kLq1Ey0IV0YpJz+mN2L8A40A5kut9u7FVBlhESr03eIhVHHzPiXHdYRY /t3QuZn X-Received: by 2002:a17:90b:554f:b0:359:7b9a:2cec with SMTP id 98e67ed59e1d1-359be133b2fmr12308150a91.0.1773112851595; Mon, 09 Mar 2026 20:20:51 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:ee38:e01e:e888:6900]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-359f06f79absm1154608a91.6.2026.03.09.20.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 20:20:51 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Chun-Kuang Hu , Philipp Zabel , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Simona Vetter Cc: Chen-Yu Tsai , linux-sunxi@lists.linux.dev, Paul Kocialkowski , linux-mediatek@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] drm/sun4i: Use backend/mixer as dedicated DMA device Date: Tue, 10 Mar 2026 11:20:07 +0800 Message-ID: <20260310032012.2542334-5-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260310032012.2542334-1-wenst@chromium.org> References: <20260310032012.2542334-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Status: O The sun4i DRM driver deals with DMA constraints in a peculiar way. Instead of using the actual DMA device in various helpers, it justs reconfigures the DMA constraints of the virtual display device using the DMA device's device tree node by calling of_dma_configure(). Turns out of_dma_configure() should only be called from bus code. Lately this also triggers a big warning through of_iommu_configure() and ultimately __iommu_probe_device(): late IOMMU probe at driver bind, something fishy here! Now that the GEM DMA helpers have proper support for allocating and mapping buffers with a dedicated DMA device, switch over to it as the proper solution. The mixer change was tested on a Pine H64 model B. The backend change was only compile tested. Though I don't expect any issues, help testing on an older device would be appreciated. Signed-off-by: Chen-Yu Tsai --- drivers/gpu/drm/sun4i/sun4i_backend.c | 27 +++++++++++++++------------ drivers/gpu/drm/sun4i/sun8i_mixer.c | 27 +++++++++++++++------------ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c index 6391bdc94a5c..a57fb5151def 100644 --- a/drivers/gpu/drm/sun4i/sun4i_backend.c +++ b/drivers/gpu/drm/sun4i/sun4i_backend.c @@ -798,18 +798,21 @@ static int sun4i_backend_bind(struct device *dev, struct device *master, dev_set_drvdata(dev, backend); spin_lock_init(&backend->frontend_lock); - if (of_property_present(dev->of_node, "interconnects")) { - /* - * This assume we have the same DMA constraints for all our the - * devices in our pipeline (all the backends, but also the - * frontends). This sounds bad, but it has always been the case - * for us, and DRM doesn't do per-device allocation either, so - * we would need to fix DRM first... - */ - ret = of_dma_configure(drm->dev, dev->of_node, true); - if (ret) - return ret; - } + /* + * This assume we have the same DMA constraints for all our the + * devices in our pipeline (all the backends, but also the + * frontends). This sounds bad, but it has always been the case + * for us, and DRM doesn't do per-device allocation either, so + * we would need to fix DRM first... + * + * Always use the first bound backend as the DMA device. While + * our device trees always have all backends enabled, some in + * the wild may actually have the first one disabled. If both + * are enabled, the order in which they are bound is guaranteed + * since the driver adds components in order. + */ + if (drm_dev_dma_dev(drm) == drm->dev) + drm_dev_set_dma_dev(drm, dev); backend->engine.node = dev->of_node; backend->engine.ops = &sun4i_backend_engine_ops; diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 02acc7cbdb97..4071ab38b4ae 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -536,18 +536,21 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master, mixer->engine.ops = &sun8i_engine_ops; mixer->engine.node = dev->of_node; - if (of_property_present(dev->of_node, "iommus")) { - /* - * This assume we have the same DMA constraints for - * all our the mixers in our pipeline. This sounds - * bad, but it has always been the case for us, and - * DRM doesn't do per-device allocation either, so we - * would need to fix DRM first... - */ - ret = of_dma_configure(drm->dev, dev->of_node, true); - if (ret) - return ret; - } + /* + * This assume we have the same DMA constraints for all our the + * devices in our pipeline (all the backends, but also the + * frontends). This sounds bad, but it has always been the case + * for us, and DRM doesn't do per-device allocation either, so + * we would need to fix DRM first... + * + * Always use the first bound backend as the DMA device. While + * our device trees always have all backends enabled, some in + * the wild may actually have the first one disabled. If both + * are enabled, the order in which they are bound is guaranteed + * since the driver adds components in order. + */ + if (drm_dev_dma_dev(drm) == drm->dev) + drm_dev_set_dma_dev(drm, dev); /* * While this function can fail, we shouldn't do anything