1a5a729ea4773d21339e739d3ac12c1eab279a75 - platform/hardware/qcom/sm7150/display

commit	1a5a729ea4773d21339e739d3ac12c1eab279a75	[log] [tgz]
author	Weizhung Ding <weizhungding@google.com>	Fri Jan 03 10:48:43 2020 +0800
committer	Weizhung Ding <weizhungding@google.com>	Thu Jan 09 03:20:37 2020 +0000
tree	91669de8d712e376b9563c20cf8ebbf605834a4c
parent	e6699a99b09b25c499800dd91883b9f0f4011855 [diff]

revert conflict commits from AU053

Drop the changes from 8.9.R1 and focus on 8.1.C9.

Bug: 146767069
Test: boot to home
Change-Id: I3a7d6a5e477912862fb48ed908a09f929612ec4b

common.mk[diff]
config/display-product.mk[diff]
include/display_properties.h[diff]
libdrmutils/drm_interface.h[diff]
sdm/include/core/display_interface.h[diff]
sdm/include/core/layer_stack.h[diff]
sdm/include/private/hw_info_types.h[diff]
sdm/include/private/resource_interface.h[diff]
sdm/include/private/strategy_interface.h[diff]
sdm/libs/core/comp_manager.cpp[diff]
sdm/libs/core/comp_manager.h[diff]
sdm/libs/core/display_base.cpp[diff]
sdm/libs/core/display_base.h[diff]
sdm/libs/core/display_builtin.cpp[diff]
sdm/libs/core/display_builtin.h[diff]
sdm/libs/core/display_pluggable.cpp[diff]
sdm/libs/core/drm/hw_device_drm.cpp[diff]
sdm/libs/core/drm/hw_device_drm.h[diff]
sdm/libs/core/drm/hw_events_drm.cpp[diff]
sdm/libs/core/drm/hw_info_drm.cpp[diff]
sdm/libs/core/drm/hw_peripheral_drm.cpp[diff]
sdm/libs/core/drm/hw_tv_drm.cpp[diff]
sdm/libs/core/drm/hw_virtual_drm.cpp[diff]
sdm/libs/core/fb/hw_primary.cpp[diff]
sdm/libs/core/strategy.cpp[diff]
sdm/libs/core/strategy.h[diff]
sdm/libs/hwc2/Android.mk[diff]
sdm/libs/hwc2/display_null.h[diff]
sdm/libs/hwc2/hwc_buffer_allocator.cpp[diff]
sdm/libs/hwc2/hwc_buffer_allocator.h[diff]
sdm/libs/hwc2/hwc_callbacks.h[diff]
sdm/libs/hwc2/hwc_display.cpp[diff]
sdm/libs/hwc2/hwc_display.h[diff]
sdm/libs/hwc2/hwc_display_builtin.cpp[diff]
sdm/libs/hwc2/hwc_display_builtin.h[diff]
sdm/libs/hwc2/hwc_display_dummy.cpp[Deleted - diff]
sdm/libs/hwc2/hwc_display_dummy.h[Deleted - diff]
sdm/libs/hwc2/hwc_display_pluggable.cpp[diff]
sdm/libs/hwc2/hwc_display_pluggable.h[diff]
sdm/libs/hwc2/hwc_display_virtual.h[diff]
sdm/libs/hwc2/hwc_layers.cpp[diff]
sdm/libs/hwc2/hwc_session.cpp[diff]
sdm/libs/hwc2/hwc_session.h[diff]
sdm/libs/hwc2/hwc_session_services.cpp[diff]

44 files changed

tree: 91669de8d712e376b9563c20cf8ebbf605834a4c