diff mbox

[01/12] drm: remove unused "struct drm_freelist"

Message ID 1406129207-1302-2-git-send-email-dh.herrmann@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

David Herrmann July 23, 2014, 3:26 p.m. UTC 
This object is not used except for static fields in drm_bufs *cough*.
Inline the watermark fields and drop the unused structure definition.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---
 drivers/gpu/drm/drm_bufs.c | 17 ++++++++---------
 drivers/gpu/drm/drm_info.c |  2 +-
 include/drm/drmP.h         | 15 ++-------------
 3 files changed, 11 insertions(+), 23 deletions(-)

Comments

Daniel Vetter July 23, 2014, 7:17 p.m. UTC | #1 
On Wed, Jul 23, 2014 at 05:26:36PM +0200, David Herrmann wrote:
> This object is not used except for static fields in drm_bufs *cough*.
> Inline the watermark fields and drop the unused structure definition.
> 
> Signed-off-by: David Herrmann <dh.herrmann@gmail.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/drm_bufs.c | 17 ++++++++---------
>  drivers/gpu/drm/drm_info.c |  2 +-
>  include/drm/drmP.h         | 15 ++-------------
>  3 files changed, 11 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
> index 68175b5..61acb8f 100644
> --- a/drivers/gpu/drm/drm_bufs.c
> +++ b/drivers/gpu/drm/drm_bufs.c
> @@ -1217,7 +1217,6 @@ int drm_infobufs(struct drm_device *dev, void *data,
>  				struct drm_buf_desc __user *to =
>  				    &request->list[count];
>  				struct drm_buf_entry *from = &dma->bufs[i];
> -				struct drm_freelist *list = &dma->bufs[i].freelist;
>  				if (copy_to_user(&to->count,
>  						 &from->buf_count,
>  						 sizeof(from->buf_count)) ||
> @@ -1225,19 +1224,19 @@ int drm_infobufs(struct drm_device *dev, void *data,
>  						 &from->buf_size,
>  						 sizeof(from->buf_size)) ||
>  				    copy_to_user(&to->low_mark,
> -						 &list->low_mark,
> -						 sizeof(list->low_mark)) ||
> +						 &from->low_mark,
> +						 sizeof(from->low_mark)) ||
>  				    copy_to_user(&to->high_mark,
> -						 &list->high_mark,
> -						 sizeof(list->high_mark)))
> +						 &from->high_mark,
> +						 sizeof(from->high_mark)))
>  					return -EFAULT;
>  
>  				DRM_DEBUG("%d %d %d %d %d\n",
>  					  i,
>  					  dma->bufs[i].buf_count,
>  					  dma->bufs[i].buf_size,
> -					  dma->bufs[i].freelist.low_mark,
> -					  dma->bufs[i].freelist.high_mark);
> +					  dma->bufs[i].low_mark,
> +					  dma->bufs[i].high_mark);
>  				++count;
>  			}
>  		}
> @@ -1290,8 +1289,8 @@ int drm_markbufs(struct drm_device *dev, void *data,
>  	if (request->high_mark < 0 || request->high_mark > entry->buf_count)
>  		return -EINVAL;
>  
> -	entry->freelist.low_mark = request->low_mark;
> -	entry->freelist.high_mark = request->high_mark;
> +	entry->low_mark = request->low_mark;
> +	entry->high_mark = request->high_mark;
>  
>  	return 0;
>  }
> diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
> index 86feedd..ecaf0fa 100644
> --- a/drivers/gpu/drm/drm_info.c
> +++ b/drivers/gpu/drm/drm_info.c
> @@ -132,7 +132,7 @@ int drm_bufs_info(struct seq_file *m, void *data)
>  				   i,
>  				   dma->bufs[i].buf_size,
>  				   dma->bufs[i].buf_count,
> -				   atomic_read(&dma->bufs[i].freelist.count),
> +				   0,
>  				   dma->bufs[i].seg_count,
>  				   seg_pages,
>  				   seg_pages * PAGE_SIZE / 1024);
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index 9b6a445..335b7b8 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -346,18 +346,6 @@ struct drm_waitlist {
>  	spinlock_t write_lock;
>  };
>  
> -struct drm_freelist {
> -	int initialized;	       /**< Freelist in use */
> -	atomic_t count;		       /**< Number of free buffers */
> -	struct drm_buf *next;	       /**< End pointer */
> -
> -	wait_queue_head_t waiting;     /**< Processes waiting on free bufs */
> -	int low_mark;		       /**< Low water mark */
> -	int high_mark;		       /**< High water mark */
> -	atomic_t wfh;		       /**< If waiting for high mark */
> -	spinlock_t lock;
> -};
> -
>  typedef struct drm_dma_handle {
>  	dma_addr_t busaddr;
>  	void *vaddr;
> @@ -375,7 +363,8 @@ struct drm_buf_entry {
>  	int page_order;
>  	struct drm_dma_handle **seglist;
>  
> -	struct drm_freelist freelist;
> +	int low_mark;			/**< Low water mark */
> +	int high_mark;			/**< High water mark */
>  };
>  
>  /* Event queued up for userspace to read */
> -- 
> 2.0.2
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 68175b5..61acb8f 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -1217,7 +1217,6 @@  int drm_infobufs(struct drm_device *dev, void *data,
 				struct drm_buf_desc __user *to =
 				    &request->list[count];
 				struct drm_buf_entry *from = &dma->bufs[i];
-				struct drm_freelist *list = &dma->bufs[i].freelist;
 				if (copy_to_user(&to->count,
 						 &from->buf_count,
 						 sizeof(from->buf_count)) ||
@@ -1225,19 +1224,19 @@  int drm_infobufs(struct drm_device *dev, void *data,
 						 &from->buf_size,
 						 sizeof(from->buf_size)) ||
 				    copy_to_user(&to->low_mark,
-						 &list->low_mark,
-						 sizeof(list->low_mark)) ||
+						 &from->low_mark,
+						 sizeof(from->low_mark)) ||
 				    copy_to_user(&to->high_mark,
-						 &list->high_mark,
-						 sizeof(list->high_mark)))
+						 &from->high_mark,
+						 sizeof(from->high_mark)))
 					return -EFAULT;
 
 				DRM_DEBUG("%d %d %d %d %d\n",
 					  i,
 					  dma->bufs[i].buf_count,
 					  dma->bufs[i].buf_size,
-					  dma->bufs[i].freelist.low_mark,
-					  dma->bufs[i].freelist.high_mark);
+					  dma->bufs[i].low_mark,
+					  dma->bufs[i].high_mark);
 				++count;
 			}
 		}
@@ -1290,8 +1289,8 @@  int drm_markbufs(struct drm_device *dev, void *data,
 	if (request->high_mark < 0 || request->high_mark > entry->buf_count)
 		return -EINVAL;
 
-	entry->freelist.low_mark = request->low_mark;
-	entry->freelist.high_mark = request->high_mark;
+	entry->low_mark = request->low_mark;
+	entry->high_mark = request->high_mark;
 
 	return 0;
 }
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index 86feedd..ecaf0fa 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -132,7 +132,7 @@  int drm_bufs_info(struct seq_file *m, void *data)
 				   i,
 				   dma->bufs[i].buf_size,
 				   dma->bufs[i].buf_count,
-				   atomic_read(&dma->bufs[i].freelist.count),
+				   0,
 				   dma->bufs[i].seg_count,
 				   seg_pages,
 				   seg_pages * PAGE_SIZE / 1024);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 9b6a445..335b7b8 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -346,18 +346,6 @@  struct drm_waitlist {
 	spinlock_t write_lock;
 };
 
-struct drm_freelist {
-	int initialized;	       /**< Freelist in use */
-	atomic_t count;		       /**< Number of free buffers */
-	struct drm_buf *next;	       /**< End pointer */
-
-	wait_queue_head_t waiting;     /**< Processes waiting on free bufs */
-	int low_mark;		       /**< Low water mark */
-	int high_mark;		       /**< High water mark */
-	atomic_t wfh;		       /**< If waiting for high mark */
-	spinlock_t lock;
-};
-
 typedef struct drm_dma_handle {
 	dma_addr_t busaddr;
 	void *vaddr;
@@ -375,7 +363,8 @@  struct drm_buf_entry {
 	int page_order;
 	struct drm_dma_handle **seglist;
 
-	struct drm_freelist freelist;
+	int low_mark;			/**< Low water mark */
+	int high_mark;			/**< High water mark */
 };
 
 /* Event queued up for userspace to read */