Commit 2b35892e authored by Inki Dae's avatar Inki Dae Committed by Dave Airlie

drm/exynos: update gem and buffer framework.

with this patch, we can allocate physically continuous or non-continuous
memory and also it creates scatterlist for iommu support so allocated
memory region can be mapped to iommu page table using scatterlist.
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1de425b0
...@@ -25,45 +25,161 @@ ...@@ -25,45 +25,161 @@
#include "drmP.h" #include "drmP.h"
#include "drm.h" #include "drm.h"
#include "exynos_drm.h"
#include "exynos_drm_drv.h" #include "exynos_drm_drv.h"
#include "exynos_drm_gem.h" #include "exynos_drm_gem.h"
#include "exynos_drm_buf.h" #include "exynos_drm_buf.h"
static int lowlevel_buffer_allocate(struct drm_device *dev, static int lowlevel_buffer_allocate(struct drm_device *dev,
struct exynos_drm_gem_buf *buffer) unsigned int flags, struct exynos_drm_gem_buf *buf)
{ {
dma_addr_t start_addr, end_addr;
unsigned int npages, page_size, i = 0;
struct scatterlist *sgl;
int ret = 0;
DRM_DEBUG_KMS("%s\n", __FILE__); DRM_DEBUG_KMS("%s\n", __FILE__);
buffer->kvaddr = dma_alloc_writecombine(dev->dev, buffer->size, if (flags & EXYNOS_BO_NONCONTIG) {
&buffer->dma_addr, GFP_KERNEL); DRM_DEBUG_KMS("not support allocation type.\n");
if (!buffer->kvaddr) { return -EINVAL;
DRM_ERROR("failed to allocate buffer.\n"); }
if (buf->dma_addr) {
DRM_DEBUG_KMS("already allocated.\n");
return 0;
}
if (buf->size >= SZ_1M) {
npages = (buf->size >> SECTION_SHIFT) + 1;
page_size = SECTION_SIZE;
} else if (buf->size >= SZ_64K) {
npages = (buf->size >> 16) + 1;
page_size = SZ_64K;
} else {
npages = (buf->size >> PAGE_SHIFT) + 1;
page_size = PAGE_SIZE;
}
buf->sgt = kzalloc(sizeof(struct sg_table), GFP_KERNEL);
if (!buf->sgt) {
DRM_ERROR("failed to allocate sg table.\n");
return -ENOMEM; return -ENOMEM;
} }
DRM_DEBUG_KMS("vaddr(0x%lx), dma_addr(0x%lx), size(0x%lx)\n", ret = sg_alloc_table(buf->sgt, npages, GFP_KERNEL);
(unsigned long)buffer->kvaddr, if (ret < 0) {
(unsigned long)buffer->dma_addr, DRM_ERROR("failed to initialize sg table.\n");
buffer->size); kfree(buf->sgt);
buf->sgt = NULL;
return -ENOMEM;
}
return 0; buf->kvaddr = dma_alloc_writecombine(dev->dev, buf->size,
&buf->dma_addr, GFP_KERNEL);
if (!buf->kvaddr) {
DRM_ERROR("failed to allocate buffer.\n");
ret = -ENOMEM;
goto err1;
}
start_addr = buf->dma_addr;
end_addr = buf->dma_addr + buf->size;
buf->pages = kzalloc(sizeof(struct page) * npages, GFP_KERNEL);
if (!buf->pages) {
DRM_ERROR("failed to allocate pages.\n");
ret = -ENOMEM;
goto err2;
}
start_addr = buf->dma_addr;
end_addr = buf->dma_addr + buf->size;
buf->pages = kzalloc(sizeof(struct page) * npages, GFP_KERNEL);
if (!buf->pages) {
DRM_ERROR("failed to allocate pages.\n");
ret = -ENOMEM;
goto err2;
}
sgl = buf->sgt->sgl;
while (i < npages) {
buf->pages[i] = phys_to_page(start_addr);
sg_set_page(sgl, buf->pages[i], page_size, 0);
sg_dma_address(sgl) = start_addr;
start_addr += page_size;
if (end_addr - start_addr < page_size)
break;
sgl = sg_next(sgl);
i++;
}
buf->pages[i] = phys_to_page(start_addr);
sgl = sg_next(sgl);
sg_set_page(sgl, buf->pages[i+1], end_addr - start_addr, 0);
DRM_DEBUG_KMS("vaddr(0x%lx), dma_addr(0x%lx), size(0x%lx)\n",
(unsigned long)buf->kvaddr,
(unsigned long)buf->dma_addr,
buf->size);
return ret;
err2:
dma_free_writecombine(dev->dev, buf->size, buf->kvaddr,
(dma_addr_t)buf->dma_addr);
buf->dma_addr = (dma_addr_t)NULL;
err1:
sg_free_table(buf->sgt);
kfree(buf->sgt);
buf->sgt = NULL;
return ret;
} }
static void lowlevel_buffer_deallocate(struct drm_device *dev, static void lowlevel_buffer_deallocate(struct drm_device *dev,
struct exynos_drm_gem_buf *buffer) unsigned int flags, struct exynos_drm_gem_buf *buf)
{ {
DRM_DEBUG_KMS("%s.\n", __FILE__); DRM_DEBUG_KMS("%s.\n", __FILE__);
if (buffer->dma_addr && buffer->size) /*
dma_free_writecombine(dev->dev, buffer->size, buffer->kvaddr, * release only physically continuous memory and
(dma_addr_t)buffer->dma_addr); * non-continuous memory would be released by exynos
else * gem framework.
DRM_DEBUG_KMS("buffer data are invalid.\n"); */
if (flags & EXYNOS_BO_NONCONTIG) {
DRM_DEBUG_KMS("not support allocation type.\n");
return;
}
if (!buf->dma_addr) {
DRM_DEBUG_KMS("dma_addr is invalid.\n");
return;
}
DRM_DEBUG_KMS("vaddr(0x%lx), dma_addr(0x%lx), size(0x%lx)\n",
(unsigned long)buf->kvaddr,
(unsigned long)buf->dma_addr,
buf->size);
sg_free_table(buf->sgt);
kfree(buf->sgt);
buf->sgt = NULL;
kfree(buf->pages);
buf->pages = NULL;
dma_free_writecombine(dev->dev, buf->size, buf->kvaddr,
(dma_addr_t)buf->dma_addr);
buf->dma_addr = (dma_addr_t)NULL;
} }
struct exynos_drm_gem_buf *exynos_drm_buf_create(struct drm_device *dev, struct exynos_drm_gem_buf *exynos_drm_init_buf(struct drm_device *dev,
unsigned int size) unsigned int size)
{ {
struct exynos_drm_gem_buf *buffer; struct exynos_drm_gem_buf *buffer;
...@@ -77,21 +193,11 @@ struct exynos_drm_gem_buf *exynos_drm_buf_create(struct drm_device *dev, ...@@ -77,21 +193,11 @@ struct exynos_drm_gem_buf *exynos_drm_buf_create(struct drm_device *dev,
} }
buffer->size = size; buffer->size = size;
/*
* allocate memory region with size and set the memory information
* to vaddr and dma_addr of a buffer object.
*/
if (lowlevel_buffer_allocate(dev, buffer) < 0) {
kfree(buffer);
return NULL;
}
return buffer; return buffer;
} }
void exynos_drm_buf_destroy(struct drm_device *dev, void exynos_drm_fini_buf(struct drm_device *dev,
struct exynos_drm_gem_buf *buffer) struct exynos_drm_gem_buf *buffer)
{ {
DRM_DEBUG_KMS("%s.\n", __FILE__); DRM_DEBUG_KMS("%s.\n", __FILE__);
...@@ -100,12 +206,27 @@ void exynos_drm_buf_destroy(struct drm_device *dev, ...@@ -100,12 +206,27 @@ void exynos_drm_buf_destroy(struct drm_device *dev,
return; return;
} }
lowlevel_buffer_deallocate(dev, buffer);
kfree(buffer); kfree(buffer);
buffer = NULL; buffer = NULL;
} }
MODULE_AUTHOR("Inki Dae <inki.dae@samsung.com>"); int exynos_drm_alloc_buf(struct drm_device *dev,
MODULE_DESCRIPTION("Samsung SoC DRM Buffer Management Module"); struct exynos_drm_gem_buf *buf, unsigned int flags)
MODULE_LICENSE("GPL"); {
/*
* allocate memory region and set the memory information
* to vaddr and dma_addr of a buffer object.
*/
if (lowlevel_buffer_allocate(dev, flags, buf) < 0)
return -ENOMEM;
return 0;
}
void exynos_drm_free_buf(struct drm_device *dev,
unsigned int flags, struct exynos_drm_gem_buf *buffer)
{
lowlevel_buffer_deallocate(dev, flags, buffer);
}
...@@ -26,12 +26,22 @@ ...@@ -26,12 +26,22 @@
#ifndef _EXYNOS_DRM_BUF_H_ #ifndef _EXYNOS_DRM_BUF_H_
#define _EXYNOS_DRM_BUF_H_ #define _EXYNOS_DRM_BUF_H_
/* allocate physical memory. */ /* create and initialize buffer object. */
struct exynos_drm_gem_buf *exynos_drm_buf_create(struct drm_device *dev, struct exynos_drm_gem_buf *exynos_drm_init_buf(struct drm_device *dev,
unsigned int size); unsigned int size);
/* remove allocated physical memory. */ /* destroy buffer object. */
void exynos_drm_buf_destroy(struct drm_device *dev, void exynos_drm_fini_buf(struct drm_device *dev,
struct exynos_drm_gem_buf *buffer); struct exynos_drm_gem_buf *buffer);
/* allocate physical memory region and setup sgt and pages. */
int exynos_drm_alloc_buf(struct drm_device *dev,
struct exynos_drm_gem_buf *buf,
unsigned int flags);
/* release physical memory region, sgt and pages. */
void exynos_drm_free_buf(struct drm_device *dev,
unsigned int flags,
struct exynos_drm_gem_buf *buffer);
#endif #endif
...@@ -125,7 +125,9 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper, ...@@ -125,7 +125,9 @@ static int exynos_drm_fbdev_create(struct drm_fb_helper *helper,
} }
size = mode_cmd.pitches[0] * mode_cmd.height; size = mode_cmd.pitches[0] * mode_cmd.height;
exynos_gem_obj = exynos_drm_gem_create(dev, size);
/* 0 means to allocate physically continuous memory */
exynos_gem_obj = exynos_drm_gem_create(dev, 0, size);
if (IS_ERR(exynos_gem_obj)) { if (IS_ERR(exynos_gem_obj)) {
ret = PTR_ERR(exynos_gem_obj); ret = PTR_ERR(exynos_gem_obj);
goto out; goto out;
......
This diff is collapsed.
...@@ -36,11 +36,15 @@ ...@@ -36,11 +36,15 @@
* @dma_addr: bus address(accessed by dma) to allocated memory region. * @dma_addr: bus address(accessed by dma) to allocated memory region.
* - this address could be physical address without IOMMU and * - this address could be physical address without IOMMU and
* device address with IOMMU. * device address with IOMMU.
* @sgt: sg table to transfer page data.
* @pages: contain all pages to allocated memory region.
* @size: size of allocated memory region. * @size: size of allocated memory region.
*/ */
struct exynos_drm_gem_buf { struct exynos_drm_gem_buf {
void __iomem *kvaddr; void __iomem *kvaddr;
dma_addr_t dma_addr; dma_addr_t dma_addr;
struct sg_table *sgt;
struct page **pages;
unsigned long size; unsigned long size;
}; };
...@@ -55,6 +59,8 @@ struct exynos_drm_gem_buf { ...@@ -55,6 +59,8 @@ struct exynos_drm_gem_buf {
* by user request or at framebuffer creation. * by user request or at framebuffer creation.
* continuous memory region allocated by user request * continuous memory region allocated by user request
* or at framebuffer creation. * or at framebuffer creation.
* @size: total memory size to physically non-continuous memory region.
* @flags: indicate memory type to allocated buffer and cache attruibute.
* *
* P.S. this object would be transfered to user as kms_bo.handle so * P.S. this object would be transfered to user as kms_bo.handle so
* user can access the buffer through kms_bo.handle. * user can access the buffer through kms_bo.handle.
...@@ -62,6 +68,8 @@ struct exynos_drm_gem_buf { ...@@ -62,6 +68,8 @@ struct exynos_drm_gem_buf {
struct exynos_drm_gem_obj { struct exynos_drm_gem_obj {
struct drm_gem_object base; struct drm_gem_object base;
struct exynos_drm_gem_buf *buffer; struct exynos_drm_gem_buf *buffer;
unsigned long size;
unsigned int flags;
}; };
/* destroy a buffer with gem object */ /* destroy a buffer with gem object */
...@@ -69,7 +77,8 @@ void exynos_drm_gem_destroy(struct exynos_drm_gem_obj *exynos_gem_obj); ...@@ -69,7 +77,8 @@ void exynos_drm_gem_destroy(struct exynos_drm_gem_obj *exynos_gem_obj);
/* create a new buffer with gem object */ /* create a new buffer with gem object */
struct exynos_drm_gem_obj *exynos_drm_gem_create(struct drm_device *dev, struct exynos_drm_gem_obj *exynos_drm_gem_create(struct drm_device *dev,
unsigned long size); unsigned int flags,
unsigned long size);
/* /*
* request gem object creation and buffer allocation as the size * request gem object creation and buffer allocation as the size
......
...@@ -79,6 +79,12 @@ struct drm_exynos_plane_set_zpos { ...@@ -79,6 +79,12 @@ struct drm_exynos_plane_set_zpos {
__s32 zpos; __s32 zpos;
}; };
/* memory type definitions. */
enum e_drm_exynos_gem_mem_type {
/* Physically Non-Continuous memory. */
EXYNOS_BO_NONCONTIG = 1 << 0
};
#define DRM_EXYNOS_GEM_CREATE 0x00 #define DRM_EXYNOS_GEM_CREATE 0x00
#define DRM_EXYNOS_GEM_MAP_OFFSET 0x01 #define DRM_EXYNOS_GEM_MAP_OFFSET 0x01
#define DRM_EXYNOS_GEM_MMAP 0x02 #define DRM_EXYNOS_GEM_MMAP 0x02
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment