From nobody Thu Apr 9 09:48:36 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