msm: kgsl: Fix an over greedy CONFIG_ANDROID_PMEM ifdef
kgsl_get_phys_file is used for both PMEM and the framebuffer,
so adjust the #ifdef CONFIG_ANDROID_PMEM to only omit the
PMEM specific parts.
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c
index 95c7737..394c037 100644
--- a/drivers/gpu/msm/kgsl.c
+++ b/drivers/gpu/msm/kgsl.c
@@ -1165,7 +1165,6 @@
return (end > len);
}
-#ifdef CONFIG_ANDROID_PMEM
static int kgsl_get_phys_file(int fd, unsigned long *start, unsigned long *len,
unsigned long *vstart, struct file **filep)
{
@@ -1175,8 +1174,10 @@
struct fb_info *info;
*filep = NULL;
+#ifdef CONFIG_ANDROID_PMEM
if (!get_pmem_file(fd, start, vstart, len, filep))
return 0;
+#endif
fbfile = fget(fd);
if (fbfile == NULL) {
@@ -1252,18 +1253,11 @@
return 0;
err:
+#ifdef CONFIG_ANDROID_PMEM
put_pmem_file(filep);
+#endif
return ret;
}
-#else
-static int kgsl_setup_phys_file(struct kgsl_mem_entry *entry,
- struct kgsl_pagetable *pagetable,
- unsigned int fd, unsigned int offset,
- size_t size)
-{
- return -EINVAL;
-}
-#endif
static int kgsl_setup_hostptr(struct kgsl_mem_entry *entry,
struct kgsl_pagetable *pagetable,