drm/ttm: remove dead codes

Submitted by Huang, Ray on Aug. 15, 2018, 7:41 a.m.

Details

Message ID 1534318880-31836-1-git-send-email-ray.huang@amd.com
State New
Headers show
Series "drm/ttm: remove dead codes" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Huang, Ray Aug. 15, 2018, 7:41 a.m.
These codes are not used.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/gpu/drm/ttm/ttm_bo_util.c        | 5 +----
 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 8 +-------
 2 files changed, 2 insertions(+), 11 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index 046a6dd..ba80150 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -629,10 +629,7 @@  int ttm_bo_kmap(struct ttm_buffer_object *bo,
 		return -EINVAL;
 	if (start_page > bo->num_pages)
 		return -EINVAL;
-#if 0
-	if (num_pages > 1 && !capable(CAP_SYS_ADMIN))
-		return -EPERM;
-#endif
+
 	(void) ttm_mem_io_lock(man, false);
 	ret = ttm_mem_io_reserve(bo->bdev, &bo->mem);
 	ttm_mem_io_unlock(man);
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index 507be7a..d594f75 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -410,13 +410,7 @@  static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
 
 	if (NUM_PAGES_TO_ALLOC < nr_free)
 		npages_to_free = NUM_PAGES_TO_ALLOC;
-#if 0
-	if (nr_free > 1) {
-		pr_debug("%s: (%s:%d) Attempting to free %d (%d) pages\n",
-			 pool->dev_name, pool->name, current->pid,
-			 npages_to_free, nr_free);
-	}
-#endif
+
 	if (use_static)
 		pages_to_free = static_buf;
 	else

Comments

Am 15.08.2018 um 09:41 schrieb Huang Rui:
> These codes are not used.
>
> Signed-off-by: Huang Rui <ray.huang@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/ttm/ttm_bo_util.c        | 5 +----
>   drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 8 +-------
>   2 files changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
> index 046a6dd..ba80150 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
> @@ -629,10 +629,7 @@ int ttm_bo_kmap(struct ttm_buffer_object *bo,
>   		return -EINVAL;
>   	if (start_page > bo->num_pages)
>   		return -EINVAL;
> -#if 0
> -	if (num_pages > 1 && !capable(CAP_SYS_ADMIN))
> -		return -EPERM;
> -#endif
> +
>   	(void) ttm_mem_io_lock(man, false);
>   	ret = ttm_mem_io_reserve(bo->bdev, &bo->mem);
>   	ttm_mem_io_unlock(man);
> diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> index 507be7a..d594f75 100644
> --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> @@ -410,13 +410,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
>   
>   	if (NUM_PAGES_TO_ALLOC < nr_free)
>   		npages_to_free = NUM_PAGES_TO_ALLOC;
> -#if 0
> -	if (nr_free > 1) {
> -		pr_debug("%s: (%s:%d) Attempting to free %d (%d) pages\n",
> -			 pool->dev_name, pool->name, current->pid,
> -			 npages_to_free, nr_free);
> -	}
> -#endif
> +
>   	if (use_static)
>   		pages_to_free = static_buf;
>   	else