From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8A56EEB3645 for ; Mon, 2 Mar 2026 23:25:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EC27910E5EA; Mon, 2 Mar 2026 23:25:19 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=deborah.brouwer@collabora.com header.b="VSY0B1P8"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C94010E5EA for ; Mon, 2 Mar 2026 23:25:19 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1772493915; cv=none; d=zohomail.com; s=zohoarc; b=FSIBqt3cWMjAsK8XqsCqd9Ocujf84ivUN0Ic1h1mq18UaHlhTsKQy22DiqpMpwMw4KeVNl1RP88pSj3xXAnztQRYrVVNLejP292K6e85DmQm1lTur1+Eo6lumDHgZ8A9d+fng93TrjP06Y0dhHkT0dPt8z1IRCJNC30LOvrYV/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772493915; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=HY43KfGaI/ZgxHpQugvLpiakTEg355Vk9snU7BhusEM=; b=EMMV5Dr7ypdOXko6PzWaNMQRezjhjdxJYw7gS/FCAhUYTBBhBYfd05qW70wcuQJj7NuzlLcLquo/ovQL6Jl7FKvJZlleeTanyCSU+8CgHFCgArtFVLurIe2qGRKM0373cuc+5XDvwi6SP9z5mqYtVhuggIQAvhiNC4NvJ1Jor5s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=deborah.brouwer@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1772493915; s=zohomail; d=collabora.com; i=deborah.brouwer@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=HY43KfGaI/ZgxHpQugvLpiakTEg355Vk9snU7BhusEM=; b=VSY0B1P82KVLG3Lx206+/4D8VwYzQnKUI9SLzP+eYPa1PPdo9h77jhWEMfq0y2r2 +jJEGfzvYMOHry2AWpjw4ko/gGPRFU/J8fFP892t2sWVdq2W0wtwVWN09WQ4eUDXnnk Z+BQGZHaXGjt//gGeGOqePnv7KDItnnD6erLxC3I= Received: by mx.zohomail.com with SMTPS id 1772493913174510.58349943679843; Mon, 2 Mar 2026 15:25:13 -0800 (PST) From: Deborah Brouwer To: dri-devel@lists.freedesktop.org, rust-for-linux@vger.kernel.org Cc: daniel.almeida@collabora.com, aliceryhl@google.com, boris.brezillon@collabora.com, beata.michalska@arm.com, lyude@redhat.com, work@onurozkan.dev, Deborah Brouwer Subject: [PATCH v2 04/12] drm/tyr: set DMA mask using GPU physical address Date: Mon, 2 Mar 2026 15:24:52 -0800 Message-ID: <20260302232500.244489-5-deborah.brouwer@collabora.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260302232500.244489-1-deborah.brouwer@collabora.com> References: <20260302232500.244489-1-deborah.brouwer@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Beata Michalska Configure the device DMA mask during probe using the GPU's physical address capability reported in GpuInfo. This ensures DMA allocations use an appropriate address mask. Reviewed-by: Boris Brezillon Reviewed-by: Daniel Almeida Reviewed-by: Alice Ryhl Signed-off-by: Beata Michalska Co-developed-by: Deborah Brouwer Signed-off-by: Deborah Brouwer --- Changes in v2: - Move the semi-colon outside of unsafe block and reformat. - Pick up Reviewed-by tags. drivers/gpu/drm/tyr/driver.rs | 9 +++++++++ drivers/gpu/drm/tyr/gpu.rs | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tyr/driver.rs b/drivers/gpu/drm/tyr/driver.rs index eccf36d601ac..781502c6db36 100644 --- a/drivers/gpu/drm/tyr/driver.rs +++ b/drivers/gpu/drm/tyr/driver.rs @@ -11,6 +11,10 @@ Device, // }, devres::Devres, + dma::{ + Device as DmaDevice, + DmaMask, // + }, drm, drm::{ driver::Registration, @@ -134,6 +138,11 @@ fn probe( let gpu_info = GpuInfo::new(pdev.as_ref(), &iomem)?; gpu_info.log(pdev); + // SAFETY: No concurrent DMA allocations or mappings can be made because + // the device is still being probed and therefore isn't being used by + // other threads of execution. + unsafe { pdev.dma_set_mask_and_coherent(DmaMask::try_new(gpu_info.pa_bits())?)? }; + let uninit_ddev = UnregisteredDevice::::new(pdev.as_ref())?; let platform: ARef = pdev.into(); diff --git a/drivers/gpu/drm/tyr/gpu.rs b/drivers/gpu/drm/tyr/gpu.rs index a88775160f98..5d9637899c7d 100644 --- a/drivers/gpu/drm/tyr/gpu.rs +++ b/drivers/gpu/drm/tyr/gpu.rs @@ -139,7 +139,6 @@ pub(crate) fn va_bits(&self) -> u32 { } /// Returns the number of physical address bits supported by the GPU. - #[expect(dead_code)] pub(crate) fn pa_bits(&self) -> u32 { (self.mmu_features >> 8) & genmask_u32(0..=7) } -- 2.52.0