diff options
author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
---|---|---|
committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/gpu/drm/exynos/exynos_drm_ump.c | |
parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_ump.c')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_ump.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ump.c b/drivers/gpu/drm/exynos/exynos_drm_ump.c index fd9ba2a..f92759f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ump.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ump.c @@ -85,7 +85,7 @@ static int exynos_drm_ump_add_buffer(void *obj, * physically continuous buffer so let a ump descriptor * have one buffer address. */ - ump_mem_desc[0].addr = (unsigned long)buf->dma_addr; + ump_mem_desc[0].addr = (unsigned long)buf->paddr; ump_mem_desc[0].size = buf->size; } @@ -115,13 +115,6 @@ static int exynos_drm_ump_add_buffer(void *obj, static void exynos_drm_ump_release_buffer(unsigned int handle) { DRM_DEBUG_KMS("%s\n", __FILE__); - - if (!handle) { - DRM_DEBUG_KMS("invalid ump handle.\n"); - return; - } - - ump_dd_reference_release((ump_dd_handle)handle); } static struct exynos_drm_private_cb ump_callback = { |