projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-next
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
exynos
/
exynos_drm_gem.c
diff --git
a/drivers/gpu/drm/exynos/exynos_drm_gem.c
b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 85808ad3c23630268214f5b16ca34b20cd30d8c7..be59d50d8b16c836fbd1a5c88ed2bea87a7b769f 100644
(file)
--- a/
drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/
drivers/gpu/drm/exynos/exynos_drm_gem.c
@@
-630,11
+630,6
@@
void exynos_gem_unmap_sgt_from_dma(struct drm_device *drm_dev,
dma_unmap_sg(drm_dev->dev, sgt->sgl, sgt->nents, dir);
}
-int exynos_drm_gem_init_object(struct drm_gem_object *obj)
-{
- return 0;
-}
-
void exynos_drm_gem_free_object(struct drm_gem_object *obj)
{
struct exynos_drm_gem_obj *exynos_gem_obj;