From nobody Fri Dec 19 16:20:43 2025 Received: from out-174.mta1.migadu.com (out-174.mta1.migadu.com [95.215.58.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9710CEAD2 for ; Sun, 25 Aug 2024 11:37:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724585840; cv=none; b=TObxWoPDAUXFyNY1xYfJua0j4j2GGpd82a8+ENntv3+CGpvmG2edILC4AQPN/wKE5+5qzSpKPAq7S3gYDAOuPMV2kG4Q8fifjrjZlU/kA2kajhR7EN8uO/73v92OEjU6mzu+Thn8fm2ulscu4+eX8qtYQtFEhYyPVZzY37Bnr7g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724585840; c=relaxed/simple; bh=8ivXsB7mOCFKffqd8AZoyWOiFfU0k94kubhUetdbdOw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=lEcw1ox1pV/q1uVWOrB8r3G2C4iUpJF6w+STa3GsPLSdL2QNw3t5wjE9d9uSYkQ1nkbbksCH/mGA7iFxvOjbzLDv7NYdE7zbePXG5fH9dbgQNjjrUlkmwvDE5Rm8DDm2ffvx+jHnECLaabah5GveA3zKRBJos7JdoY6KXfID+Bc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=FN6buI2D; arc=none smtp.client-ip=95.215.58.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="FN6buI2D" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1724585834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=1ucgE7cr80H0Ul2jOiHNjxNMLIne5veczZFPw5OOGxY=; b=FN6buI2DWWi16+tmwJKlVJJN2TKH+NjRIb06w17HKgO5RFc+Zxh5ucmOFhLHKzYu3E3j2E 7vCf6fZEJZ330wGO/pL15teWv3/rZW8XlcX4ZjgGTqgE6RAsgByw+Bb9ChPxsfKCAU/Xyw y5xZmQHcB3kotzTqCEijmRrw81bGOoM= From: Sui Jingfeng To: Lucas Stach , Russell King , Christian Gmeiner Cc: David Airlie , Daniel Vetter , etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Sui Jingfeng Subject: [PATCH] drm/etnaviv: Prefer drm_device based drm_WARN_ON() over regular WARN_ON() Date: Sun, 25 Aug 2024 19:37:02 +0800 Message-Id: <20240825113702.328175-1-sui.jingfeng@linux.dev> 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 X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" drm_WARN_ON() acts like WARN_ON(), but with the key difference of using device specific information so that we know from which device warning is originating from. Signed-off-by: Sui Jingfeng --- drivers/gpu/drm/etnaviv/etnaviv_gem.c | 9 +++++---- drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 +++--- drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 7 +++++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnavi= v/etnaviv_gem.c index 5c0c9d4e3be1..fe665ca20c02 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c @@ -230,7 +230,7 @@ void etnaviv_gem_mapping_unreference(struct etnaviv_vra= m_mapping *mapping) struct etnaviv_gem_object *etnaviv_obj =3D mapping->object; =20 mutex_lock(&etnaviv_obj->lock); - WARN_ON(mapping->use =3D=3D 0); + drm_WARN_ON(etnaviv_obj->base.dev, mapping->use =3D=3D 0); mapping->use -=3D 1; mutex_unlock(&etnaviv_obj->lock); =20 @@ -412,7 +412,7 @@ int etnaviv_gem_cpu_fini(struct drm_gem_object *obj) =20 if (etnaviv_obj->flags & ETNA_BO_CACHED) { /* fini without a prep is almost certainly a userspace error */ - WARN_ON(etnaviv_obj->last_cpu_prep_op =3D=3D 0); + drm_WARN_ON(dev, etnaviv_obj->last_cpu_prep_op =3D=3D 0); dma_sync_sgtable_for_device(dev->dev, etnaviv_obj->sgt, etnaviv_op_to_dma_dir(etnaviv_obj->last_cpu_prep_op)); etnaviv_obj->last_cpu_prep_op =3D 0; @@ -487,12 +487,13 @@ static const struct etnaviv_gem_ops etnaviv_gem_shmem= _ops =3D { =20 void etnaviv_gem_free_object(struct drm_gem_object *obj) { + struct drm_device *drm =3D obj->dev; struct etnaviv_gem_object *etnaviv_obj =3D to_etnaviv_bo(obj); struct etnaviv_drm_private *priv =3D obj->dev->dev_private; struct etnaviv_vram_mapping *mapping, *tmp; =20 /* object should not be active */ - WARN_ON(is_active(etnaviv_obj)); + drm_WARN_ON(drm, is_active(etnaviv_obj)); =20 mutex_lock(&priv->gem_lock); list_del(&etnaviv_obj->gem_node); @@ -502,7 +503,7 @@ void etnaviv_gem_free_object(struct drm_gem_object *obj) obj_node) { struct etnaviv_iommu_context *context =3D mapping->context; =20 - WARN_ON(mapping->use); + drm_WARN_ON(drm, mapping->use); =20 if (context) etnaviv_iommu_unmap_gem(context, mapping); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/= etnaviv/etnaviv_gem_prime.c index 3524b5811682..c651188095b6 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c @@ -19,7 +19,7 @@ struct sg_table *etnaviv_gem_prime_get_sg_table(struct dr= m_gem_object *obj) struct etnaviv_gem_object *etnaviv_obj =3D to_etnaviv_bo(obj); int npages =3D obj->size >> PAGE_SHIFT; =20 - if (WARN_ON(!etnaviv_obj->pages)) /* should have already pinned! */ + if (drm_WARN_ON(obj->dev, !etnaviv_obj->pages)) /* should have already p= inned! */ return ERR_PTR(-EINVAL); =20 return drm_prime_pages_to_sg(obj->dev, etnaviv_obj->pages, npages); diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnavi= v/etnaviv_gpu.c index 7c7f97793ddd..af52922ff494 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -686,7 +686,7 @@ static void etnaviv_gpu_start_fe_idleloop(struct etnavi= v_gpu *gpu, u16 prefetch; u32 address; =20 - WARN_ON(gpu->state !=3D ETNA_GPU_STATE_INITIALIZED); + drm_WARN_ON(gpu->drm, gpu->state !=3D ETNA_GPU_STATE_INITIALIZED); =20 /* setup the MMU */ etnaviv_iommu_restore(gpu, context); @@ -734,8 +734,8 @@ static void etnaviv_gpu_setup_pulse_eater(struct etnavi= v_gpu *gpu) =20 static void etnaviv_gpu_hw_init(struct etnaviv_gpu *gpu) { - WARN_ON(!(gpu->state =3D=3D ETNA_GPU_STATE_IDENTIFIED || - gpu->state =3D=3D ETNA_GPU_STATE_RESET)); + drm_WARN_ON(gpu->drm, !(gpu->state =3D=3D ETNA_GPU_STATE_IDENTIFIED || + gpu->state =3D=3D ETNA_GPU_STATE_RESET)); =20 if ((etnaviv_is_model_rev(gpu, 0x320, 0x5007) || etnaviv_is_model_rev(gpu, 0x320, 0x5220)) && diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnavi= v/etnaviv_mmu.c index 1661d589bf3e..e3be16165c86 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c @@ -138,9 +138,10 @@ static void etnaviv_iommu_remove_mapping(struct etnavi= v_iommu_context *context, void etnaviv_iommu_reap_mapping(struct etnaviv_vram_mapping *mapping) { struct etnaviv_iommu_context *context =3D mapping->context; + struct drm_device *drm =3D dev_get_drvdata(context->global->dev); =20 lockdep_assert_held(&context->lock); - WARN_ON(mapping->use); + drm_WARN_ON(drm, mapping->use); =20 etnaviv_iommu_remove_mapping(context, mapping); etnaviv_iommu_context_put(mapping->context); @@ -333,7 +334,9 @@ int etnaviv_iommu_map_gem(struct etnaviv_iommu_context = *context, void etnaviv_iommu_unmap_gem(struct etnaviv_iommu_context *context, struct etnaviv_vram_mapping *mapping) { - WARN_ON(mapping->use); + struct drm_device *drm =3D dev_get_drvdata(context->global->dev); + + drm_WARN_ON(drm, mapping->use); =20 mutex_lock(&context->lock); =20 --=20 2.34.1