drm/etnaviv: Prefer drm_device based drm_WARN_ON() over regular WARN_ON()
Subsystems (2)
PATCH 1/1 drm/etnaviv: Prefer drm_device based drm_WARN_ON() over regular WARN_ON()
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 <[email protected]>
--- 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(-)
drivers/gpu/drm/etnaviv/etnaviv_gem.c +5 -4
@@ -230,7 +230,7 @@ void etnaviv_gem_mapping_unreference(struct etnaviv_vram_mapping *mapping)struct etnaviv_gem_object *etnaviv_obj = mapping->object;mutex_lock (&etnaviv_obj->lock); -WARN_ON (mapping->use ==0 ); +drm_WARN_ON (etnaviv_obj->base.dev, mapping->use ==0 ); mapping->use -=1 ;mutex_unlock (&etnaviv_obj->lock);
@@ -412,7 +412,7 @@ int etnaviv_gem_cpu_fini(struct drm_gem_object *obj)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 ==0 ); +drm_WARN_ON (dev, etnaviv_obj->last_cpu_prep_op ==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 =0 ;
@@ -487,12 +487,13 @@ static const struct etnaviv_gem_ops etnaviv_gem_shmem_ops = {void etnaviv_gem_free_object (struct drm_gem_object *obj) { +struct drm_device *drm = obj->dev;struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);struct etnaviv_drm_private *priv = obj->dev->dev_private;struct etnaviv_vram_mapping *mapping, *tmp;/* object should not be active */ -WARN_ON (is_active (etnaviv_obj)); +drm_WARN_ON (drm,is_active (etnaviv_obj));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 = mapping->context; -WARN_ON (mapping->use); +drm_WARN_ON (drm, mapping->use);if (context)etnaviv_iommu_unmap_gem (context, mapping);
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +1 -1
@@ -19,7 +19,7 @@ struct sg_table *etnaviv_gem_prime_get_sg_table(struct drm_gem_object *obj)struct etnaviv_gem_object *etnaviv_obj =to_etnaviv_bo (obj);int npages = obj->size >>PAGE_SHIFT ; -if (WARN_ON (!etnaviv_obj->pages))/* should have already pinned! */ +if (drm_WARN_ON (obj->dev, !etnaviv_obj->pages))/* should have already pinned! */ return ERR_PTR (-EINVAL );return drm_prime_pages_to_sg (obj->dev, etnaviv_obj->pages, npages);
drivers/gpu/drm/etnaviv/etnaviv_gpu.c +3 -3
@@ -686,7 +686,7 @@ static void etnaviv_gpu_start_fe_idleloop(struct etnaviv_gpu *gpu,u16 prefetch;u32 address; -WARN_ON (gpu->state !=ETNA_GPU_STATE_INITIALIZED ); +drm_WARN_ON (gpu->drm, gpu->state !=ETNA_GPU_STATE_INITIALIZED );/* setup the MMU */ etnaviv_iommu_restore (gpu, context);
@@ -734,8 +734,8 @@ static void etnaviv_gpu_setup_pulse_eater(struct etnaviv_gpu *gpu)static void etnaviv_gpu_hw_init (struct etnaviv_gpu *gpu) { -WARN_ON (!(gpu->state ==ETNA_GPU_STATE_IDENTIFIED || - gpu->state ==ETNA_GPU_STATE_RESET )); +drm_WARN_ON (gpu->drm, !(gpu->state ==ETNA_GPU_STATE_IDENTIFIED || + gpu->state ==ETNA_GPU_STATE_RESET )); if ((etnaviv_is_model_rev(gpu, 0x320, 0x5007) || etnaviv_is_model_rev(gpu, 0x320, 0x5220)) &&
drivers/gpu/drm/etnaviv/etnaviv_mmu.c +5 -2
@@ -138,9 +138,10 @@ static void etnaviv_iommu_remove_mapping(struct etnaviv_iommu_context *context,void etnaviv_iommu_reap_mapping (struct etnaviv_vram_mapping *mapping) {struct etnaviv_iommu_context *context = mapping->context; +struct drm_device *drm =dev_get_drvdata (context->global->dev);lockdep_assert_held (&context->lock); -WARN_ON (mapping->use); +drm_WARN_ON (drm, mapping->use);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 =dev_get_drvdata (context->global->dev); + +drm_WARN_ON (drm, mapping->use);mutex_lock (&context->lock);
Signature · 1 line
2.34.1