From nobody Thu Apr 9 08:13:33 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 31D1F3B95EB for ; Tue, 10 Mar 2026 03:25:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773113147; cv=none; b=U/IdUNjxbfKwirDO668kqbWs3CxILdgmf69PuNBilCdFRfi01FeFizYXSSlLEsczxwHKBah4U2nzqre+KqmhvKOMvUJ5P3bYzeA0WsZGwfmMaUrdaBgHl4bhs4hjbyV0xG1585IW12DU26QpcbvxyF3jbZzSAEjACe3ACQX2M2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773113147; c=relaxed/simple; bh=oAfrAdUsiN0HiFEo2w26stnO59aZMIB4kMYEsBwkc3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=altdOvjelxrfk5Fs9x7H4DEi4VHxJ1ZOZTXdf6woU+N50LsS3uhuYKFqcPVwHDjevSx6NWizCWClVZ5kpPlZSPeq5ifvldsMH1sVxNqaUb25HOWIiQ17k3jiCbi+PK/+AeK7lqskT+npiWy6Hbhoa1JObgqsbYKgvf6Ey/sRPVk= 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=jIjWhNtL; arc=none smtp.client-ip=209.85.214.172 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="jIjWhNtL" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2ae4988e039so60248635ad.1 for ; Mon, 09 Mar 2026 20:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773113144; x=1773717944; darn=vger.kernel.org; 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=jIjWhNtLLDFVSBNG6lrmL1HDlAtfv2Z331AUuV0c9O4ybN0mYrkyvUNOzUP+L6Lohg KKZoArsVJmgqj/X8ruJR/DpAxXwUDjvRopLqKFMuwlxgX7L6UbzAUMZINh5r8mxI2xY1 Jsa4bzKgvQ5Ev20dRCent3VD5pSEUk6v50TI4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773113144; x=1773717944; 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=a6CGg12ag9GA1pJZSoBcFAXiqd0WTasExNUKESBb4lf1bFtgieH86xD/fjqV3EbIs7 QtVdH4hCtAIM6vbFDxekbrILbmQ0j0hI3K8lVy/BbVxtvxxXXiKd/m33XrTT7pUxfobj 398ZEisZv+k1m4ioEmS/MXOPUojLFJk3MBSEoBUVPCaXPdrUOjzCpllJeeEefa3uXUdo L6Ft0F1qCGNjDca3xVJmQfTAcaRdDlRuGHB+ABbJRi8T8LxLhxMws/5HJ5bctxGiIVfX GYhpLzFpOnaxa+StuWMfoHXlcqFjMfGNTQnrRkB+UneSCYtLneBFls4dmjoI3PeSTaNM mE9Q== X-Forwarded-Encrypted: i=1; AJvYcCVwSwhm85g0lGK48ydfSNalHLr/cdL2YZ+N47vKnY92K19LNZ+Gp7n8wZQ6wSINP5KtH2/sY00rghJpZPk=@vger.kernel.org X-Gm-Message-State: AOJu0Yzx9lzD1dbxk+iWsSbRcFACnvRcNht2uc02MeFdlB6Wa83/SRg/ Euej8TN6BymgtZFiYvhAHeDaPO+Ug/YKWzoZCsQUD2JJsSq2G0TsjLvo40NQUvS2Qw== X-Gm-Gg: ATEYQzzn9TRZhnoCwsoKSOpGlTe9Sz6pHdZlE1iux5Opqh9msvt/cjZE5cyNecy1ZSb KbibuphHnsuRRuJaj+8Y7BdYgzgGoDbK6D92pmcbXB7H4O1YRBbT8cHzkWM2wbyYbxz/+rQ4IYp bVRY1SrPUaTYvcc7shXAfVpOWJqwcxKfGTaF3fHRzKyXpS+0tjAJYApL15EswDDtHS//HWHEeUl Pb+GX/o7jjLKmj4GyS59oPn/4osk72TrmjuadAYyPmZnvsfx0hk8WXPH5UNMRgVFtTKQNcWezf8 xgK1M09YqBdZQkV3kiWWVhD4rrMvMhu34YneLveya9oqnZAcb4JS1Wv4KPYNZQDRrJ46G4kwx90 vfHc8wf4mTKeMuS/z9nUJBhA9TLiR5toiX4Popj3lwT0CjnOzVLeMKyzmd5Z/4zaUEOxiiqBjsb EXTYWtkdd8n94407upAOpkc9txg8cFjaFfIJ57nAe5URQkr/NRO68NA8H9ulTFigQExyhiwZIsb /PUwxRs X-Received: by 2002:a17:903:2349:b0:2a0:d454:5372 with SMTP id d9443c01a7336-2aea1f2f79emr17542375ad.22.1773113144386; Mon, 09 Mar 2026 20:25: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 d9443c01a7336-2ae83e575e6sm126695095ad.5.2026.03.09.20.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 20:25:43 -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 , David Airlie , 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 RESEND 1/4] drm/prime: Limit scatter list size with dedicated DMA device Date: Tue, 10 Mar 2026 11:25:06 +0800 Message-ID: <20260310032511.2545500-2-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260310032511.2545500-1-wenst@chromium.org> References: <20260310032511.2545500-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Thomas Zimmermann --- 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_devic= e *dev, return ERR_PTR(-ENOMEM); =20 if (dev) - max_segment =3D dma_max_mapping_size(dev->dev); + max_segment =3D dma_max_mapping_size(drm_dev_dma_dev(dev)); if (max_segment =3D=3D 0) max_segment =3D UINT_MAX; err =3D sg_alloc_table_from_pages_segment(sg, pages, nr_pages, 0, --=20 2.53.0.473.g4a7958ca14-goog From nobody Thu Apr 9 08:13:33 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 05115399007 for ; Tue, 10 Mar 2026 03:25:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773113151; cv=none; b=f1cw//2XwJOwd2C8VmVnV2QksU69jDXPODAZmQYVcELiuslRBvYids7nagslQqT/TZderXbKAwM9vjg476eV5iri+8KozYiLgGeY2BgXZFwZtcHut6S/Tp+nrmyT5lN0o6Le6Y5Qq325sjjv09LLBnOrJnrXuWIEQvXovFWZXGA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773113151; c=relaxed/simple; bh=1ifAvQ9YQ7quAs4EUywvSzDs8d3qnqjGmcOWLHUYZwg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L5mFo9vDVk29Un/FFwayvo6ygK3QWed8dOSwOkdrMVR0H/k/AP8uqSOZOFXvAcKy/G6poUrCvT3OUWk1bG+UN6Skc0+3a/9UAAZ0sEwm3k1XCUqR/mT1vpYC+M9zhTBMZ/vW/boEfvf8gZd4VJSWhKbq5hoXWShsiIkRIEvqwv0= 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=fMpZFjKP; arc=none smtp.client-ip=209.85.214.171 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="fMpZFjKP" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2ab46931cf1so84671985ad.0 for ; Mon, 09 Mar 2026 20:25:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773113148; x=1773717948; darn=vger.kernel.org; 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=fMpZFjKPnvhE/9mTumOJeOwmelA4Ajp/bnEtAOXdRh7KGkG6ODXeuPWrm6EO9Q34ll rF2JJ6kXL3hxnhn6axG7AU0Y7TYAxTWUl8K6DOYQ0kl06wUsstOx7cD3xWYmeTbXFZx+ hpH8E+VFigGrLOMyCFx6gd5JcmI0B6VzzRez4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773113148; x=1773717948; 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=tNo/YlrJuXgpBSJeGREDjlJZRpkJ7nX1RruJrL8gvlx2pprKOGvIoZtYH+41AzTGh8 W+iXbUf2zPM9L601eAkN9GZKjlJDP3vnE+r7jCAfNhLZP5ZD5I4mhb+O5JQ98gpgG6k0 vtE1OU6giN9dJdsgHJfo17h/+AeR0Kb9Nm+K1+MipIVfwJB48HknyCUNQeHpE8vNNl7S 7aneZQs1lx1c5dcUlQdM6FMXk2PvrmmPgjER+hTodzKRwQHZUc4KQRuDu9WG7+qzC8++ V9+6iGv/R0kgYO3zNAROGgSLf/hapl76+d61X48mRzwncz0u5FFLj5gg05pucBC3OmBB eCCQ== X-Forwarded-Encrypted: i=1; AJvYcCXxa5KCztCXusX3SBuvjxx2OyavYZr4hqY+/+zBgWvvPnHE+XI6r2WpfDmJJ3fJeboAoLxFi146gQYI4pc=@vger.kernel.org X-Gm-Message-State: AOJu0YzprNU7JxoRezvlyRXw4Ii4aF6aqHzfNjV8w4nGxenN9XPRM+bY 4S4IzKz1nD1UMozPORBbEPBJY6eidL9qPcQcAv5wwRgbDz19x25Yw/ny/utXvc5T0A== X-Gm-Gg: ATEYQzygyziv5ry/9Rx9fBRvFhZZ5mr4yHL/SjKV2h7PqEDzyMGTctU+l7NChYbekE0 I+2l0wVFe96Y+qDwgDBbRlDDQvF+EDwBoRr3qa7Z6TPlhZSKQidogH9qtyl6Y+4oC4UD1nm2ZF/ ARWgPfd1VIHN742747lE8woJrbkX3P+0ta4hm1D97yh7DZzsKImwapXTmkX8jlN9y8pIIuwViPB FEQAnaQv5aaGNPcP9t7yIHYlMxx3/q45cQnyRIAkmvkMSDJpJT4oEobO62R1nCUfpQTYMOOv5h/ +Yq3oa3SOWsmWUdjHlWhtNCJMNcotFjirxZLpgb0shLYuxHs1zjM1s+lw6UM6xE/P7lp55rNrRj ahbTAVBpATjRkRKmNlBfGnUu2N0GqvwepIq4asHUT9KiiJEB1VoK3AIjriyQdo5XCkINVkp99pD OPmzvUcnn61Xz6B8V3FokA7duVNhbgeRV8Q15Y9HN8Dz3ANHFdka2M3qH5vrwIFhljk057UwG+O +Ho57fdE9RtOWCbENo= X-Received: by 2002:a17:902:da2d:b0:2a7:aac1:7201 with SMTP id d9443c01a7336-2aea197b887mr18842765ad.3.1773113148339; Mon, 09 Mar 2026 20:25: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 d9443c01a7336-2ae83e575e6sm126695095ad.5.2026.03.09.20.25.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 20:25: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 , David Airlie , 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 RESEND 2/4] drm/gem-dma: Support dedicated DMA device for allocation and mapping Date: Tue, 10 Mar 2026 11:25:07 +0800 Message-ID: <20260310032511.2545500-3-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260310032511.2545500-1-wenst@chromium.org> References: <20260310032511.2545500-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Thomas Zimmermann --- 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; =20 if (dma_obj->map_noncoherent) { - dma_obj->vaddr =3D dma_alloc_noncoherent(drm->dev, size, + dma_obj->vaddr =3D dma_alloc_noncoherent(drm_dev_dma_dev(drm), + size, &dma_obj->dma_addr, DMA_TO_DEVICE, GFP_KERNEL | __GFP_NOWARN); } else { - dma_obj->vaddr =3D dma_alloc_wc(drm->dev, size, + dma_obj->vaddr =3D 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); } =20 drm_gem_object_release(gem_obj); @@ -432,7 +435,7 @@ struct sg_table *drm_gem_dma_get_sg_table(struct drm_ge= m_dma_object *dma_obj) if (!sgt) return ERR_PTR(-ENOMEM); =20 - ret =3D dma_get_sgtable(obj->dev->dev, sgt, dma_obj->vaddr, + ret =3D 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_o= bj, struct vm_area_struct * if (dma_obj->map_noncoherent) { vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); =20 - ret =3D dma_mmap_pages(dma_obj->base.dev->dev, + ret =3D 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 =3D dma_mmap_wc(dma_obj->base.dev->dev, vma, dma_obj->vaddr, - dma_obj->dma_addr, + ret =3D 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) --=20 2.53.0.473.g4a7958ca14-goog From nobody Thu Apr 9 08:13:33 2026 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (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 D37953BA237 for ; Tue, 10 Mar 2026 03:25:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773113157; cv=none; b=N6F42ga+CUPuht1IzPGYdSz8BUP5VyamqL2RF/Gv7VMuAuM4GV29jMguKKwN/7QL0FxSMnbhQtpORE8hyqQJ3tKIm7Ob0PTOFj7sY+q8/ezjGB2Va554UIT8tYLdW/SYYE5vxY6T+x0bZdARVV2SAQEBn6f08wSk+9PKdlDsjzA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773113157; c=relaxed/simple; bh=ZUTtKhFYUcr1uwQQLp+Ulkj0oKOWmg5PTveRDJGrDZg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OV8YuI7J3YovxO5SQRM4hwRXt84A2x5l3IlmAKWIEgvWuIKfZHebNCe3CNf4DpWxqgzZu6fWUB70PatCwhhkDbvje0iAQrh+L0mDoeD5l7k3LizlTQYCphWtF0ZjvA0zCjKDJpO+WEIitOWgQjCs9e+pbM6TrPVobn6nNsDSdLA= 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=QvajV7hg; arc=none smtp.client-ip=209.85.215.182 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="QvajV7hg" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-c73bb6662d8so356276a12.1 for ; Mon, 09 Mar 2026 20:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773113152; x=1773717952; darn=vger.kernel.org; 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=QvajV7hgtRAvLpGSbsHvxxtGVXSjrrKPnu6sYWhhuXD/B5Yp/+NqRrMlyIucUvXAAu 0LjLWAWTU49PmPaqUZADWUs+0adohs3NAJgegj0T2DDoe7q3ebrDJmc50rAzhJ6W8sdN FwdbjMsD6Dy6l9PhsX0UHsaP/hCv1RQnVPfPw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773113152; x=1773717952; 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=fnlBJQDwPIzA/LgDErXhySRr3flPsPnMCFFnsWbJLI9XJFS4UEbmdmoBm+gcLjBKyE oVOUXHsG1OloOtrJX3pYd1csOASIBLSjau9r5x8qmqDQ/KCXz6Sc9Jsz032nLHPxTYkt 7LkXuCJYO2RpJW9FoRjhrePdruJUp/T/nO+PMb4oHPfbcFHff22HCty+flboQRxB4Di1 mzpqnl1/zvW2fr9kMAEfdCYJRXmX1TJ5ek/EdXnN38KJvzcRvdFCb3QkFyp2SVgvewEs 23I5SJceF5J7FfLRizH0cbVWhAV3yzjDMMfG/auC516IyKHSryjmJshNoZmvon3ThGMa 6YSg== X-Forwarded-Encrypted: i=1; AJvYcCXLZrnkcD2hjD21aGAPJbLNJmcRQNlCyN1b6tRQQdPo+TOGl/OtqILSSLdrz0NY8QdX24cNa5Z33LQfTus=@vger.kernel.org X-Gm-Message-State: AOJu0YzY0UNNCtqYuGnUyZ0aKFctFInie1JcUKQ7oN/dzjV95HCCXlmf /e1R497KmjL3YM/mE/9CUo7J+aaG9EjFn/vgCfaQfSYmrFQRdF/Eo+IsCSorfuV76Q== X-Gm-Gg: ATEYQzxDs/5jQRcJZBcRNukLh883Db59VktOiZhEKKIwraj1O/vKQ/uMVlUQ6UPnpzb aO9pjhpsosxk8x+AOBP864rctdaS+j0GsReIr5mWvZCHFRzU3XSN+WzmwXr613e+7WeA90mJj8h +Z2RqaxgxZb1QsFGTuCrWZYTPln4we85zl6dSRGbAVZm9ccAabmmYKdc1gS9jpMJZAp+eXdXH/j /D+4YvQT25fg/rTtFEbZAOw0W+aBzMD0+D5BnEOqv0yK0vK02RSQEJGUUl51VUJ3wR8KAtlU8ad rg4gcRErGoVfGx0DXSPaA/YCKTehAcZ/OMb6pwAdiqPdErZ1Kl4q2rb+cDeKt7FZfdY5jbef8z1 YtKknLdED9gvvwCL0LRmaSvnOtyqEDkUEDbp5E8J9Uco065nFCByv05pR8sJLrlBbimTLy77yV9 xWc3Y2xzxQaigd1agzFWN+qKtD0sulcZQ4Fsf+QvjKsUQN1yxvG2Uvef03ROVgJibtU4psp0yuw pf3Ot/+kodXhJ+vH8w= X-Received: by 2002:a17:903:2308:b0:2ae:7ed6:7d15 with SMTP id d9443c01a7336-2ae824dd2camr135797415ad.28.1773113151793; Mon, 09 Mar 2026 20:25: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 d9443c01a7336-2ae83e575e6sm126695095ad.5.2026.03.09.20.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 20:25: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 , David Airlie , 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 RESEND 3/4] drm/mediatek: Set dedicated DMA device and drop custom GEM callbacks Date: Tue, 10 Mar 2026 11:25:08 +0800 Message-ID: <20260310032511.2545500-4-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260310032511.2545500-1-wenst@chromium.org> References: <20260310032511.2545500-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Thomas Zimmermann --- 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" =20 /* diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/media= tek/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" =20 #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; } =20 - for (i =3D 0; i < private->data->mmsys_dev_num; i++) - private->all_drm_private[i]->dma_dev =3D dma_dev; + drm_dev_set_dma_dev(drm, dma_dev); =20 /* * 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) =20 DEFINE_DRM_GEM_FOPS(mtk_drm_fops); =20 -/* - * 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 =3D dev->dev_private; - - return drm_gem_prime_import_dev(dev, dma_buf, private->dma_dev); -} - static const struct drm_driver mtk_drm_driver =3D { .driver_features =3D DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC, =20 - .dumb_create =3D mtk_gem_dumb_create, + DRM_GEM_DMA_DRIVER_OPS, DRM_FBDEV_DMA_DRIVER_OPS, =20 - .gem_prime_import =3D mtk_gem_prime_import, - .gem_prime_import_sg_table =3D mtk_gem_prime_import_sg_table, .fops =3D &mtk_drm_fops, =20 .name =3D DRIVER_NAME, diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/media= tek/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 { =20 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 =3D to_drm_gem_dma_obj(obj); - struct mtk_drm_private *priv =3D 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() erro= r. - */ -static struct sg_table *mtk_gem_prime_get_sg_table(struct drm_gem_object *= obj) -{ - struct drm_gem_dma_object *dma_obj =3D to_drm_gem_dma_obj(obj); - struct mtk_drm_private *priv =3D obj->dev->dev_private; - struct sg_table *sgt; - int ret; - - sgt =3D kzalloc_obj(*sgt); - if (!sgt) - return ERR_PTR(-ENOMEM); - - ret =3D 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 =3D { - .free =3D mtk_gem_free_object, - .print_info =3D drm_gem_dma_object_print_info, - .get_sg_table =3D mtk_gem_prime_get_sg_table, - .vmap =3D drm_gem_dma_object_vmap, - .mmap =3D mtk_gem_object_mmap, - .vm_ops =3D &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 =3D round_up(size, PAGE_SIZE); - - if (size =3D=3D 0) - return ERR_PTR(-EINVAL); - - dma_obj =3D kzalloc_obj(*dma_obj); - if (!dma_obj) - return ERR_PTR(-ENOMEM); - - dma_obj->base.funcs =3D &mtk_gem_object_funcs; - - if (private) { - ret =3D 0; - drm_gem_private_object_init(dev, &dma_obj->base, size); - } else { - ret =3D 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, s= ize_t size) -{ - struct mtk_drm_private *priv =3D dev->dev_private; - struct drm_gem_dma_object *dma_obj; - struct drm_gem_object *obj; - int ret; - - dma_obj =3D mtk_gem_init(dev, size, false); - if (IS_ERR(dma_obj)) - return ERR_CAST(dma_obj); - - obj =3D &dma_obj->base; - - dma_obj->vaddr =3D 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 =3D -ENOMEM; - goto err_gem_free; - } - - DRM_DEBUG_DRIVER("vaddr =3D %p dma_addr =3D %pad size =3D %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 =3D DIV_ROUND_UP(args->width * args->bpp, 8); - - /* - * Multiply 2 variables of different types, - * for example: args->size =3D args->spacing * args->height; - * may cause coverity issue with unintentional overflow. - */ - args->size =3D args->pitch; - args->size *=3D args->height; - - dma_obj =3D 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 =3D 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 =3D to_drm_gem_dma_obj(obj); - struct mtk_drm_private *priv =3D 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 -=3D 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 =3D pgprot_writecombine(vm_get_page_prot(vma->vm_flags)= ); - vma->vm_page_prot =3D pgprot_decrypted(vma->vm_page_prot); - - ret =3D 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 *de= v, - 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 =3D mtk_gem_init(dev, attach->dmabuf->size, true); - if (IS_ERR(dma_obj)) - return ERR_CAST(dma_obj); - - dma_obj->dma_addr =3D sg_dma_address(sgt->sgl); - dma_obj->sgt =3D 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 *de= v, - struct dma_buf_attachment *attach, struct sg_table *sg); - -#endif --=20 2.53.0.473.g4a7958ca14-goog From nobody Thu Apr 9 08:13:33 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 D67C43B9605 for ; Tue, 10 Mar 2026 03:25:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773113158; cv=none; b=dl0d2yTiL4+5EDqep0y2ksOgSY9i4D9KzCzpk71uJELTC2trEv54KjuincLvW95oAm8M03UFEby7+EhAWWnu+JMicj+Xn1K+YlC5n281xbx5qFkRoYHqUDNzBV+yDfDeG8PPw9xCw80RNZVd7OWy1qn7aLp+fRfOaV2bi9OdDsY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773113158; c=relaxed/simple; bh=rfD7Le/WZjv74zhcuW0yU+5NJ1RZ3lo7zccKLiSyBcI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RBwAv2GbELlOKwYYdgMwt/YUEuAOZLl2+fazjwGMZ4zKecXVAr7dRmZjzeQ0RbnJPUrjXBdL+5NhhmwYnEHD0X5xu202zoeHsslllOx/3NLru9ZT5DyRUtUc86CrpCVyc6xyop5BnM3tlyzc5uR4I5hCzATnk35gLAwpQlEsvBw= 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=Rf8i7QoH; arc=none smtp.client-ip=209.85.214.176 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="Rf8i7QoH" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2ae5423b02aso57663975ad.1 for ; Mon, 09 Mar 2026 20:25:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773113155; x=1773717955; darn=vger.kernel.org; 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=Rf8i7QoHUxHSmckQXTHAvZqcoGW0XFuGM/WOU4fn2JEQkx3t7XB6PRBOfaansklMA0 K8fB+FJFFnYzJGloahdhhVeupPJp0gRfHlFVmIOEfkAR8QBXqXwoqF7N0hCYxVeuCjt6 FL+xq+ZJCLxI95aFtbx4i9VyDlgXU7NNr5zgg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773113155; x=1773717955; 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=HyoDmLNmxjrIDNNLdDMbeGAmLwF3ZoIPXVM2DMOt/6iMKyoX+rXEaE+ta6HNeOdsvl Lj0z07WC32N8zkvtw7pyjswJvrA7vMVQJwPFygndnDMdvYWw4zmQBkVjbt967LV352Xv r7lUCGIel7EXcCBk/NZZsOXujjrWGG6krPcuTfxmKeZwnbX65lY0a0iOSoFfYJ9ii4qR 9qsfFuXhUw1kiZHS4PcA0mbmNHqykA+PbiKviyf35+RTvt7k4u4e8YDsTtW7CjWNNgJS MRCH4rn1Ncf+uvfHelDe4Vi7DmY+jGXRpEMBos+0UlBlsPkNQEPLFKt+bqP9htRi8msv vfZQ== X-Forwarded-Encrypted: i=1; AJvYcCXPlglM6+fAhxEWSR4Ug2uXG+9FblxCIhyjcUDalFrAM73D52NUy74G16RdoLZXWXrbmkLj/YoCBt7HEKE=@vger.kernel.org X-Gm-Message-State: AOJu0YyZEp/Lq49CUcm/CG/0iEoSaasVprjsapOJq5/Oz0i87jAID++2 kzJYir5vM8YLfHSLOztu0dU+TyquYGDgqFyYQqJL56IYGP8P2bpCwormxI6iOvfZ3g== X-Gm-Gg: ATEYQzzlkGBXnlQFmVim0WHGlF1DV3SREjXV7OY1DrrJt7zB9DX26E+58nJsxOo1yx6 /izcYN2kIcxc047Bx2ns4X+57OJ2X14ZOSbjLUh7GRZufcSsjlbcwuBrI07whBz1lLBRs9LwWgu H31FI3qw5sE47fiWv5fq8IJEm7yUqsbp/SEQ8BlfsfYlOyvXadZKggKyWRL0CIE0NhLwhPzAcAq TBRWKD2xIpzznW4W6e/8riV48uoiN5mqhKtkjiOA8mGWhmPir8XWn+s5hIIWsC9AM6ehCDlLbXc yvWBAhnf2E/pXKbyfKIailj2BdLyqlgeINJS00PGdd4UFs8qYQFpTkFyn8YANLhhO9JQpRZFBvs s4RXNtA9Acz1yOQ9/djBT8sHMn0hxPEZWfs1feIqriaIzBj6PJ4HpRbFtHKZKuq7NzVyCqFL804 3tcNrfHaulUmY9+SR+SWKMR2eUOTc+sXMw1r7ifty4GBv6DEAemNElsHMMaIN/hVjsxVqA8J4c+ 0HGBSmw X-Received: by 2002:a17:902:ec88:b0:2ae:54b2:27c7 with SMTP id d9443c01a7336-2ae82459ca5mr139254635ad.39.1773113155156; Mon, 09 Mar 2026 20:25:55 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:ee38:e01e:e888:6900]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae83e575e6sm126695095ad.5.2026.03.09.20.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 20:25:54 -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 , David Airlie , 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 RESEND 4/4] drm/sun4i: Use backend/mixer as dedicated DMA device Date: Tue, 10 Mar 2026 11:25:09 +0800 Message-ID: <20260310032511.2545500-5-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260310032511.2545500-1-wenst@chromium.org> References: <20260310032511.2545500-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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, str= uct device *master, dev_set_drvdata(dev, backend); spin_lock_init(&backend->frontend_lock); =20 - 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 =3D 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) =3D=3D drm->dev) + drm_dev_set_dma_dev(drm, dev); =20 backend->engine.node =3D dev->of_node; backend->engine.ops =3D &sun4i_backend_engine_ops; diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/su= n8i_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, struc= t device *master, mixer->engine.ops =3D &sun8i_engine_ops; mixer->engine.node =3D dev->of_node; =20 - 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 =3D 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) =3D=3D drm->dev) + drm_dev_set_dma_dev(drm, dev); =20 /* * While this function can fail, we shouldn't do anything --=20 2.53.0.473.g4a7958ca14-goog