android/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git checkout caf/jb . (starting over)

Browse Source 
per be02ab0... display: Clean up gralloc

Change-Id: I3857046362703bacf3c4c1bcad831bfaa92387e7
This commit is contained in:
Andrew Sutherland 2012-08-02 23:06:09 -05:00
parent 1ccdbea036
commit 87f0aec7e0
6 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@ -1,8 +1,8 @@
#Enables the listed display HAL modules
#libs to be built for QCOM targets only
ifeq ($(BOARD_USES_QCOM_HARDWARE),true)
display-hals := libgralloc libgenlock libcopybit
ifeq ($(call is-vendor-board-platform,QCOM),true)
display-hals := libgralloc libgenlock libcopybit liblight
display-hals += libhwcomposer liboverlay libqdutils
endif

8
libcopybit/Android.mk
View File

@ -29,12 +29,8 @@ ifeq ($(TARGET_USES_C2D_COMPOSITION),true)
LOCAL_SRC_FILES := copybit_c2d.cpp software_converter.cpp
include $(BUILD_SHARED_LIBRARY)
else
ifneq ($(TARGET_BOARD_PLATFORM),msm7x30)
ifeq ($(TARGET_BOARD_PLATFORM),qsd8k)
LOCAL_CFLAGS += -DCOPYBIT_QSD8K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)
else
ifneq ($(call is-chipset-in-board-platform,msm7630),true)
ifeq ($(call is-board-platform-in-list,$(MSM7K_BOARD_PLATFORMS)),true)
LOCAL_CFLAGS += -DCOPYBIT_MSM7K=1
LOCAL_SRC_FILES := software_converter.cpp copybit.cpp
include $(BUILD_SHARED_LIBRARY)

9
libgralloc/Android.mk
View File

@ -35,12 +35,5 @@ LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES := $(common_includes)
LOCAL_SHARED_LIBRARIES := $(common_libs) libgenlock
LOCAL_CFLAGS := $(common_flags) -DLOG_TAG=\"memalloc\"
LOCAL_SRC_FILES := alloc_controller.cpp
ifeq ($(TARGET_USES_ION),true)
LOCAL_SRC_FILES += ionalloc.cpp
else
LOCAL_SRC_FILES += pmemalloc.cpp \
ashmemalloc.cpp \
pmem_bestfit_alloc.cpp
endif
LOCAL_SRC_FILES := ionalloc.cpp alloc_controller.cpp
include $(BUILD_SHARED_LIBRARY)

4
libgralloc/gralloc_priv.h
View File

@ -101,11 +101,7 @@ enum {
enum {
/* OEM specific HAL formats */
HAL_PIXEL_FORMAT_NV12_ENCODEABLE = 0x102,
#ifdef QCOM_ICS_COMPAT
HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED = 0x108,
#else
HAL_PIXEL_FORMAT_YCbCr_420_SP_TILED = 0x7FA30C03,
#endif
HAL_PIXEL_FORMAT_YCbCr_420_SP = 0x109,
HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO = 0x7FA30C01,
HAL_PIXEL_FORMAT_YCrCb_422_SP = 0x10B,

3
libhwcomposer/hwc_copybit.cpp
View File

@ -382,8 +382,7 @@ int CopyBit::drawLayerUsingCopybit(hwc_context_t *dev, hwc_layer_t *layer,
}
ALOGE("%s:%d::tmp_w = %d,tmp_h = %d",__FUNCTION__,__LINE__,tmp_w,tmp_h);
int usage = GRALLOC_USAGE_PRIVATE_ADSP_HEAP |
GRALLOC_USAGE_PRIVATE_MM_HEAP;
int usage = GRALLOC_USAGE_PRIVATE_MM_HEAP;
if (0 == alloc_buffer(&tmpHnd, tmp_w, tmp_h, fbHandle->format, usage)){
copybit_image_t tmp_dst;

9
liboverlay/overlayRotator.cpp
View File

@ -73,11 +73,9 @@ void MdpRot::setSource(const overlay::utils::Whf& awhf) {
}
void MdpRot::setFlags(const utils::eMdpFlags& flags) {
#ifndef QCOM_NO_SECURE_PLAYBACK
mRotImgInfo.secure = 0;
if(flags & utils::OV_MDP_SECURE_OVERLAY_SESSION)
mRotImgInfo.secure = 1;
#endif
}
void MdpRot::setTransform(const utils::eTransform& rot, const bool& rotUsed)
@ -119,15 +117,10 @@ bool MdpRot::commit() {
bool MdpRot::open_i(uint32_t numbufs, uint32_t bufsz)
{
OvMem mem;
int secureFlag = 0;
OVASSERT(MAP_FAILED == mem.addr(), "MAP failed in open_i");
#ifndef QCOM_NO_SECURE_PLAYBACK
secureFlag = mRotImgInfo.secure;
#endif
if(!mem.open(numbufs, bufsz, secureFlag)){
if(!mem.open(numbufs, bufsz, mRotImgInfo.secure)){
ALOGE("%s: Failed to open", __func__);
mem.close();
return false;