Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

msm: kgsl: Add genlock to KGSL DRM driver

Browse source 
This change is to enable frame buffers lock between multiple processes
through genlock.
Genlock is a in-kernel API and optional userspace interface for a generic
cross-process locking mechanism.

Change-Id: If07f024092caee4a257cd70d79799f4231a2cf46
Signed-off-by: Alex Wong <waiw@codeaurora.org>
Signed-off-by: Carter Cooper <ccooper@codeaurora.org>
This commit is contained in:
Carter Cooper 2013-04-05 00:01:57 -07:00 committed by Iliyan Malchev
parent 278b58d737
commit 77da92a14c
2 changed files with 150 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
drivers/gpu/msm/kgsl_drm.c
View file

@ -18,6 +18,7 @@
#include "drm.h"
#include <linux/msm_ion.h>
#include <linux/genlock.h>
#include "kgsl.h"
#include "kgsl_device.h"
@ -119,6 +120,8 @@ struct drm_kgsl_gem_object {
uint32_t gpuaddr;
} bufs[DRM_KGSL_GEM_MAX_BUFFERS];
struct genlock_handle *glock_handle[DRM_KGSL_GEM_MAX_BUFFERS];
int bound;
int lockpid;
/* Put these here to avoid allocing all the time */
@ -154,6 +157,7 @@ static int
kgsl_gem_alloc_memory(struct drm_gem_object *obj)
{
struct drm_kgsl_gem_object *priv = obj->driver_private;
struct kgsl_mmu *mmu;
struct sg_table *sg_table;
struct scatterlist *s;
int index;
@ -165,7 +169,17 @@ kgsl_gem_alloc_memory(struct drm_gem_object *obj)
return 0;
if (priv->pagetable == NULL) {
priv->pagetable = kgsl_mmu_getpagetable(KGSL_MMU_GLOBAL_PT);
/* Hard coded to use A2X device for MSM7X27 and MSM8625
* Others to use A3X device
*/
#if defined(CONFIG_ARCH_MSM7X27) || defined(CONFIG_ARCH_MSM8625)
mmu = &kgsl_get_device(KGSL_DEVICE_2D0)->mmu;
#else
mmu = &kgsl_get_device(KGSL_DEVICE_3D0)->mmu;
#endif
priv->pagetable = kgsl_mmu_getpagetable(mmu,
KGSL_MMU_GLOBAL_PT);
if (priv->pagetable == NULL) {
DRM_ERROR("Unable to get the GPU MMU pagetable\n");
@ -260,8 +274,7 @@ kgsl_gem_alloc_memory(struct drm_gem_object *obj)
priv->memdesc.sglen++;
}
result = kgsl_mmu_map(priv->pagetable, &priv->memdesc,
GSL_PT_PAGE_RV | GSL_PT_PAGE_WV);
result = kgsl_mmu_map(priv->pagetable, &priv->memdesc);
if (result) {
DRM_ERROR(
"kgsl_mmu_map failed. result = %d\n", result);
@ -294,6 +307,7 @@ static void
kgsl_gem_free_memory(struct drm_gem_object *obj)
{
struct drm_kgsl_gem_object *priv = obj->driver_private;
int index;
if (!kgsl_gem_memory_allocated(obj) || TYPE_IS_FD(priv->type))
return;
@ -312,6 +326,11 @@ kgsl_gem_free_memory(struct drm_gem_object *obj)
memset(&priv->memdesc, 0, sizeof(priv->memdesc));
for (index = 0; index < priv->bufcount; index++) {
if (priv->glock_handle[index])
genlock_put_handle(priv->glock_handle[index]);
}
kgsl_mmu_putpagetable(priv->pagetable);
priv->pagetable = NULL;
@ -553,6 +572,7 @@ kgsl_gem_create_from_ion_ioctl(struct drm_device *dev, void *data,
struct scatterlist *s;
int ret, handle;
unsigned long size;
struct kgsl_mmu *mmu;
ion_handle = ion_import_dma_buf(kgsl_drm_ion_client, args->ion_fd);
if (IS_ERR_OR_NULL(ion_handle)) {
@ -592,7 +612,13 @@ kgsl_gem_create_from_ion_ioctl(struct drm_device *dev, void *data,
priv->type = DRM_KGSL_GEM_TYPE_KMEM;
list_add(&priv->list, &kgsl_mem_list);
priv->pagetable = kgsl_mmu_getpagetable(KGSL_MMU_GLOBAL_PT);
#if defined(CONFIG_ARCH_MSM7X27) || defined(CONFIG_ARCH_MSM8625)
mmu = &kgsl_get_device(KGSL_DEVICE_2D0)->mmu;
#else
mmu = &kgsl_get_device(KGSL_DEVICE_3D0)->mmu;
#endif
priv->pagetable = kgsl_mmu_getpagetable(mmu, KGSL_MMU_GLOBAL_PT);
priv->memdesc.pagetable = priv->pagetable;
@ -620,8 +646,7 @@ kgsl_gem_create_from_ion_ioctl(struct drm_device *dev, void *data,
priv->memdesc.sglen++;
}
ret = kgsl_mmu_map(priv->pagetable, &priv->memdesc,
GSL_PT_PAGE_RV | GSL_PT_PAGE_WV);
ret = kgsl_mmu_map(priv->pagetable, &priv->memdesc);
if (ret) {
DRM_ERROR("kgsl_mmu_map failed. ret = %d\n", ret);
ion_free(kgsl_drm_ion_client,
@ -878,6 +903,68 @@ out:
return ret;
}
/* Get the genlock handles base off the GEM handle
*/
int
kgsl_gem_get_glock_handles_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
struct drm_kgsl_gem_glockinfo *args = data;
struct drm_gem_object *obj;
struct drm_kgsl_gem_object *priv;
int index;
obj = drm_gem_object_lookup(dev, file_priv, args->handle);
if (obj == NULL) {
DRM_ERROR("Invalid GEM handle %x\n", args->handle);
return -EBADF;
}
mutex_lock(&dev->struct_mutex);
priv = obj->driver_private;
for (index = 0; index < priv->bufcount; index++) {
args->glockhandle[index] = genlock_get_fd_handle(
priv->glock_handle[index]);
}
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
return 0;
}
int
kgsl_gem_set_glock_handles_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
struct drm_kgsl_gem_glockinfo *args = data;
struct drm_gem_object *obj;
struct drm_kgsl_gem_object *priv;
int index;
obj = drm_gem_object_lookup(dev, file_priv, args->handle);
if (obj == NULL) {
DRM_ERROR("Invalid GEM handle %x\n", args->handle);
return -EBADF;
}
mutex_lock(&dev->struct_mutex);
priv = obj->driver_private;
for (index = 0; index < priv->bufcount; index++) {
priv->glock_handle[index] = genlock_get_handle_fd(
args->glockhandle[index]);
}
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
return 0;
}
int
kgsl_gem_set_bufcount_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
@ -919,6 +1006,32 @@ out:
return ret;
}
int
kgsl_gem_get_bufcount_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
struct drm_kgsl_gem_bufcount *args = data;
struct drm_gem_object *obj;
struct drm_kgsl_gem_object *priv;
obj = drm_gem_object_lookup(dev, file_priv, args->handle);
if (obj == NULL) {
DRM_ERROR("Invalid GEM handle %x\n", args->handle);
return -EBADF;
}
mutex_lock(&dev->struct_mutex);
priv = obj->driver_private;
args->bufcount = priv->bufcount;
drm_gem_object_unreference(obj);
mutex_unlock(&dev->struct_mutex);
return 0;
}
int
kgsl_gem_set_active_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv)
@ -1376,9 +1489,15 @@ struct drm_ioctl_desc kgsl_drm_ioctls[] = {
DRM_IOCTL_DEF_DRV(KGSL_GEM_GET_BUFINFO, kgsl_gem_get_bufinfo_ioctl, 0),
DRM_IOCTL_DEF_DRV(KGSL_GEM_GET_ION_FD, kgsl_gem_get_ion_fd_ioctl, 0),
DRM_IOCTL_DEF_DRV(KGSL_GEM_CREATE_FROM_ION,
kgsl_gem_create_from_ion_ioctl, 0),
kgsl_gem_create_from_ion_ioctl, 0),
DRM_IOCTL_DEF_DRV(KGSL_GEM_SET_BUFCOUNT,
kgsl_gem_set_bufcount_ioctl, 0),
kgsl_gem_set_bufcount_ioctl, 0),
DRM_IOCTL_DEF_DRV(KGSL_GEM_GET_BUFCOUNT,
kgsl_gem_get_bufcount_ioctl, 0),
DRM_IOCTL_DEF_DRV(KGSL_GEM_SET_GLOCK_HANDLES_INFO,
kgsl_gem_set_glock_handles_ioctl, 0),
DRM_IOCTL_DEF_DRV(KGSL_GEM_GET_GLOCK_HANDLES_INFO,
kgsl_gem_get_glock_handles_ioctl, 0),
DRM_IOCTL_DEF_DRV(KGSL_GEM_SET_ACTIVE, kgsl_gem_set_active_ioctl, 0),
DRM_IOCTL_DEF_DRV(KGSL_GEM_LOCK_HANDLE,
kgsl_gem_lock_handle_ioctl, 0),

23
include/drm/kgsl_drm.h
View file

@ -21,6 +21,10 @@
#define DRM_KGSL_GEM_CREATE_FD 0x0E
#define DRM_KGSL_GEM_GET_ION_FD 0x0F
#define DRM_KGSL_GEM_CREATE_FROM_ION 0x10
#define DRM_KGSL_GEM_SET_GLOCK_HANDLES_INFO 0x11
#define DRM_KGSL_GEM_GET_GLOCK_HANDLES_INFO 0x12
#define DRM_KGSL_GEM_GET_BUFCOUNT 0x13
#define DRM_IOCTL_KGSL_GEM_CREATE \
DRM_IOWR(DRM_COMMAND_BASE + DRM_KGSL_GEM_CREATE, struct drm_kgsl_gem_create)
@ -57,6 +61,10 @@ DRM_IOWR(DRM_COMMAND_BASE + DRM_KGSL_GEM_GET_BUFINFO, \
DRM_IOWR(DRM_COMMAND_BASE + DRM_KGSL_GEM_SET_BUFCOUNT, \
struct drm_kgsl_gem_bufcount)
#define DRM_IOCTL_KGSL_GEM_GET_BUFCOUNT \
DRM_IOWR(DRM_COMMAND_BASE + DRM_KGSL_GEM_GET_BUFCOUNT, \
struct drm_kgsl_gem_bufcount)
#define DRM_IOCTL_KGSL_GEM_SET_ACTIVE \
DRM_IOWR(DRM_COMMAND_BASE + DRM_KGSL_GEM_SET_ACTIVE, \
struct drm_kgsl_gem_active)
@ -85,6 +93,16 @@ struct drm_kgsl_gem_get_ion_fd)
DRM_IOWR(DRM_COMMAND_BASE + DRM_KGSL_GEM_CREATE_FROM_ION, \
struct drm_kgsl_gem_create_from_ion)
#define DRM_IOCTL_KGSL_GEM_SET_GLOCK_HANDLES_INFO \
DRM_IOWR(DRM_COMMAND_BASE + DRM_KGSL_GEM_SET_GLOCK_HANDLES_INFO, \
struct drm_kgsl_gem_glockinfo)
#define DRM_IOCTL_KGSL_GEM_GET_GLOCK_HANDLES_INFO \
DRM_IOWR(DRM_COMMAND_BASE + DRM_KGSL_GEM_GET_GLOCK_HANDLES_INFO, \
struct drm_kgsl_gem_glockinfo)
/* Maximum number of sub buffers per GEM object */
#define DRM_KGSL_GEM_MAX_BUFFERS 2
@ -167,6 +185,11 @@ struct drm_kgsl_gem_bufinfo {
uint32_t gpuaddr[DRM_KGSL_GEM_MAX_BUFFERS];
};
struct drm_kgsl_gem_glockinfo {
uint32_t handle;
int glockhandle[DRM_KGSL_GEM_MAX_BUFFERS];
};
struct drm_kgsl_gem_bufcount {
uint32_t handle;
uint32_t bufcount;