diff options
| author | Naseer Ahmed <naseer@codeaurora.org> | 2018-04-04 12:52:30 -0400 |
|---|---|---|
| committer | Naseer Ahmed <naseer@codeaurora.org> | 2018-04-04 12:52:30 -0400 |
| commit | a435a7f8759341c070d59839ecfb494c2844bda4 (patch) | |
| tree | 02d6d7b56fd66e87bc48490f2f9ca6648712b4db /sdm | |
| parent | 67e17087757280f3297b3e821bf67159597023a8 (diff) | |
| download | android_hardware_qcom_sdm710_display-a435a7f8759341c070d59839ecfb494c2844bda4.tar.gz android_hardware_qcom_sdm710_display-a435a7f8759341c070d59839ecfb494c2844bda4.tar.bz2 android_hardware_qcom_sdm710_display-a435a7f8759341c070d59839ecfb494c2844bda4.zip | |
sdm: Fix merge conflict
Change-Id: Ib65f217da5501c9b490f59f0c532a217c888548d
Diffstat (limited to 'sdm')
| -rw-r--r-- | sdm/include/utils/debug.h | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/sdm/include/utils/debug.h b/sdm/include/utils/debug.h index e4ec8e0c..78daa12a 100644 --- a/sdm/include/utils/debug.h +++ b/sdm/include/utils/debug.h @@ -55,56 +55,6 @@ #define DTRACE_END() Debug::Get()->EndTrace() #define DTRACE_SCOPED() ScopeTracer <Debug> scope_tracer(__CLASS__, __FUNCTION__) -#define DISP_PROP_PREFIX "vendor.display." -#define GRALLOC_PROP_PREFIX "vendor.gralloc." -#define DISPLAY_PROP(prop_name) DISP_PROP_PREFIX prop_name -#define GRALLOC_PROP(prop_name) GRALLOC_PROP_PREFIX prop_name - -#define COMPOSITION_MASK_PROP DISPLAY_PROP("comp_mask") -#define HDMI_CONFIG_INDEX_PROP DISPLAY_PROP("hdmi_cfg_idx") -#define IDLE_TIME_PROP DISPLAY_PROP("idle_time") -#define IDLE_TIME_INACTIVE_PROP DISPLAY_PROP("idle_time_inactive") -#define BOOT_ANIMATION_LAYER_COUNT_PROP DISPLAY_PROP("boot_anim_layer_count") -#define DISABLE_ROTATOR_DOWNSCALE_PROP DISPLAY_PROP("disable_rotator_downscale") -#define DISABLE_DECIMATION_PROP DISPLAY_PROP("disable_decimation") -#define PRIMARY_MIXER_STAGES_PROP DISPLAY_PROP("primary_mixer_stages") -#define EXTERNAL_MIXER_STAGES_PROP DISPLAY_PROP("external_mixer_stages") -#define VIRTUAL_MIXER_STAGES_PROP DISPLAY_PROP("virtual_mixer_stages") -#define MAX_UPSCALE_PROP DISPLAY_PROP("max_upscale") -#define VIDEO_MODE_PANEL_PROP DISPLAY_PROP("video_mode_panel") -#define DISABLE_ROTATOR_UBWC_PROP DISPLAY_PROP("disable_rotator_ubwc") -#define DISABLE_ROTATOR_SPLIT_PROP DISPLAY_PROP("disable_rotator_split") -#define DISABLE_SCALER_PROP DISPLAY_PROP("disable_scaler") -#define DISABLE_AVR_PROP DISPLAY_PROP("disable_avr") -#define DISABLE_EXTERNAL_ANIMATION_PROP DISPLAY_PROP("disable_ext_anim") -#define DISABLE_PARTIAL_SPLIT_PROP DISPLAY_PROP("disable_partial_split") -#define PREFER_SOURCE_SPLIT_PROP DISPLAY_PROP("prefer_source_split") -#define MIXER_RESOLUTION_PROP DISPLAY_PROP("mixer_resolution") -#define SIMULATED_CONFIG_PROP DISPLAY_PROP("simulated_config") -#define MAX_EXTERNAL_LAYERS_PROP DISPLAY_PROP("max_external_layers") -#define PERF_HINT_WINDOW_PROP DISPLAY_PROP("perf_hint_window") -#define ENABLE_EXTERNAL_DOWNSCALE_PROP DISPLAY_PROP("enable_external_downscale") -#define EXTERNAL_ACTION_SAFE_WIDTH_PROP DISPLAY_PROP("external_action_safe_width") -#define EXTERNAL_ACTION_SAFE_HEIGHT_PROP DISPLAY_PROP("external_action_safe_height") -#define FB_WIDTH_PROP DISPLAY_PROP("fb_width") -#define FB_HEIGHT_PROP DISPLAY_PROP("fb_height") -#define DISABLE_METADATA_DYNAMIC_FPS_PROP DISPLAY_PROP("disable_metadata_dynamic_fps") -#define DISABLE_BLIT_COMPOSITION_PROP DISPLAY_PROP("disable_blit_comp") -#define DISABLE_SKIP_VALIDATE_PROP DISPLAY_PROP("disable_skip_validate") -#define HDMI_S3D_MODE_PROP DISPLAY_PROP("hdmi_s3d_mode") -#define DISABLE_DESTINATION_SCALER_PROP DISPLAY_PROP("disable_dest_scaler") -#define DISABLE_UBWC_PROP GRALLOC_PROP("disable_ubwc") -#define ENABLE_FB_UBWC_PROP GRALLOC_PROP("enable_fb_ubwc") -#define MAP_FB_MEMORY_PROP GRALLOC_PROP("map_fb_memory") - -#define MAX_BLIT_FACTOR_PROP DISPLAY_PROP("max_blit_factor") -#define DISABLE_SECURE_INLINE_ROTATOR_PROP DISPLAY_PROP("disable_secure_inline_rotator") -#define DISABLE_MULTIRECT_PROP DISPLAY_PROP("disable_multirect") -#define DISABLE_UBWC_FF_VOTING_PROP DISPLAY_PROP("disable_ubwc_ff_voting") -#define DISABLE_INLINE_ROTATOR_PROP DISPLAY_PROP("disable_inline_rotator") -#define DISABLE_FB_CROPPING_PROP DISPLAY_PROP("disable_fb_cropping") -#define PRIORITIZE_CACHE_COMPOSITION_PROP DISPLAY_PROP("prioritize_cache_comp") - namespace sdm { class Debug { |