Re: [PATCH 2/7] drm/qxl: fix incorrect use of the lru_lock

Re: [PATCH 2/7] drm/qxl: fix incorrect use of the lru_lock

[Christian König]

Hi guys,

can I get an rb or at least an Acked-by for that one?

The code was obviously copied over from radeon where it wasn't correct 
in the first place.

Thanks,
Christian.

Am 07.08.2017 um 17:48 schrieb Christian König:
> From: Christian König <christian.koenig@amd.com>
>
> The BO manager has its own lock and doesn't use the lru_lock.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
>   drivers/gpu/drm/qxl/qxl_ttm.c | 13 ++++---------
>   1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
> index 0fdedee..07dc08d 100644
> --- a/drivers/gpu/drm/qxl/qxl_ttm.c
> +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
> @@ -454,15 +454,10 @@ void qxl_ttm_fini(struct qxl_device *qdev)
>   static int qxl_mm_dump_table(struct seq_file *m, void *data)
>   {
>   	struct drm_info_node *node = (struct drm_info_node *)m->private;
> -	struct drm_mm *mm = (struct drm_mm *)node->info_ent->data;
> -	struct drm_device *dev = node->minor->dev;
> -	struct qxl_device *rdev = dev->dev_private;
> -	struct ttm_bo_global *glob = rdev->mman.bdev.glob;
> +	struct ttm_mem_type_manager *man = node->info_ent->data;
>   	struct drm_printer p = drm_seq_file_printer(m);
>   
> -	spin_lock(&glob->lru_lock);
> -	drm_mm_print(mm, &p);
> -	spin_unlock(&glob->lru_lock);
> +	man->func->debug(man, &p);
>   	return 0;
>   }
>   #endif
> @@ -483,9 +478,9 @@ int qxl_ttm_debugfs_init(struct qxl_device *qdev)
>   		qxl_mem_types_list[i].show = &qxl_mm_dump_table;
>   		qxl_mem_types_list[i].driver_features = 0;
>   		if (i == 0)
> -			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
> +			qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_VRAM];
>   		else
> -			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV].priv;
> +			qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_PRIV];
>   
>   	}
>   	return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/7] drm/qxl: fix incorrect use of the lru_lock

[Liu, Monk]

[-- Attachment #1.1: Type: text/plain, Size: 2943 bytes --]

Ack-by: Monk.Liu <monk.liu-5C7GfCeVMHo@public.gmane.org>

________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Christian König <deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org>
Sent: Tuesday, August 8, 2017 4:14:46 PM
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org; dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org; Dave Airlie; Gerd Hoffmann
Subject: Re: [PATCH 2/7] drm/qxl: fix incorrect use of the lru_lock

Hi guys,

can I get an rb or at least an Acked-by for that one?

The code was obviously copied over from radeon where it wasn't correct
in the first place.

Thanks,
Christian.

Am 07.08.2017 um 17:48 schrieb Christian König:
> From: Christian König <christian.koenig-5C7GfCeVMHo@public.gmane.org>
>
> The BO manager has its own lock and doesn't use the lru_lock.
>
> Signed-off-by: Christian König <christian.koenig-5C7GfCeVMHo@public.gmane.org>
> ---
>   drivers/gpu/drm/qxl/qxl_ttm.c | 13 ++++---------
>   1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
> index 0fdedee..07dc08d 100644
> --- a/drivers/gpu/drm/qxl/qxl_ttm.c
> +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
> @@ -454,15 +454,10 @@ void qxl_ttm_fini(struct qxl_device *qdev)
>   static int qxl_mm_dump_table(struct seq_file *m, void *data)
>   {
>        struct drm_info_node *node = (struct drm_info_node *)m->private;
> -     struct drm_mm *mm = (struct drm_mm *)node->info_ent->data;
> -     struct drm_device *dev = node->minor->dev;
> -     struct qxl_device *rdev = dev->dev_private;
> -     struct ttm_bo_global *glob = rdev->mman.bdev.glob;
> +     struct ttm_mem_type_manager *man = node->info_ent->data;
>        struct drm_printer p = drm_seq_file_printer(m);
>
> -     spin_lock(&glob->lru_lock);
> -     drm_mm_print(mm, &p);
> -     spin_unlock(&glob->lru_lock);
> +     man->func->debug(man, &p);
>        return 0;
>   }
>   #endif
> @@ -483,9 +478,9 @@ int qxl_ttm_debugfs_init(struct qxl_device *qdev)
>                qxl_mem_types_list[i].show = &qxl_mm_dump_table;
>                qxl_mem_types_list[i].driver_features = 0;
>                if (i == 0)
> -                     qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
> +                     qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_VRAM];
>                else
> -                     qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV].priv;
> +                     qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_PRIV];
>
>        }
>        return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);


_______________________________________________
amd-gfx mailing list
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[-- Attachment #1.2: Type: text/html, Size: 5618 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

[PATCH 2/7] drm/qxl: fix incorrect use of the lru_lock

[Christian König]

From: Christian König <christian.koenig@amd.com>

The BO manager has its own lock and doesn't use the lru_lock.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/qxl/qxl_ttm.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
index 0fdedee..07dc08d 100644
--- a/drivers/gpu/drm/qxl/qxl_ttm.c
+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
@@ -454,15 +454,10 @@ void qxl_ttm_fini(struct qxl_device *qdev)
 static int qxl_mm_dump_table(struct seq_file *m, void *data)
 {
 	struct drm_info_node *node = (struct drm_info_node *)m->private;
-	struct drm_mm *mm = (struct drm_mm *)node->info_ent->data;
-	struct drm_device *dev = node->minor->dev;
-	struct qxl_device *rdev = dev->dev_private;
-	struct ttm_bo_global *glob = rdev->mman.bdev.glob;
+	struct ttm_mem_type_manager *man = node->info_ent->data;
 	struct drm_printer p = drm_seq_file_printer(m);
 
-	spin_lock(&glob->lru_lock);
-	drm_mm_print(mm, &p);
-	spin_unlock(&glob->lru_lock);
+	man->func->debug(man, &p);
 	return 0;
 }
 #endif
@@ -483,9 +478,9 @@ int qxl_ttm_debugfs_init(struct qxl_device *qdev)
 		qxl_mem_types_list[i].show = &qxl_mm_dump_table;
 		qxl_mem_types_list[i].driver_features = 0;
 		if (i == 0)
-			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
+			qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_VRAM];
 		else
-			qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV].priv;
+			qxl_mem_types_list[i].data = &qdev->mman.bdev.man[TTM_PL_PRIV];
 
 	}
 	return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel