From 00ba5a9ddd04b44cebf2bbd6014da57f06413d5e Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 1 Jan 2015 16:21:46 +0800 Subject: gralloc_drm: improve log --- gralloc_drm.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'gralloc_drm.c') diff --git a/gralloc_drm.c b/gralloc_drm.c index bd38d57..bd752cb 100644 --- a/gralloc_drm.c +++ b/gralloc_drm.c @@ -70,26 +70,31 @@ init_drv_from_fd(int fd) if (version->name) { #ifdef ENABLE_PIPE drv = gralloc_drm_drv_create_for_pipe(fd, version->name); + ALOGI_IF(drv, "create pipe for driver %s", version->name); #endif #ifdef ENABLE_INTEL - if (!drv && !strcmp(version->name, "i915")) + if (!drv && !strcmp(version->name, "i915")) { drv = gralloc_drm_drv_create_for_intel(fd); + ALOGI_IF(drv, "create intel for driver i915"); + } #endif #ifdef ENABLE_RADEON - if (!drv && !strcmp(version->name, "radeon")) + if (!drv && !strcmp(version->name, "radeon")) { drv = gralloc_drm_drv_create_for_radeon(fd); + ALOGI_IF(drv, "create radeon for driver radeon"); + } #endif #ifdef ENABLE_NOUVEAU - if (!drv && !strcmp(version->name, "nouveau")) + if (!drv && !strcmp(version->name, "nouveau")) { drv = gralloc_drm_drv_create_for_nouveau(fd); + ALOGI_IF(drv, "create nouveau for driver nouveau"); + } #endif } - if (!drv) { - ALOGE("unsupported driver: %s", (version->name) ? - version->name : "NULL"); - } + ALOGE_IF(!drv, "unsupported driver: %s", (version->name) ? + version->name : "NULL"); drmFreeVersion(version); -- cgit v1.1 From c46b2ee2cace20f67b0c5e1121e1973a7678fd60 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Fri, 1 Aug 2014 20:02:02 +0100 Subject: freedreno: completely untested initial support v2: [Emil Velikov] - drmGetVersion returns the kernel module name. - Add it to the build :) - freedreno_map returns void * while gralloc::map expects int. Signed-off-by: Emil Velikov --- gralloc_drm.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gralloc_drm.c') diff --git a/gralloc_drm.c b/gralloc_drm.c index bd752cb..c53e556 100644 --- a/gralloc_drm.c +++ b/gralloc_drm.c @@ -73,6 +73,10 @@ init_drv_from_fd(int fd) ALOGI_IF(drv, "create pipe for driver %s", version->name); #endif +#ifdef ENABLE_FREEDRENO + if (!drv && !strcmp(version->name, "msm")) + drv = gralloc_drm_drv_create_for_freedreno(fd); +#endif #ifdef ENABLE_INTEL if (!drv && !strcmp(version->name, "i915")) { drv = gralloc_drm_drv_create_for_intel(fd); -- cgit v1.1 From eccafc5cee44cb0a42a465bd6d9e3ec9018d5a2a Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 1 Aug 2014 20:11:07 +0100 Subject: gralloc_drm: bail out early when we find the driver ... rather than going through all the conditionals. Signed-off-by: Emil Velikov --- gralloc_drm.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'gralloc_drm.c') diff --git a/gralloc_drm.c b/gralloc_drm.c index c53e556..a175cbe 100644 --- a/gralloc_drm.c +++ b/gralloc_drm.c @@ -70,36 +70,41 @@ init_drv_from_fd(int fd) if (version->name) { #ifdef ENABLE_PIPE drv = gralloc_drm_drv_create_for_pipe(fd, version->name); - ALOGI_IF(drv, "create pipe for driver %s", version->name); + if (drv) { + ALOGI("create pipe for driver %s", version->name); + } else #endif #ifdef ENABLE_FREEDRENO - if (!drv && !strcmp(version->name, "msm")) + if (!strcmp(version->name, "msm")) { drv = gralloc_drm_drv_create_for_freedreno(fd); + ALOGI_IF(drv, "create freedreno for driver msm"); + } else #endif #ifdef ENABLE_INTEL - if (!drv && !strcmp(version->name, "i915")) { + if (!strcmp(version->name, "i915")) { drv = gralloc_drm_drv_create_for_intel(fd); ALOGI_IF(drv, "create intel for driver i915"); - } + } else #endif #ifdef ENABLE_RADEON - if (!drv && !strcmp(version->name, "radeon")) { + if (!strcmp(version->name, "radeon")) { drv = gralloc_drm_drv_create_for_radeon(fd); ALOGI_IF(drv, "create radeon for driver radeon"); - } + } else #endif #ifdef ENABLE_NOUVEAU - if (!drv && !strcmp(version->name, "nouveau")) { + if (!strcmp(version->name, "nouveau")) { drv = gralloc_drm_drv_create_for_nouveau(fd); ALOGI_IF(drv, "create nouveau for driver nouveau"); - } + } else #endif + if (!drv) { + ALOGE("unsupported driver: %s", (version->name) ? + version->name : "NULL"); + } } - ALOGE_IF(!drv, "unsupported driver: %s", (version->name) ? - version->name : "NULL"); - drmFreeVersion(version); return drv; -- cgit v1.1