From: <ro...@ke...> - 2017-10-09 14:27:09
|
Android.common.mk | 2 ++ amdgpu/Android.mk | 2 +- data/Android.mk | 3 ++- include/drm/drm_mode.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) New commits: commit 965133914b14f571b91109814c393b62f7bc588a Author: Rob Herring <ro...@ke...> Date: Fri Oct 6 16:18:57 2017 -0500 headers: sync DRM_MODE_ROTATE/REFLECT defines from kernel v4.14-rc1 Add the new DRM_MODE_ROTATE_* and DRM_MODE_REFLECT_* defines from v4.14-rc1 kernel. Reviewed-by: Thierry Reding <tr...@nv...> Reviewed-by: Robert Foss <rob...@co...> Signed-off-by: Rob Herring <ro...@ke...> diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 08077978..e01f129c 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h @@ -119,6 +119,53 @@ extern "C" { #define DRM_MODE_LINK_STATUS_GOOD 0 #define DRM_MODE_LINK_STATUS_BAD 1 +/* + * DRM_MODE_ROTATE_<degrees> + * + * Signals that a drm plane is been rotated <degrees> degrees in counter + * clockwise direction. + * + * This define is provided as a convenience, looking up the property id + * using the name->prop id lookup is the preferred method. + */ +#define DRM_MODE_ROTATE_0 (1<<0) +#define DRM_MODE_ROTATE_90 (1<<1) +#define DRM_MODE_ROTATE_180 (1<<2) +#define DRM_MODE_ROTATE_270 (1<<3) + +/* + * DRM_MODE_ROTATE_MASK + * + * Bitmask used to look for drm plane rotations. + */ +#define DRM_MODE_ROTATE_MASK (\ + DRM_MODE_ROTATE_0 | \ + DRM_MODE_ROTATE_90 | \ + DRM_MODE_ROTATE_180 | \ + DRM_MODE_ROTATE_270) + +/* + * DRM_MODE_REFLECT_<axis> + * + * Signals that the contents of a drm plane is reflected in the <axis> axis, + * in the same way as mirroring. + * + * This define is provided as a convenience, looking up the property id + * using the name->prop id lookup is the preferred method. + */ +#define DRM_MODE_REFLECT_X (1<<4) +#define DRM_MODE_REFLECT_Y (1<<5) + +/* + * DRM_MODE_REFLECT_MASK + * + * Bitmask used to look for drm plane reflections. + */ +#define DRM_MODE_REFLECT_MASK (\ + DRM_MODE_REFLECT_X | \ + DRM_MODE_REFLECT_Y) + + struct drm_mode_modeinfo { __u32 clock; __u16 hdisplay; commit 011fd913b445b5e17148c37d169396c39eced3df Author: Rob Herring <ro...@ke...> Date: Fri Sep 15 08:45:59 2017 -0500 Android: move libraries to /vendor As part of Treble project in Android O, all the device specific files have to be located in a separate vendor partition. This is done by setting LOCAL_PROPRIETARY_MODULE (the name is misleading). This change will not break existing platforms without a vendor partition as it will just move files to /system/vendor. Signed-off-by: Rob Herring <ro...@ke...> diff --git a/Android.common.mk b/Android.common.mk index b45ca10f..d487acb9 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -13,3 +13,5 @@ LOCAL_CFLAGS += \ # Quiet down the build system and remove any .h files from the sources LOCAL_SRC_FILES := $(patsubst %.h, , $(LOCAL_SRC_FILES)) LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH) + +LOCAL_PROPRIETARY_MODULE := true diff --git a/amdgpu/Android.mk b/amdgpu/Android.mk index 88d37651..ce273019 100644 --- a/amdgpu/Android.mk +++ b/amdgpu/Android.mk @@ -11,7 +11,7 @@ LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SRC_FILES := $(LIBDRM_AMDGPU_FILES) LOCAL_CFLAGS := \ - -DAMDGPU_ASIC_ID_TABLE=\"/system/etc/hwdata/amdgpu.ids\" \ + -DAMDGPU_ASIC_ID_TABLE=\"/vendor/etc/hwdata/amdgpu.ids\" \ -DAMDGPU_ASIC_ID_TABLE_NUM_ENTRIES=$(shell egrep -ci '^[0-9a-f]{4},.*[0-9a-f]+,' $(LIBDRM_TOP)/data/amdgpu.ids) LOCAL_REQUIRED_MODULES := amdgpu.ids diff --git a/data/Android.mk b/data/Android.mk index 3c1fd7c6..62013f0c 100644 --- a/data/Android.mk +++ b/data/Android.mk @@ -4,6 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := amdgpu.ids LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/hwdata +LOCAL_PROPRIETARY_MODULE := true +LOCAL_MODULE_RELATIVE_PATH := hwdata LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) |