From nobody Tue Apr 7 22:03:14 2026 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) (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 4146F3B2FF0 for ; Wed, 11 Mar 2026 09:49:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773222599; cv=none; b=VHpkwPdt5v9h3U4c7sxmPzSb/JzZTQDd/Bq0pTr+9S8ZFv9j+fleI7JAMriWL+R5KIOX0fN7yD+WuXAFlvKgP0pykxzwb3efAPX3O8rvlSE0a6D6faJDfwThiGpN9ByUm9CF+j97Fui/VQJ4fupf2j55lryrd4BGK4HZofJdEqQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773222599; c=relaxed/simple; bh=PTu8avjQH0uE2z2RBz4QfV8RqQGcOxGaplS8ZRyvoqo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WVliDlgCnOuj/oxQnwZHDNgoOX2jiNx0MQhKGwEXziPLGSRZALRBt7QvhcdJf9fFFZ2L+zAqF7z3X0KxZpji+PljiBYUXg042cWGuNuTcNuY29jnInTcaz/PgWOf6ocOBQVzbPSQCQ90tW/5aQQnLlEA96AzmlZww+VaAa44yQg= 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=n3zF/D2S; arc=none smtp.client-ip=209.85.210.173 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="n3zF/D2S" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-829b2018c94so2713102b3a.0 for ; Wed, 11 Mar 2026 02:49:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773222597; x=1773827397; 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=VT7ZzcC3UQ69KoSxqnkGn97mAkV5xCuC7gmeayRSfVQ=; b=n3zF/D2Sl7FXUnEGmauzUuUJE+T4eV/kDKuBJ52tQI7dvu3EK2zjQSdGdpGu+QBcbn 5Sijp/LfcgLSYUIdFZu8CsihqNLhWLnlnJughTKMNljnH0ShTuJwHkqF1NxoRRlR6GCx 7Z9C6vIyv87hDZAq2aNmvGLciAlcOTaIDtRw8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773222597; x=1773827397; 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=VT7ZzcC3UQ69KoSxqnkGn97mAkV5xCuC7gmeayRSfVQ=; b=uHTnoQQRJBy1u4J5Q6wycpqev4ApV2b6s0CD4igD7xM/AHFBU1ACoh3dMsblOI87+q Efu/XPFk4lpD+HZ14gkESzPP+kIbmHrivNGgh+pH7teRZHl2qbU6BkPJh/AsR2JiN6z4 36wA5vEaAirZr1zukacLiwxM13Q0e3qIGeYi5y7fr+EPkaaT3oZsC4gfv0lpGGzhHTnB 8uRAYkLwqFsi+uNgiugkgjdC29QZb1RjSZmuGW58Ns4gfsPeCeOBOX70+O5WlkzFN4FY fdU5uGsSv9FJH/G2v/g910i4AvVy9853rthL9YoxPFHQjFOnWS9Mh9G62HrtU0U5VWEq HM4w== X-Forwarded-Encrypted: i=1; AJvYcCXiUCfDOOh7dYiydHQQQ083FQ4OSYfB/98/LnixjvM4d976PLjKLeTDYAV5uGWuUz54r8DZVb01OWGKpGk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw8RQyQlu8t/grhJg3n8lDl84t+HPecptOlsn+3WcuLaI2txl8e czPQn5Vz8EYsCWC+xq5wFaO111GLPxf62MrEGugfH6c8uOQqlzD9Jd5Q2WE9eOHVww== X-Gm-Gg: ATEYQzyHkF9YidkVT6IqqLTr/QAWTDoVuW0qaJ4yo7qU32NqRew4W4kX8KEcd22M7O/ UVLHEJf8juCxXOgoCUoLK24cCXq8711stw19dkr6cZdUUX+qY9G80Ba+84EVMzC09PouwNxt1WY iJyOJ4pJttmF+PGJeJ7QAOi1N29dPEXiFQ3wk0AeUY6+X33R+U5q8q7ogwQGb7YivVd0KE1EAkK /58kyUSRoJYronXd5gj5kckCGtIJGzgw/kU2topo4waoKVXwXbRwdFv0HZEH1U9+z7xFM8TUWgc /frUcjSSvEdbeh3uLiWTuCgdE2Gar2nYtY0bTLEfkJkif3VpzBGsRAk4k9J5rgi6q3jkSwmLU2T dLVnrqsty/EMK2c5ODZZtSjEWVsHqvtDdZBVSIFecRc7gfdYwwcn0Lt505PtHm3/1hueD+ce5Tu xGo9zOooE1VMU1AvSzRBe2M6Q7mXABCg7ZHI+sf+Ag5b5kilQjfh90aCARUfblIOcV8ty0sX/+i vRexOpGT8cNbfUtO3w= X-Received: by 2002:a05:6a21:6e0c:b0:389:8f3f:50ce with SMTP id adf61e73a8af0-398c612795emr1755090637.56.1773222597656; Wed, 11 Mar 2026 02:49:57 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:805b:14e9:f783:bcae]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829f6e22f85sm1887598b3a.27.2026.03.11.02.49.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 02:49:56 -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 v2 1/4] drm/prime: Limit scatter list size with dedicated DMA device Date: Wed, 11 Mar 2026 17:49:25 +0800 Message-ID: <20260311094929.3393338-2-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260311094929.3393338-1-wenst@chromium.org> References: <20260311094929.3393338-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. Reviewed-by: Thomas Zimmermann Signed-off-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- 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 Tue Apr 7 22:03:14 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 471383B5852 for ; Wed, 11 Mar 2026 09:50:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773222604; cv=none; b=CGZUfEITG0m2JuonLa1IE+ziTOLFcaFv1ZWEc5L35XX4X24DNIpQBl2XjqGz8Tfzcf252Zqw4o7QbUIDajCdpmXxi6LCYjJM3vxkKAYUjcQVRwJ7zsZHY4fPAFXP9tNktav18kO8eOZzP3clSe0dL+7uoHT4ztE7mRzx9E9AzkI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773222604; c=relaxed/simple; bh=4pQgi2Z3oYVv09c19L/ahzU+DTz3ubvyJPz6+N7R/tI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XsdOyBDYCteB/qkoV8HzNY26Paj22rU4dO0KhCFbLrWPlarklr5fGzQRIxhdg4+kFZrK7gq5cLRJKE0kNuluTY7pPdcSEPYMQBj82CYqXDOXAYR00nvsV7Ze93zZXHNo3cMGL15JVjIsLZgpDtYEVCGfFlYViMrXqonosofdiis= 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=KP7rREHy; arc=none smtp.client-ip=209.85.210.177 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="KP7rREHy" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-82980945556so2703916b3a.0 for ; Wed, 11 Mar 2026 02:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773222603; x=1773827403; 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=jtkXXLPioyWW3Nha1qMzs0mPGG4eok73ub81lNtbqSo=; b=KP7rREHyzUInbuZnL1bzFM4hjKf0UImt26xM411pHXJKZlZuOQsaaavtGvdBK9rGpD qwWt2+TNSWyPSH7X+2L4cBW2BWqMoJuCuCsXK70koa5i9YphmyATEAA6qRHqfjs7pCK7 OzMQ7Fqey9oU71A3IszNX0Bqhhk+t5XFonvEU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773222603; x=1773827403; 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=jtkXXLPioyWW3Nha1qMzs0mPGG4eok73ub81lNtbqSo=; b=De3B+guwEYklzoxAYAZBwGMzZ1j7qPCyEAa1e4l5UQ+8p3G8n+wguA5uDxQUeyMIRI TYsILie8mw0BcZy1/xTIs44fSPiuayvggAV3a3vZFM7oQsepawVh5HrFN+H5CRpv1Kk1 QkeM59nII3tgPfPtuvHipX23I1dOSpfaqfbGx2gc/akZjgG6HdJ77zAnN1Nzu7Hz2x5A CCOTIK/kYs7IG4pe9ZbpZf5wtFAfCtdibYnlYblDKSPyN1EdwxvZoI+8TyAxRoMRXHi2 eJoQ/pRcGGs+nwXsMZc0Muzc7sCXSWBB7U8xwmo0mRVDBmOETwODE85iIumMypmIxX28 3nPA== X-Forwarded-Encrypted: i=1; AJvYcCXC7nfzlg8FFXh3pKdMspKSsEmNerAv3gCdC9QdbVAkIpd9cVyCvIShGaJ2f5GikqSXOi9VodTZt0bP4/c=@vger.kernel.org X-Gm-Message-State: AOJu0YwMZYorgTGMgIErWAWkIKanbqZ6Gy4f4+gKNoeoLABrYhs/wGbp cIvMD8QhqcM/fL7Fzr6AMi4MVJCGduNAUjh6NbTCKcNj9gi+nDxjPF+6yU2VD+Fedw== X-Gm-Gg: ATEYQzy6fBUOw2LjGlkEWHBi81kxJrmFa9XKsmFbMeY8lCh26goJR6PPz/rx6QJPow6 +TZ5iSoSxH1lEb7WXWcMgx3gacXjpJ7139eDrVFkFr0gVWMXf4y5J9NfeQW54PfrSRHnYdpd/5m f51SFoDGA7+3NsY+R7jWRa3HtrUYzSb4eWauX/p+fjKa8FSx1t1/k1eIIMXooBM7TL/8BqB9NvA hGCJ9LwUqF8TZ+m8Os5dI7sYYlY+cD8aeUK2wNbGe2+q0xHX//HmHHi9msxrYKBpqCi17tztpsB bZ7fP7AncUR3kHQ1+wfT2tuk3H2tHA1b03Hd47OarAeo108oUnRi+F60XNcqhHu3s405qWtbW5N Xw37L14q95kPJu2tfeX4pkk/9VgxdXKSpzckqobBXqkbCTx+hFA3eL8guxOqYc52o2XotjsKw+s y1f3CKQsHiLOO48zvT4lY7kYzBt56jTnGR3NnvdAYdV3hSy6SphIPITSTUmqWCwMcXYRe6Jb1MU Dfv70Gv X-Received: by 2002:a05:6a00:3006:b0:81f:9b0a:812a with SMTP id d2e1a72fcca58-829f70af1ebmr1872729b3a.14.1773222602308; Wed, 11 Mar 2026 02:50:02 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:805b:14e9:f783:bcae]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829f6e22f85sm1887598b3a.27.2026.03.11.02.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 02:50:00 -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 v2 2/4] drm/gem-dma: Support dedicated DMA device for allocation and mapping Date: Wed, 11 Mar 2026 17:49:26 +0800 Message-ID: <20260311094929.3393338-3-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260311094929.3393338-1-wenst@chromium.org> References: <20260311094929.3393338-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. Reviewed-by: Thomas Zimmermann Signed-off-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- 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 Tue Apr 7 22:03:14 2026 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.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 342203BD256 for ; Wed, 11 Mar 2026 09:50:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773222609; cv=none; b=s6gL6OwnOtUm98zGqKsKZRaxBv4iAg3AeC4hFVowdXwlzKAyNn+kI8PTG5jpId+wbWt51w134dYt6OMsPyPHr+orUSqKe9GQfi7C0LlFtCFfBnsGlDWYG/0EzrFymHGhad2V1pPIkzsJ+6KqO8jCUmq4XRhWFF18j8GqcRoF40U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773222609; c=relaxed/simple; bh=LQbrMb+Azt+i6Z84kTXHfLA6Ff9ZHKH0IIkLhDOx60Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fHEOY3mHdk+/xGP4dmalJVroP0OfBQTSOYCCFqklKFv6fD+OsRPnNvXEmjk9ISi2tYst7KJjECxgO6YUaq+n95q2u4tbBhfhinBNM0cyQcKCX7ppTcp3DxXQF2cSdBuIDr1gsnotPqd2F2YIi7Cr7ewaCfH4hiT8vfT7pCsqx6g= 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=lj3P4fpI; arc=none smtp.client-ip=209.85.210.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="lj3P4fpI" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-82418b0178cso7411010b3a.1 for ; Wed, 11 Mar 2026 02:50:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773222607; x=1773827407; 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=45E5GmiW2zh+KTTZWc3r6uENZ0vLv56id0nOi4Pktsc=; b=lj3P4fpIy7UknPxUSaHREit8SKdTM7e8tr3iyJKE0//9CNqLnl+Aq2c3/r2CNjVJ0k 7KolB0sMFHhV0u9yCaZfHEC5pQ2CZIJe+D/a22Ze9DD6Q13J143u1pL1irQiWZzqwlNp isErXEmRzDMXYG5sIB9ol637qZnLGMBJt1Lxs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773222607; x=1773827407; 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=45E5GmiW2zh+KTTZWc3r6uENZ0vLv56id0nOi4Pktsc=; b=nFiWrZ5vqZJswilE2TICFnDVs67OCzkCsdRpoLyDjtPkcjgipGAbOw3td8lRmX1YQt FrlwZFelsqdVi3uHJ4eN735wp/iIqb2fWjhxsMv0SbOuqmKmz7JZLKzrzykBfld4um0r jQUOY/uoC42x8m05u6L4indcj7PeKgeSBam/FapOD/9z9Zm9OQij860BLqlSIBiwzjyc d4MuFOHEDAlBXUpnGJILBz9uQnLumPCrrFIneh/Y7NqWyXubGX1FryHgIEcqxguBBE4Y x5nlKNappQcpLllVVzcjnoEGe5bn+w//MFcMnXMJOzjtumeNkBx+LRgwXrNyjtMcHsmn KRfA== X-Forwarded-Encrypted: i=1; AJvYcCWYeO5QWIQM64/nXjg5zETKWKAmvMF7q1h+PFK1D9woAm0ewNA/Eswb6fxqhgkycJmdOioGUBuOOsi1N04=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2g/yFY8emaIK8Q/TKMQ4GOQY5ix/RqTebDSRBwPSwDmwW9FrQ Qt4R/0a0sh5NQmJeFCKUEjXhNESoi37pqzhH1GfOPONz39+JF72cKzcBGrLFikf3OA== X-Gm-Gg: ATEYQzxa29giAFDIJ6Mc8yy2iKmyOd9fL/mIaTXkk8qxlGR/ECksnVilHNalCAIqm2k qgmnJroduA200+hA5boX40RuYX4/Pcm1E40IyfCFcMWJ4GtevLpHutLXPsjmp0hirVFtCI5uvjR UIhGjPpnTT+0Do5JXaB1AjXKPq/Ni4ZwABZq8Z7GhSoGTyvYRb1X50fHW1yocQikkGbBdeAe3XY jh/wmeljHfPb0X9EUBlK1N+N7sfx3/TVy8HSd1IisfKsSx94J5QNL58wOTIQ2yow2UNNvV4V8cH asiQCw6h3HdJ8FbOVEYrUIQjN/VL9UbmxHV5T5WU2B8PF2AiP0tVdKyCVdFPbVK6iJ/dUfFsXPU NnC76n4P/07dfWDZ8LgSHRy6Ws6kBuaPCjETlfmgrS9OL3Uuve+jw/i1oOBpeeoFzfoMMzDX6Z2 yqnVcbocAcBSnxrKF5iqWSRUGEwr2S3IM+Csv12trWaSgoZv9T1fVi4Wz/7tF0gLYuDm+mJDtqC Nxy9PTW X-Received: by 2002:a05:6a00:348a:b0:81f:3f10:6b7c with SMTP id d2e1a72fcca58-829f703e320mr1891131b3a.28.1773222606556; Wed, 11 Mar 2026 02:50:06 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:805b:14e9:f783:bcae]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829f6e22f85sm1887598b3a.27.2026.03.11.02.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 02:50:05 -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 v2 3/4] drm/mediatek: Set dedicated DMA device and drop custom GEM callbacks Date: Wed, 11 Mar 2026 17:49:27 +0800 Message-ID: <20260311094929.3393338-4-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260311094929.3393338-1-wenst@chromium.org> References: <20260311094929.3393338-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(). Reviewed-by: Thomas Zimmermann Signed-off-by: Chen-Yu Tsai Acked-by: Chun-Kuang Hu Reviewed-by: AngeloGioacchino Del Regno --- Changes since v1: - Also remove reference to mtk_gem.c from the Makefile --- drivers/gpu/drm/mediatek/Makefile | 1 - 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 -- 6 files changed, 3 insertions(+), 269 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/Makefile b/drivers/gpu/drm/mediatek/M= akefile index e0ac49b07d50..952d294642fb 100644 --- a/drivers/gpu/drm/mediatek/Makefile +++ b/drivers/gpu/drm/mediatek/Makefile @@ -14,7 +14,6 @@ mediatek-drm-y :=3D mtk_crtc.o \ mtk_dsi.o \ mtk_dpi.o \ mtk_ethdr.o \ - mtk_gem.o \ mtk_mdp_rdma.o \ mtk_padding.o \ mtk_plane.o 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 Tue Apr 7 22:03:14 2026 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 AD2E33BC67B for ; Wed, 11 Mar 2026 09:50:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773222613; cv=none; b=hkaYydS0DfXdvuhfToQjG+/IBfh3gF8osMRlJmef3JTMY2LGQ10idRhXrfsjJeVtgzYXAHOfnuLYSYJRVtPLKBF1oQrrkSOGSrZTHateL+GkKq+gbBglwiQNU7axeo3DbhLylBIiblQXIdIIH94m57npRcoeYwAwV67GqK8QR28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773222613; c=relaxed/simple; bh=rfD7Le/WZjv74zhcuW0yU+5NJ1RZ3lo7zccKLiSyBcI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=khWSdiypJ5Aa4h7D76Uip9uV9CWMiGe0LuaQwvs7z+8XlvyZjchoZv/mlGkurjJ8J0pU6bO2UcJvYe1o+Ixm4Otdf8lONY0Z2sIsV8npd2uD6S2O/muENavM5jZwr2gh284WvEOUZmEgMisUrfE7rtHgfzsb81cElcn11pTy78I= 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=AxZU6EKK; arc=none smtp.client-ip=209.85.210.181 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="AxZU6EKK" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-8297310ce0aso4406076b3a.2 for ; Wed, 11 Mar 2026 02:50:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1773222610; x=1773827410; 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=AxZU6EKKoLLjneEjhFp6an/u+gvGCv4X2VafP4f//FEgM5e8fPsYzUaCjJIwLMz/jR eK53nEENq+6Lz5piEbxrCFWcKYkx5lC6fSnzphDbKMe5q2j2nxvCLkHEBYio3KwZuq8r FiAy+HNF77B13icvk7Um0YitiVqzUZSk4wma0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773222610; x=1773827410; 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=vlu8stqlWuOfSklsbWJ1TJE0h/SlVHoT3oMyezIYFUheT+cI90hYxHvN7IYDMaxWrI gQmFXTW0affS9X7oaOQofUgczTyOeV7uV8XZ7drX0pvcguiR7VtJbrw0hHsRWmmD2Z5F 2JeltFvPHsOTK9D+7aKa9dllhDjxLNu1F3aWGeCumXt+ZXU8SqU+e5speVaJ68wQ9iZx hsk4oAm8PrCr9Q3qPMGJIXegdUy2nyamgx+PCu6U9NSfhu/xdLlqQH/rLMJxTJEOm8WZ qDHvWGJ9g4FFg294LOQIjUyER2I3DtszVwYcGaf3TK0qXPMRwgQfuKWZG+l8kD1eHudh S4yQ== X-Forwarded-Encrypted: i=1; AJvYcCUk05vlJxqZEL51sNDTDDALCq3jEw8/7oxhpTCAre6h5MI6ZYeJA5qe5U+Zv8pchOa6zWe20Kp7TRCIJdM=@vger.kernel.org X-Gm-Message-State: AOJu0YyKyxYz/q0cDacfqzA2PE/voxOniGcGmIFvwtgzl2oseYJeNPtp pSEqD97Sc17XRClYCWERTJ1Ahejh9M159WBDz5vuZbYhJo6eo1ryjTAgDfOGmjMs9Q== X-Gm-Gg: ATEYQzw8jUAyYjZYrdbHIrg4F2NF2YWwMED9fBGQloGu1tlJ1EfWz9eOqwnnMvLmg7t 8Cu4d8yNJbt+g9nGvCvggO71ce0Ye7EdHI014A6nSatLAtFLlZUMv+n/YMLk1NdnyAWbtAQY7ZP 14JdyQ9azNJ7TkEOQb1028NHcuAOgTtDtnTQviP3WsB74ODUdEtqr2ul72haiPejNOSm65Y6qe8 rgNrOlPULS/mWTPLp+C5lUMhI8a+Gcg7g84Op/y9k1rNintvj5i70t8XzJQkQ13NtlayZ1hkZ7O 3l1UqoB9KIRTxKoJYUaY9pfaKAbjXifaj1QUeX0ChAdwaMk24Ijr1K8YAbp494vhnc61beSaefo zN7wMee1tsYJueMyZQfVV6/XxFJcG9XnIfqIgGSO+SxVerslAWf4Q4b9Y01D9wpL4FoFZhG+rqq 7xjDTfVmgkOgrtqAdTraEDbaM6He+leBo7vQvHU58kzz1voCGivnPdITAyiyjWBjRarVZ3E4hZ2 I0YOzpD X-Received: by 2002:a05:6a00:950c:b0:829:6f28:1d6 with SMTP id d2e1a72fcca58-829f6e7b408mr1826676b3a.13.1773222610050; Wed, 11 Mar 2026 02:50:10 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:805b:14e9:f783:bcae]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-829f6e22f85sm1887598b3a.27.2026.03.11.02.50.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2026 02:50:09 -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 v2 4/4] drm/sun4i: Use backend/mixer as dedicated DMA device Date: Wed, 11 Mar 2026 17:49:28 +0800 Message-ID: <20260311094929.3393338-5-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.473.g4a7958ca14-goog In-Reply-To: <20260311094929.3393338-1-wenst@chromium.org> References: <20260311094929.3393338-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 Acked-by: Jernej Skrabec --- 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