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 --- Android.mk | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index c701b6e..116225a 100644 --- a/Android.mk +++ b/Android.mk @@ -23,6 +23,7 @@ DRM_GPU_DRIVERS := $(strip $(filter-out swrast, $(BOARD_GPU_DRIVERS))) +freedreno_drivers := freedreno intel_drivers := i915 i965 i915g ilo radeon_drivers := r300g r600g nouveau_drivers := nouveau @@ -30,6 +31,7 @@ vmwgfx_drivers := vmwgfx valid_drivers := \ prebuilt \ + $(freedreno_drivers) \ $(intel_drivers) \ $(radeon_drivers) \ $(nouveau_drivers) \ @@ -95,6 +97,13 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libhardware_legacy \ +ifneq ($(filter $(freedreno_drivers), $(DRM_GPU_DRIVERS)),) +LOCAL_SRC_FILES += gralloc_drm_freedreno.c +LOCAL_C_INCLUDES += external/drm/freedreno +LOCAL_CFLAGS += -DENABLE_FREEDRENO +LOCAL_SHARED_LIBRARIES += libdrm_freedreno +endif + ifneq ($(filter $(intel_drivers), $(DRM_GPU_DRIVERS)),) LOCAL_SRC_FILES += gralloc_drm_intel.c LOCAL_C_INCLUDES += external/drm/intel -- cgit v1.1 From 703199caf7160a33015685b2b0dbf3a29619d354 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Thu, 22 Jan 2015 18:18:26 +0800 Subject: gralloc_drm_pipe: fix building errors with mesa 10.4 --- Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 116225a..b31538b 100644 --- a/Android.mk +++ b/Android.mk @@ -153,7 +153,9 @@ LOCAL_C_INCLUDES += \ endif LOCAL_STATIC_LIBRARIES += \ - libmesa_gallium + libmesa_gallium \ + libmesa_util \ + LOCAL_SHARED_LIBRARIES += libdl endif # DRM_USES_PIPE include $(BUILD_SHARED_LIBRARY) -- cgit v1.1 From dc21193e3252ba2d6526546ba1d0c02116baf3ee Mon Sep 17 00:00:00 2001 From: Paulo Sergio Travaglia Date: Mon, 16 Feb 2015 21:37:05 -0200 Subject: Changed format constants to match what vmwgfx driver expects When allocating a new buffer using pipe driver, pipe constants are used to define a format based on corresponding HAL_PIXEL_FORMAT However, vmwgfx driver expects other constants (SVGA3D_A8R8G8B8, SVGA3D_X8R8G8B8, SVGA3D_R5G6B5, etc) Changed the returning constants to match what driver expects. v2: [cwhuang] - Use the constants defined in svga3d_types.h. - Use C99 standard to avoid building errors with mesa 10.6. --- Android.mk | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index b31538b..18b02c4 100644 --- a/Android.mk +++ b/Android.mk @@ -83,6 +83,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := libgralloc_drm LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := -std=c99 + LOCAL_SRC_FILES := \ gralloc_drm.c \ gralloc_drm_kms.c @@ -130,6 +132,7 @@ LOCAL_SRC_FILES += gralloc_drm_pipe.c LOCAL_CFLAGS += -DENABLE_PIPE LOCAL_C_INCLUDES += \ external/mesa/include \ + external/mesa/src \ external/mesa/src/gallium/include \ external/mesa/src/gallium/winsys \ external/mesa/src/gallium/drivers \ -- cgit v1.1