Re: [PATCH 01/20] drm/radeon: move drm_buffer to drm/radeon/

On Fri, Aug 29, 2014 at 6:12 AM, David Herrmann dh.herrmann@gmail.com wrote:

Radeon UMS is the last user of drm_buffer. Move it out of sight so radeon can drop it together with UMS.

Signed-off-by: David Herrmann dh.herrmann@gmail.com

Reviewed-by: Alex Deucher alexander.deucher@amd.com

We can probably dump radeon UMS support as well at this point.

Alex

---

drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/drm_buffer.c | 181 ---------------------------------- drivers/gpu/drm/radeon/Makefile | 2 +- drivers/gpu/drm/radeon/drm_buffer.c | 177 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/drm_buffer.h | 148 +++++++++++++++++++++++++++ drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- drivers/gpu/drm/radeon/radeon_state.c | 2 +- include/drm/drm_buffer.h | 148 --------------------------- 8 files changed, 329 insertions(+), 333 deletions(-) delete mode 100644 drivers/gpu/drm/drm_buffer.c create mode 100644 drivers/gpu/drm/radeon/drm_buffer.c create mode 100644 drivers/gpu/drm/radeon/drm_buffer.h delete mode 100644 include/drm/drm_buffer.h

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 4a55d59..9b7cb3f 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -4,7 +4,7 @@

ccflags-y := -Iinclude/drm

-drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ +drm-y := drm_auth.o drm_bufs.o drm_cache.o \ drm_context.o drm_dma.o \ drm_fops.o drm_gem.o drm_ioctl.o drm_irq.o \ drm_lock.o drm_memory.o drm_drv.o drm_vm.o \ diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c deleted file mode 100644 index 86a4a4a..0000000 --- a/drivers/gpu/drm/drm_buffer.c +++ /dev/null @@ -1,181 +0,0 @@ -/**************************************************************************

• • Copyright 2010 Pauli Nieminen.
• • All Rights Reserved.
• • Permission is hereby granted, free of charge, to any person obtaining a
• • copy of this software and associated documentation files (the
• • "Software"), to deal in the Software without restriction, including
• • without limitation the rights to use, copy, modify, merge, publish,
• • distribute, sub license, and/or sell copies of the Software, and to
• • permit persons to whom the Software is furnished to do so, subject to
• • the following conditions:
• • The above copyright notice and this permission notice (including the
• • next paragraph) shall be included in all copies or substantial portions
• • of the Software.
• • THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
• • IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
• • FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
• • THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
• • DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
• • OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
• • USE OR OTHER DEALINGS IN THE SOFTWARE.
• **************************************************************************/

-/*

• • Multipart buffer for coping data which is larger than the page size.
• • Authors:
• • Pauli Nieminen <suokkos-at-gmail-dot-com>
• */

-#include <linux/export.h> -#include <drm/drm_buffer.h>

-/**

• • Allocate the drm buffer object.
• • buf: Pointer to a pointer where the object is stored.
• • size: The number of bytes to allocate.
• */

-int drm_buffer_alloc(struct drm_buffer **buf, int size) -{

•   int nr_pages = size / PAGE_SIZE + 1;
  

•   int idx;
  

•   /* Allocating pointer table to end of structure makes drm_buffer
  

•    * variable sized */
  

•   *buf = kzalloc(sizeof(struct drm_buffer) + nr_pages*sizeof(char *),
  

•                   GFP_KERNEL);
  

•   if (*buf == NULL) {
  

•           DRM_ERROR("Failed to allocate drm buffer object to hold"
  

•                           " %d bytes in %d pages.\n",
  

•                           size, nr_pages);
  

•           return -ENOMEM;
  

•   }
  

•   (*buf)->size = size;
  

•   for (idx = 0; idx < nr_pages; ++idx) {
  

•           (*buf)->data[idx] =
  

•                   kmalloc(min(PAGE_SIZE, size - idx * PAGE_SIZE),
  

•                           GFP_KERNEL);
  

•           if ((*buf)->data[idx] == NULL) {
  

•                   DRM_ERROR("Failed to allocate %dth page for drm"
  

•                                   " buffer with %d bytes and %d pages.\n",
  

•                                   idx + 1, size, nr_pages);
  

•                   goto error_out;
  

•           }
  

•   }
  

•   return 0;
  

-error_out:

•   for (; idx >= 0; --idx)
  

•           kfree((*buf)->data[idx]);
  

•   kfree(*buf);
  

•   return -ENOMEM;
  

-} -EXPORT_SYMBOL(drm_buffer_alloc);

-/**

• • Copy the user data to the begin of the buffer and reset the processing
• • iterator.
• • user_data: A pointer the data that is copied to the buffer.
• • size: The Number of bytes to copy.
• */

-int drm_buffer_copy_from_user(struct drm_buffer *buf,

•                         void __user *user_data, int size)
  

-{

•   int nr_pages = size / PAGE_SIZE + 1;
  

•   int idx;
  

•   if (size > buf->size) {
  

•           DRM_ERROR("Requesting to copy %d bytes to a drm buffer with"
  

•                           " %d bytes space\n",
  

•                           size, buf->size);
  

•           return -EFAULT;
  

•   }
  

•   for (idx = 0; idx < nr_pages; ++idx) {
  

•           if (copy_from_user(buf->data[idx],
  

•                   user_data + idx * PAGE_SIZE,
  

•                   min(PAGE_SIZE, size - idx * PAGE_SIZE))) {
  

•                   DRM_ERROR("Failed to copy user data (%p) to drm buffer"
  

•                                   " (%p) %dth page.\n",
  

•                                   user_data, buf, idx);
  

•                   return -EFAULT;
  

•           }
  

•   }
  

•   buf->iterator = 0;
  

•   return 0;
  

-} -EXPORT_SYMBOL(drm_buffer_copy_from_user);

-/**

• • Free the drm buffer object
• */

-void drm_buffer_free(struct drm_buffer *buf) -{

•   if (buf != NULL) {
  

•           int nr_pages = buf->size / PAGE_SIZE + 1;
  

•           int idx;
  

•           for (idx = 0; idx < nr_pages; ++idx)
  

•                   kfree(buf->data[idx]);
  

•           kfree(buf);
  

•   }
  

-} -EXPORT_SYMBOL(drm_buffer_free);

-/**

• • Read an object from buffer that may be split to multiple parts. If object
• • is not split function just returns the pointer to object in buffer. But in
• • case of split object data is copied to given stack object that is suplied
• • by caller.
• • The processing location of the buffer is also advanced to the next byte
• • after the object.
• • objsize: The size of the objet in bytes.
• • stack_obj: A pointer to a memory location where object can be copied.
• */

-void *drm_buffer_read_object(struct drm_buffer *buf,

•           int objsize, void *stack_obj)
  

-{

•   int idx = drm_buffer_index(buf);
  

•   int page = drm_buffer_page(buf);
  

•   void *obj = NULL;
  

•   if (idx + objsize <= PAGE_SIZE) {
  

•           obj = &buf->data[page][idx];
  

•   } else {
  

•           /* The object is split which forces copy to temporary object.*/
  

•           int beginsz = PAGE_SIZE - idx;
  

•           memcpy(stack_obj, &buf->data[page][idx], beginsz);
  

•           memcpy(stack_obj + beginsz, &buf->data[page + 1][0],
  

•                           objsize - beginsz);
  

•           obj = stack_obj;
  

•   }
  

•   drm_buffer_advance(buf, objsize);
  

•   return obj;
  

-} -EXPORT_SYMBOL(drm_buffer_read_object); diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index 357f09a..7d7aed5 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile @@ -60,7 +60,7 @@ radeon-y := radeon_drv.o

# add UMS driver radeon-$(CONFIG_DRM_RADEON_UMS)+= radeon_cp.o radeon_state.o radeon_mem.o \

•   radeon_irq.o r300_cmdbuf.o r600_cp.o r600_blit.o
  

•   radeon_irq.o r300_cmdbuf.o r600_cp.o r600_blit.o drm_buffer.o
  
  

# add KMS driver radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ diff --git a/drivers/gpu/drm/radeon/drm_buffer.c b/drivers/gpu/drm/radeon/drm_buffer.c new file mode 100644 index 0000000..f4e0f3a --- /dev/null +++ b/drivers/gpu/drm/radeon/drm_buffer.c @@ -0,0 +1,177 @@ +/**************************************************************************

• • Copyright 2010 Pauli Nieminen.
• • All Rights Reserved.
• • Permission is hereby granted, free of charge, to any person obtaining a
• • copy of this software and associated documentation files (the
• • "Software"), to deal in the Software without restriction, including
• • without limitation the rights to use, copy, modify, merge, publish,
• • distribute, sub license, and/or sell copies of the Software, and to
• • permit persons to whom the Software is furnished to do so, subject to
• • the following conditions:
• • The above copyright notice and this permission notice (including the
• • next paragraph) shall be included in all copies or substantial portions
• • of the Software.
• • THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
• • IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
• • FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
• • THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
• • DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
• • OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
• • USE OR OTHER DEALINGS IN THE SOFTWARE.
• **************************************************************************/

+/*

• • Multipart buffer for coping data which is larger than the page size.
• • Authors:
• • Pauli Nieminen <suokkos-at-gmail-dot-com>
• */

+#include <linux/export.h> +#include "drm_buffer.h"

+/**

• • Allocate the drm buffer object.
• • buf: Pointer to a pointer where the object is stored.
• • size: The number of bytes to allocate.
• */

+int drm_buffer_alloc(struct drm_buffer **buf, int size) +{

•   int nr_pages = size / PAGE_SIZE + 1;
  

•   int idx;
  

•   /* Allocating pointer table to end of structure makes drm_buffer
  

•    * variable sized */
  

•   *buf = kzalloc(sizeof(struct drm_buffer) + nr_pages*sizeof(char *),
  

•                   GFP_KERNEL);
  

•   if (*buf == NULL) {
  

•           DRM_ERROR("Failed to allocate drm buffer object to hold"
  

•                           " %d bytes in %d pages.\n",
  

•                           size, nr_pages);
  

•           return -ENOMEM;
  

•   }
  

•   (*buf)->size = size;
  

•   for (idx = 0; idx < nr_pages; ++idx) {
  

•           (*buf)->data[idx] =
  

•                   kmalloc(min(PAGE_SIZE, size - idx * PAGE_SIZE),
  

•                           GFP_KERNEL);
  

•           if ((*buf)->data[idx] == NULL) {
  

•                   DRM_ERROR("Failed to allocate %dth page for drm"
  

•                                   " buffer with %d bytes and %d pages.\n",
  

•                                   idx + 1, size, nr_pages);
  

•                   goto error_out;
  

•           }
  

•   }
  

•   return 0;
  

+error_out:

•   for (; idx >= 0; --idx)
  

•           kfree((*buf)->data[idx]);
  

•   kfree(*buf);
  

•   return -ENOMEM;
  

+}

+/**

• • Copy the user data to the begin of the buffer and reset the processing
• • iterator.
• • user_data: A pointer the data that is copied to the buffer.
• • size: The Number of bytes to copy.
• */

+int drm_buffer_copy_from_user(struct drm_buffer *buf,

•                         void __user *user_data, int size)
  

+{

•   int nr_pages = size / PAGE_SIZE + 1;
  

•   int idx;
  

•   if (size > buf->size) {
  

•           DRM_ERROR("Requesting to copy %d bytes to a drm buffer with"
  

•                           " %d bytes space\n",
  

•                           size, buf->size);
  

•           return -EFAULT;
  

•   }
  

•   for (idx = 0; idx < nr_pages; ++idx) {
  

•           if (copy_from_user(buf->data[idx],
  

•                   user_data + idx * PAGE_SIZE,
  

•                   min(PAGE_SIZE, size - idx * PAGE_SIZE))) {
  

•                   DRM_ERROR("Failed to copy user data (%p) to drm buffer"
  

•                                   " (%p) %dth page.\n",
  

•                                   user_data, buf, idx);
  

•                   return -EFAULT;
  

•           }
  

•   }
  

•   buf->iterator = 0;
  

•   return 0;
  

+}

+/**

• • Free the drm buffer object
• */

+void drm_buffer_free(struct drm_buffer *buf) +{

•   if (buf != NULL) {
  

•           int nr_pages = buf->size / PAGE_SIZE + 1;
  

•           int idx;
  

•           for (idx = 0; idx < nr_pages; ++idx)
  

•                   kfree(buf->data[idx]);
  

•           kfree(buf);
  

•   }
  

+}

+/**

• • Read an object from buffer that may be split to multiple parts. If object
• • is not split function just returns the pointer to object in buffer. But in
• • case of split object data is copied to given stack object that is suplied
• • by caller.
• • The processing location of the buffer is also advanced to the next byte
• • after the object.
• • objsize: The size of the objet in bytes.
• • stack_obj: A pointer to a memory location where object can be copied.
• */

+void *drm_buffer_read_object(struct drm_buffer *buf,

•           int objsize, void *stack_obj)
  

+{

•   int idx = drm_buffer_index(buf);
  

•   int page = drm_buffer_page(buf);
  

•   void *obj = NULL;
  

•   if (idx + objsize <= PAGE_SIZE) {
  

•           obj = &buf->data[page][idx];
  

•   } else {
  

•           /* The object is split which forces copy to temporary object.*/
  

•           int beginsz = PAGE_SIZE - idx;
  

•           memcpy(stack_obj, &buf->data[page][idx], beginsz);
  

•           memcpy(stack_obj + beginsz, &buf->data[page + 1][0],
  

•                           objsize - beginsz);
  

•           obj = stack_obj;
  

•   }
  

•   drm_buffer_advance(buf, objsize);
  

•   return obj;
  

+} diff --git a/drivers/gpu/drm/radeon/drm_buffer.h b/drivers/gpu/drm/radeon/drm_buffer.h new file mode 100644 index 0000000..c80d3a3 --- /dev/null +++ b/drivers/gpu/drm/radeon/drm_buffer.h @@ -0,0 +1,148 @@ +/**************************************************************************

• • Copyright 2010 Pauli Nieminen.
• • All Rights Reserved.
• • Permission is hereby granted, free of charge, to any person obtaining a
• • copy of this software and associated documentation files (the
• • "Software"), to deal in the Software without restriction, including
• • without limitation the rights to use, copy, modify, merge, publish,
• • distribute, sub license, and/or sell copies of the Software, and to
• • permit persons to whom the Software is furnished to do so, subject to
• • the following conditions:
• • The above copyright notice and this permission notice (including the
• • next paragraph) shall be included in all copies or substantial portions
• • of the Software.
• • THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
• • IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
• • FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
• • THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
• • DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
• • OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
• • USE OR OTHER DEALINGS IN THE SOFTWARE.
• **************************************************************************/

+/*

• • Multipart buffer for coping data which is larger than the page size.
• • Authors:
• • Pauli Nieminen <suokkos-at-gmail-dot-com>
• */

+#ifndef _DRM_BUFFER_H_ +#define _DRM_BUFFER_H_

+#include <drm/drmP.h>

+struct drm_buffer {

•   int iterator;
  

•   int size;
  

•   char *data[];
  

+};

+/**

• • Return the index of page that buffer is currently pointing at.
• */

+static inline int drm_buffer_page(struct drm_buffer *buf) +{

•   return buf->iterator / PAGE_SIZE;
  

+} +/**

• • Return the index of the current byte in the page
• */

+static inline int drm_buffer_index(struct drm_buffer *buf) +{

•   return buf->iterator & (PAGE_SIZE - 1);
  

+} +/**

• • Return number of bytes that is left to process
• */

+static inline int drm_buffer_unprocessed(struct drm_buffer *buf) +{

•   return buf->size - buf->iterator;
  

+}

+/**

• • Advance the buffer iterator number of bytes that is given.
• */

+static inline void drm_buffer_advance(struct drm_buffer *buf, int bytes) +{

•   buf->iterator += bytes;
  

+}

+/**

• • Allocate the drm buffer object.
• • buf: A pointer to a pointer where the object is stored.
• • size: The number of bytes to allocate.
• */

+extern int drm_buffer_alloc(struct drm_buffer **buf, int size);

+/**

• • Copy the user data to the begin of the buffer and reset the processing
• • iterator.
• • user_data: A pointer the data that is copied to the buffer.
• • size: The Number of bytes to copy.
• */

+extern int drm_buffer_copy_from_user(struct drm_buffer *buf,

•           void __user *user_data, int size);
  

+/**

• • Free the drm buffer object
• */

+extern void drm_buffer_free(struct drm_buffer *buf);

+/**

• • Read an object from buffer that may be split to multiple parts. If object
• • is not split function just returns the pointer to object in buffer. But in
• • case of split object data is copied to given stack object that is suplied
• • by caller.
• • The processing location of the buffer is also advanced to the next byte
• • after the object.
• • objsize: The size of the objet in bytes.
• • stack_obj: A pointer to a memory location where object can be copied.
• */

+extern void *drm_buffer_read_object(struct drm_buffer *buf,

•           int objsize, void *stack_obj);
  

+/**

• • Returns the pointer to the dword which is offset number of elements from the
• • current processing location.
• • Caller must make sure that dword is not split in the buffer. This
• • requirement is easily met if all the sizes of objects in buffer are
• • multiples of dword and PAGE_SIZE is multiple dword.
• • Call to this function doesn't change the processing location.
• • offset: The index of the dword relative to the internat iterator.
• */

+static inline void *drm_buffer_pointer_to_dword(struct drm_buffer *buffer,

•           int offset)
  

+{

•   int iter = buffer->iterator + offset * 4;
  

•   return &buffer->data[iter / PAGE_SIZE][iter & (PAGE_SIZE - 1)];
  

+} +/**

• • Returns the pointer to the dword which is offset number of elements from
• • the current processing location.
• • Call to this function doesn't change the processing location.
• • offset: The index of the byte relative to the internat iterator.
• */

+static inline void *drm_buffer_pointer_to_byte(struct drm_buffer *buffer,

•           int offset)
  

+{

•   int iter = buffer->iterator + offset;
  

•   return &buffer->data[iter / PAGE_SIZE][iter & (PAGE_SIZE - 1)];
  

+}

+#endif diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c index 84b1d53..9418e38 100644 --- a/drivers/gpu/drm/radeon/r300_cmdbuf.c +++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c @@ -34,10 +34,10 @@ */

#include <drm/drmP.h> -#include <drm/drm_buffer.h> #include <drm/radeon_drm.h> #include "radeon_drv.h" #include "r300_reg.h" +#include "drm_buffer.h"

#include <asm/unaligned.h>

diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c index 23bb64f..535403e 100644 --- a/drivers/gpu/drm/radeon/radeon_state.c +++ b/drivers/gpu/drm/radeon/radeon_state.c @@ -30,9 +30,9 @@ */

#include <drm/drmP.h> -#include <drm/drm_buffer.h> #include <drm/radeon_drm.h> #include "radeon_drv.h" +#include "drm_buffer.h"

/* ================================================================

• Helper functions for client state checking and fixup

diff --git a/include/drm/drm_buffer.h b/include/drm/drm_buffer.h deleted file mode 100644 index c80d3a3..0000000 --- a/include/drm/drm_buffer.h +++ /dev/null @@ -1,148 +0,0 @@ -/**************************************************************************

• • Copyright 2010 Pauli Nieminen.
• • All Rights Reserved.
• • Permission is hereby granted, free of charge, to any person obtaining a
• • copy of this software and associated documentation files (the
• • "Software"), to deal in the Software without restriction, including
• • without limitation the rights to use, copy, modify, merge, publish,
• • distribute, sub license, and/or sell copies of the Software, and to
• • permit persons to whom the Software is furnished to do so, subject to
• • the following conditions:
• • The above copyright notice and this permission notice (including the
• • next paragraph) shall be included in all copies or substantial portions
• • of the Software.
• • THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
• • IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
• • FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
• • THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
• • DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
• • OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
• • USE OR OTHER DEALINGS IN THE SOFTWARE.
• **************************************************************************/

-/*

• • Multipart buffer for coping data which is larger than the page size.
• • Authors:
• • Pauli Nieminen <suokkos-at-gmail-dot-com>
• */

-#ifndef _DRM_BUFFER_H_ -#define _DRM_BUFFER_H_

-#include <drm/drmP.h>

-struct drm_buffer {

•   int iterator;
  

•   int size;
  

•   char *data[];
  

-};

-/**

• • Return the index of page that buffer is currently pointing at.
• */

-static inline int drm_buffer_page(struct drm_buffer *buf) -{

•   return buf->iterator / PAGE_SIZE;
  

-} -/**

• • Return the index of the current byte in the page
• */

-static inline int drm_buffer_index(struct drm_buffer *buf) -{

•   return buf->iterator & (PAGE_SIZE - 1);
  

-} -/**

• • Return number of bytes that is left to process
• */

-static inline int drm_buffer_unprocessed(struct drm_buffer *buf) -{

•   return buf->size - buf->iterator;
  

-}

-/**

• • Advance the buffer iterator number of bytes that is given.
• */

-static inline void drm_buffer_advance(struct drm_buffer *buf, int bytes) -{

•   buf->iterator += bytes;
  

-}

-/**

• • Allocate the drm buffer object.
• • buf: A pointer to a pointer where the object is stored.
• • size: The number of bytes to allocate.
• */

-extern int drm_buffer_alloc(struct drm_buffer **buf, int size);

-/**

• • Copy the user data to the begin of the buffer and reset the processing
• • iterator.
• • user_data: A pointer the data that is copied to the buffer.
• • size: The Number of bytes to copy.
• */

-extern int drm_buffer_copy_from_user(struct drm_buffer *buf,

•           void __user *user_data, int size);
  

-/**

• • Free the drm buffer object
• */

-extern void drm_buffer_free(struct drm_buffer *buf);

-/**

• • Read an object from buffer that may be split to multiple parts. If object
• • is not split function just returns the pointer to object in buffer. But in
• • case of split object data is copied to given stack object that is suplied
• • by caller.
• • The processing location of the buffer is also advanced to the next byte
• • after the object.
• • objsize: The size of the objet in bytes.
• • stack_obj: A pointer to a memory location where object can be copied.
• */

-extern void *drm_buffer_read_object(struct drm_buffer *buf,

•           int objsize, void *stack_obj);
  

-/**

• • Returns the pointer to the dword which is offset number of elements from the
• • current processing location.
• • Caller must make sure that dword is not split in the buffer. This
• • requirement is easily met if all the sizes of objects in buffer are
• • multiples of dword and PAGE_SIZE is multiple dword.
• • Call to this function doesn't change the processing location.
• • offset: The index of the dword relative to the internat iterator.
• */

-static inline void *drm_buffer_pointer_to_dword(struct drm_buffer *buffer,

•           int offset)
  

-{

•   int iter = buffer->iterator + offset * 4;
  

•   return &buffer->data[iter / PAGE_SIZE][iter & (PAGE_SIZE - 1)];
  

-} -/**

• • Returns the pointer to the dword which is offset number of elements from
• • the current processing location.
• • Call to this function doesn't change the processing location.
• • offset: The index of the byte relative to the internat iterator.
• */

-static inline void *drm_buffer_pointer_to_byte(struct drm_buffer *buffer,

•           int offset)
  

-{

•   int iter = buffer->iterator + offset;
  

•   return &buffer->data[iter / PAGE_SIZE][iter & (PAGE_SIZE - 1)];
  

-}

-#endif

2.1.0