android_hardware_qcom_display/msm8998/common.mk

79 lines
2.4 KiB
Makefile
Raw Permalink Normal View History

#Common headers
display_top := $(call my-dir)
#Common C flags
common_flags := -DDEBUG_CALC_FPS -Wno-missing-field-initializers
common_flags += -Wconversion -Wall -Werror -std=c++14
common_flags += -DUSE_GRALLOC1
msm8998: Update to 07.00.00.279.027 msm8998: from hardware/qcom/display 9da3a9caf Merge "display: Move all opensource modules to vendor partition" cecde8719 display: Move all opensource modules to vendor partition 1d7f83c14 gralloc1: Fixes for hidl ecd7e84ea sdm: enable gralloc1 from hwc2 9c02dc799 gralloc1: Add remaining functionality a110e65f5 libdrmutils: Remove dependency on drmModeAddFB3 e9a2c4ece Merge branch 'display.lnx.3.0-dev' into display.lnx.3.9-rel 852358c51 Merge "sdm: Intf change propagating fb config for partial update" d0d29296a Merge "sdm: Do not mark video layer with non-integral crop as skip" 51915d6c1 Merge "sdm: Fix dynamic resolution change for virtual display" 96cffc4ce Merge "sdm: drm: Destroy DRMManager and resource info singletons" ab7807cd5 sdm: drm: Destroy DRMManager and resource info singletons fad1afd01 libdrmutils: Add support for RMFB2 672f0f788 Merge "sdm: Consider external display as active in doze suspend." 095e4405d Merge "sdm: Do not handle SKIP Cursor layer as H/W Cursor" 6d9608c9d Merge "libmemtrack: Update the flags field for sparse memory type" 66c941bd5 sdm: drm: Add Atomic commit support 7d476edfb sdm: drm: Add support for default non-atomic mode 0f26d84e3 libmemtrack: Update the flags field for sparse memory type 1f7aa5ccf sdm: Do not mark video layer with non-integral crop as skip 8ec9d36c2 sdm: Fix dynamic resolution change for virtual display 4cfb380e8 sdm: Intf change propagating fb config for partial update 172a743b1 sdm: Consider external display as active in doze suspend. 9b47ae740 sdm: Do not handle SKIP Cursor layer as H/W Cursor 2e06deff0 Add explicit liblog dependency 34f165638 Include additional system header search path Bug: 36064845 Signed-off-by: Thierry Strudel <tstrudel@google.com> Change-Id: If42b63f7cbc285dac84ea1970fcc7d21867bd70c
2017-03-08 18:37:34 +00:00
ifneq ($(TARGET_IS_HEADLESS), true)
common_flags += -DCOMPILE_DRM
msm8998: Update to 07.00.00.279.069 msm8998: from hardware/qcom/display 18f22e7b9 qdutils: Return on null param c8ebaf46f gralloc1: Close acquire_fence in lock 922c3c434 qdutils: Fix mapping in qdMetaData 8cfb58786 gralloc1: Add support for layered buffers 10eb00c2d gralloc1: Refactor AllocateBuffer d8a342252 gralloc1: Fix for buffer mapping and metadata access 36c99394a display: Use getMetaData in hwc2 3fcd11371 hwc2: Do not delete hwc_session 03a0b16fe display: makefile fixes b5d8958dd Merge branch 'display.lnx-3.0-dev' into display.lnx.3.9-rel f9cc5172c Merge "display: Add missing TP10 formats checks" 54885f0b8 display: Add missing TP10 formats checks 1901fa371 gralloc1: Handle ZSL scenario 7df1e404a gralloc1: Do not delete on close 065cff7db sdm: Fix compilation issue with updated framework 92998628b gralloc1: Add RAW12 format 0acc8565a Merge "gralloc1: Fix RAW10 stride" 9c6f2f82b Merge "qdutils: Fix compilation issue" 33e36730d Merge "sdm: Add property to define max upscaling limit." dfd5e3394 gralloc1: Fix RAW10 stride 29a86ddd3 gralloc1: Work around handle delete by hidl wrapper 3a9d53a1a gralloc1: Import ion handle into registering process 08c3e40f1 qdutils: Fix compilation issue ad1e7dd2e Merge "sdm: Reset the H/W layers of display" 7edd00399 Merge "sdm: Add layer format information in commit dump." 8c305cc9e sdm: Add property to define max upscaling limit. 1fbf3a337 Merge "hwc2: Fix buffer allocator usage" 72d3062d4 Merge "gralloc1: Fix sign conversion error" d18304014 hwc2: Fix buffer allocator usage a2569b466 hwc2: End uevent thread in hwc_close cfa399d5a Merge "lights/sdm: Add support for new brightness node" 8b021cfac lights/sdm: Add support for new brightness node 96da72923 Merge "sdm: Fix file path for input layer dump." fcaabf2de Merge "liblight: Add brightness level extension support" 890f2dddd Merge "sdm: fb: Ensure backward compatibility for backlight extn" 7dc06d104 gralloc1: Fix sign conversion error 586c6d5f9 liblight: Add brightness level extension support 692f91424 Merge "gralloc1: Drop ZSL check" 0a7d5af8b Merge "gralloc1: Add Dump() in buffer manager" d0c5bb612 gralloc1: Drop ZSL check 699b45750 gralloc1: Add additional debug logging ef287dc13 gralloc1: Use handle as map key dce3654d9 sdm: Reset the H/W layers of display d77bc0880 Merge "sdm: Change idle fallback time dynamically." dc918136a gralloc1: Add Dump() in buffer manager 271403788 Merge "sdm: drm: Add user space to DRM driver struct conversion for PGC" bf805fdf0 Merge "sdm: Add property to disable partial split" 6c4b8c957 sdm: Add layer format information in commit dump. 5e2b69f44 sdm: fb: Ensure backward compatibility for backlight extn c31d7f8d9 sdm: add one action to set panel brightness and refresh screen 2fdd16ade sdm: Fix file path for input layer dump. 14ee4b688 sdm: rotator: Port min downscale and downscale compression cd557c190 sdm: drm: const correctness 319f1e808 Merge "sdm: drm: Add user space to DRM driver struct conversion for gamut" be5c2ef1d gralloc1: Fix typo in RAW8 format d00094273 sdm: drm: Add user space to DRM driver struct conversion for PGC d9f61ce2c Merge "gralloc: Add support for 8-bit RAW MIPI stream" ce565d219 Merge "sdm: Add support to handle idle power collapse event" c2b20a3a0 Merge "sdm: Destroy singleton DRMMaster instance" b0a253bf3 Merge "sdm: Add support for rotator with DRM" c1a71ca21 sdm: Add property to disable partial split 11e8ee03a Merge "sdm: Create HWCUevent thread before creating display." 1e54952f4 Revert "display: Move all opensource modules to vendor partition" a57cf169f sdm: Destroy singleton DRMMaster instance 4c790408b display: Move all opensource modules to vendor partition 2337d700f sdm: Add support to handle idle power collapse event 9f163268a sdm: Create HWCUevent thread before creating display. b06308d12 sdm: Change idle fallback time dynamically. 0beb2fd1a Merge "gralloc: Add support for raw12" 0f05e188a Merge "hwc2: Fix dumpsys bug" f48302a61 gralloc: Add support for 8-bit RAW MIPI stream 85d9c785a sdm: drm: Add user space to DRM driver struct conversion for gamut 281f48de8 sdm: drm: Add post-processing support in SDM 68f7040b1 sdm: color-manager: Add new PP versions to color manager 66d5b4915 hwc2: Fix dumpsys bug 1c473d817 gralloc: Add support for new system defined RGBA formats b08b43ff0 Merge "sdm: Fix vector initialization" 3394427d7 Merge "sdm: Add support to recompute rectangles considering flips" a228f120a sdm: Add support for rotator with DRM dd54f8443 Merge "sdm: Increase SurfaceFlinger fd limits" 8f9c7c323 gralloc1: Fixes for hidl 1738441b4 sdm: Fix vector initialization e2422e0e7 gralloc: Add support for raw12 5de9c6377 sdm: Add support to recompute rectangles considering flips 13321553e Merge "sdm: Add support to pass HDR metadata to HDR External Displays" 4275221d6 sdm: enable gralloc1 from hwc2 e69031e9c gralloc1: Add remaining functionality 441526d42 Merge "sdm: Add partial framebuffer roi info into dumpsys." 5c050a808 Merge "hwc: Set minfps during idlefallback" 788630c7a Merge "sdm: Fix the Y stride for YCbCr420P010 format" f78579a20 Merge "sdm: Add interface to update panel roi infromation." 694d11848 Merge "sdm: Validate mixer resolution read from property" b1bdf6e2a libdrmutils: Remove dependency on drmModeAddFB3 4640591c7 sdm: Increase SurfaceFlinger fd limits d6962cd5c sdm: Add support to pass HDR metadata to HDR External Displays 42be6d256 sdm: Add partial framebuffer roi info into dumpsys. 4894cf7db sdm: Fix the Y stride for YCbCr420P010 format ce82fd066 hwc: Set minfps during idlefallback 7d4d74860 sdm: Add interface to update panel roi infromation. 3f281b6f9 sdm: Validate mixer resolution read from property Bug: 37062945 Signed-off-by: Thierry Strudel <tstrudel@google.com> Change-Id: I4937210f3f6a3652fa8c2c7eefa3cba2a7664cea
2017-04-06 16:54:26 +00:00
else
common_flags += -DTARGET_HEADLESS
LOCAL_CLANG := false
msm8998: Update to 07.00.00.279.027 msm8998: from hardware/qcom/display 9da3a9caf Merge "display: Move all opensource modules to vendor partition" cecde8719 display: Move all opensource modules to vendor partition 1d7f83c14 gralloc1: Fixes for hidl ecd7e84ea sdm: enable gralloc1 from hwc2 9c02dc799 gralloc1: Add remaining functionality a110e65f5 libdrmutils: Remove dependency on drmModeAddFB3 e9a2c4ece Merge branch 'display.lnx.3.0-dev' into display.lnx.3.9-rel 852358c51 Merge "sdm: Intf change propagating fb config for partial update" d0d29296a Merge "sdm: Do not mark video layer with non-integral crop as skip" 51915d6c1 Merge "sdm: Fix dynamic resolution change for virtual display" 96cffc4ce Merge "sdm: drm: Destroy DRMManager and resource info singletons" ab7807cd5 sdm: drm: Destroy DRMManager and resource info singletons fad1afd01 libdrmutils: Add support for RMFB2 672f0f788 Merge "sdm: Consider external display as active in doze suspend." 095e4405d Merge "sdm: Do not handle SKIP Cursor layer as H/W Cursor" 6d9608c9d Merge "libmemtrack: Update the flags field for sparse memory type" 66c941bd5 sdm: drm: Add Atomic commit support 7d476edfb sdm: drm: Add support for default non-atomic mode 0f26d84e3 libmemtrack: Update the flags field for sparse memory type 1f7aa5ccf sdm: Do not mark video layer with non-integral crop as skip 8ec9d36c2 sdm: Fix dynamic resolution change for virtual display 4cfb380e8 sdm: Intf change propagating fb config for partial update 172a743b1 sdm: Consider external display as active in doze suspend. 9b47ae740 sdm: Do not handle SKIP Cursor layer as H/W Cursor 2e06deff0 Add explicit liblog dependency 34f165638 Include additional system header search path Bug: 36064845 Signed-off-by: Thierry Strudel <tstrudel@google.com> Change-Id: If42b63f7cbc285dac84ea1970fcc7d21867bd70c
2017-03-08 18:37:34 +00:00
endif
msm8998: Update to 07.01.01.253.064 msm8998: from hardware/qcom/display 6e5ae080d Merge 4e72fab80bf8aab3442b7922273dd998763b3802 on remote branch 4e72fab80 Promotion of display.lnx.3.0-00093. da5e1f967 Promotion of display.lnx.3.0-00092. ec4cee0b9 libmemtrack: Fix integer overflow in kgsl function 9b50abe92 Merge "sdm: Add support for multiple tone map sessions" 8492f1af4 Merge "gpu_tonemapper: Clear EGLImage mappings in Tonemapper" 92ede0c97 Promotion of display.lnx.3.0-00090. 5bab55448 Merge "sdm: Fix hwc2 compilation" 0adafaff7 Promotion of display.lnx.3.0-00089. 40c8cf585 sdm: Add support for multiple tone map sessions e05cb6caa sdm: Use LayerRequests in Tonemapper. 622885460 sdm: Support ColorModes and HDR customizations e0636f332 sdm: Read HW HDR capabilities fb2f2a8a0 Merge "sdm: Add GetBufferInfo Interface" 230492a90 Merge "sdm: Use Lut indexes directly from HWScaleData" db087f65b sdm: Add GetBufferInfo Interface f3a6f1a9b gpu_tonemapper: Fix forward tonemap shader 1cc416f12 gpu_tonemapper: Clear EGLImage mappings in Tonemapper e50252bca sdm: Fix hwc2 compilation eb5c32bed Merge "gpu_tonemapper: Free eglImage on termination" e146c81a4 Merge "sdm: color-manager: Detail Enhancer Enhancements." bd6db5f56 Merge "sdm: Fix conditional logging of error and warning logs" 3c02c2497 Merge 4b32d52eae18ac558d5e2385ca5f16453f7629f7 on remote branch 310bca1de Promotion of display.lnx.3.0-00088. a4d319b71 Merge "libgralloc: Add gralloc support for P010 format" dbb86f2da gpu_tonemapper: Free eglImage on termination f2ec9452d sdm: Use Lut indexes directly from HWScaleData d9ced38e6 sdm: color-manager: Detail Enhancer Enhancements. 063f9b6fc Merge "sdm: skip null commit on command mode panels" 4a1506461 Merge "sdm: Add utils in SDM utils" f0472016a Merge "sdm: Define DPPS control interface" 938353c7e Merge "sdm: Define Socket Handler interface" 7d63f8248 sdm: Fix conditional logging of error and warning logs 3083fe9c4 libgralloc: Add gralloc support for P010 format 4b32d52ea Promotion of display.lnx.3.0-00084. 49a539b71 Merge "sdm: Fix dumpsys alignment" 088260ad8 Merge "display: Fix ColorMetaData" afe7ecb2d Merge "sdm : Fix output buffer dimensions for concurrent wb" 79819eada Merge "display: Add HDMI support in APIs exposed by display." dafb76ec7 Merge "sdm:scalar:intialize scaling params." 0b75aa236 Merge "sdm: Read downscale_compression capability from Rotator" e3ae4b05e Merge "sdm: Handle AVR and dynamic fps concurrency scenario." 0568ff182 sdm: Add utils in SDM utils 46db33696 sdm: Define DPPS control interface ca196fce5 display: Fix ColorMetaData 03e6ff664 Promotion of display.lnx.3.0-00079. a6e0f9f2d sdm: skip null commit on command mode panels 455b7f7aa sdm: Fix dumpsys alignment f27f5e7b4 sdm: Define Socket Handler interface bf2b25c10 sdm: Add support for HDR 2b75da399 gpu_tonemapper: Include gpu tonemapper 9c19cdd96 sdm: Add Layers to HWLayersInfo Intf bc0addf5a sdm: Use ColorMetadata in SDM a9a915add sdm: Handle AVR and dynamic fps concurrency scenario. bd5a8c759 Merge "sdm: Indicate driver about multi roi pu usage." 0e552d584 Merge "qdutils: Conditionally mute pu control error log" 03d567945 display: Add HDMI support in APIs exposed by display. f1e34b9d2 sdm : Fix output buffer dimensions for concurrent wb 5e4ae0c1e sdm: Read downscale_compression capability from Rotator 15f91e8e5 sdm: Indicate driver about multi roi pu usage. d14503786 sdm:scalar:intialize scaling params. 1afec3db7 qdutils: Conditionally mute pu control error log Bug: 34911851 Signed-off-by: Thierry Strudel <tstrudel@google.com> Change-Id: I7c3dce6f0e1febfaa1d0e6591c536c1409fe08ba # Conflicts: # msm8998/sdm/libs/hwc/Android.mk
2017-02-15 18:48:16 +00:00
ifeq ($(TARGET_USES_COLOR_METADATA), true)
msm8998: Update to 07.00.00.279.069 msm8998: from hardware/qcom/display 18f22e7b9 qdutils: Return on null param c8ebaf46f gralloc1: Close acquire_fence in lock 922c3c434 qdutils: Fix mapping in qdMetaData 8cfb58786 gralloc1: Add support for layered buffers 10eb00c2d gralloc1: Refactor AllocateBuffer d8a342252 gralloc1: Fix for buffer mapping and metadata access 36c99394a display: Use getMetaData in hwc2 3fcd11371 hwc2: Do not delete hwc_session 03a0b16fe display: makefile fixes b5d8958dd Merge branch 'display.lnx-3.0-dev' into display.lnx.3.9-rel f9cc5172c Merge "display: Add missing TP10 formats checks" 54885f0b8 display: Add missing TP10 formats checks 1901fa371 gralloc1: Handle ZSL scenario 7df1e404a gralloc1: Do not delete on close 065cff7db sdm: Fix compilation issue with updated framework 92998628b gralloc1: Add RAW12 format 0acc8565a Merge "gralloc1: Fix RAW10 stride" 9c6f2f82b Merge "qdutils: Fix compilation issue" 33e36730d Merge "sdm: Add property to define max upscaling limit." dfd5e3394 gralloc1: Fix RAW10 stride 29a86ddd3 gralloc1: Work around handle delete by hidl wrapper 3a9d53a1a gralloc1: Import ion handle into registering process 08c3e40f1 qdutils: Fix compilation issue ad1e7dd2e Merge "sdm: Reset the H/W layers of display" 7edd00399 Merge "sdm: Add layer format information in commit dump." 8c305cc9e sdm: Add property to define max upscaling limit. 1fbf3a337 Merge "hwc2: Fix buffer allocator usage" 72d3062d4 Merge "gralloc1: Fix sign conversion error" d18304014 hwc2: Fix buffer allocator usage a2569b466 hwc2: End uevent thread in hwc_close cfa399d5a Merge "lights/sdm: Add support for new brightness node" 8b021cfac lights/sdm: Add support for new brightness node 96da72923 Merge "sdm: Fix file path for input layer dump." fcaabf2de Merge "liblight: Add brightness level extension support" 890f2dddd Merge "sdm: fb: Ensure backward compatibility for backlight extn" 7dc06d104 gralloc1: Fix sign conversion error 586c6d5f9 liblight: Add brightness level extension support 692f91424 Merge "gralloc1: Drop ZSL check" 0a7d5af8b Merge "gralloc1: Add Dump() in buffer manager" d0c5bb612 gralloc1: Drop ZSL check 699b45750 gralloc1: Add additional debug logging ef287dc13 gralloc1: Use handle as map key dce3654d9 sdm: Reset the H/W layers of display d77bc0880 Merge "sdm: Change idle fallback time dynamically." dc918136a gralloc1: Add Dump() in buffer manager 271403788 Merge "sdm: drm: Add user space to DRM driver struct conversion for PGC" bf805fdf0 Merge "sdm: Add property to disable partial split" 6c4b8c957 sdm: Add layer format information in commit dump. 5e2b69f44 sdm: fb: Ensure backward compatibility for backlight extn c31d7f8d9 sdm: add one action to set panel brightness and refresh screen 2fdd16ade sdm: Fix file path for input layer dump. 14ee4b688 sdm: rotator: Port min downscale and downscale compression cd557c190 sdm: drm: const correctness 319f1e808 Merge "sdm: drm: Add user space to DRM driver struct conversion for gamut" be5c2ef1d gralloc1: Fix typo in RAW8 format d00094273 sdm: drm: Add user space to DRM driver struct conversion for PGC d9f61ce2c Merge "gralloc: Add support for 8-bit RAW MIPI stream" ce565d219 Merge "sdm: Add support to handle idle power collapse event" c2b20a3a0 Merge "sdm: Destroy singleton DRMMaster instance" b0a253bf3 Merge "sdm: Add support for rotator with DRM" c1a71ca21 sdm: Add property to disable partial split 11e8ee03a Merge "sdm: Create HWCUevent thread before creating display." 1e54952f4 Revert "display: Move all opensource modules to vendor partition" a57cf169f sdm: Destroy singleton DRMMaster instance 4c790408b display: Move all opensource modules to vendor partition 2337d700f sdm: Add support to handle idle power collapse event 9f163268a sdm: Create HWCUevent thread before creating display. b06308d12 sdm: Change idle fallback time dynamically. 0beb2fd1a Merge "gralloc: Add support for raw12" 0f05e188a Merge "hwc2: Fix dumpsys bug" f48302a61 gralloc: Add support for 8-bit RAW MIPI stream 85d9c785a sdm: drm: Add user space to DRM driver struct conversion for gamut 281f48de8 sdm: drm: Add post-processing support in SDM 68f7040b1 sdm: color-manager: Add new PP versions to color manager 66d5b4915 hwc2: Fix dumpsys bug 1c473d817 gralloc: Add support for new system defined RGBA formats b08b43ff0 Merge "sdm: Fix vector initialization" 3394427d7 Merge "sdm: Add support to recompute rectangles considering flips" a228f120a sdm: Add support for rotator with DRM dd54f8443 Merge "sdm: Increase SurfaceFlinger fd limits" 8f9c7c323 gralloc1: Fixes for hidl 1738441b4 sdm: Fix vector initialization e2422e0e7 gralloc: Add support for raw12 5de9c6377 sdm: Add support to recompute rectangles considering flips 13321553e Merge "sdm: Add support to pass HDR metadata to HDR External Displays" 4275221d6 sdm: enable gralloc1 from hwc2 e69031e9c gralloc1: Add remaining functionality 441526d42 Merge "sdm: Add partial framebuffer roi info into dumpsys." 5c050a808 Merge "hwc: Set minfps during idlefallback" 788630c7a Merge "sdm: Fix the Y stride for YCbCr420P010 format" f78579a20 Merge "sdm: Add interface to update panel roi infromation." 694d11848 Merge "sdm: Validate mixer resolution read from property" b1bdf6e2a libdrmutils: Remove dependency on drmModeAddFB3 4640591c7 sdm: Increase SurfaceFlinger fd limits d6962cd5c sdm: Add support to pass HDR metadata to HDR External Displays 42be6d256 sdm: Add partial framebuffer roi info into dumpsys. 4894cf7db sdm: Fix the Y stride for YCbCr420P010 format ce82fd066 hwc: Set minfps during idlefallback 7d4d74860 sdm: Add interface to update panel roi infromation. 3f281b6f9 sdm: Validate mixer resolution read from property Bug: 37062945 Signed-off-by: Thierry Strudel <tstrudel@google.com> Change-Id: I4937210f3f6a3652fa8c2c7eefa3cba2a7664cea
2017-04-06 16:54:26 +00:00
common_flags += -DUSE_COLOR_METADATA
endif
ifeq ($(TARGET_USES_QCOM_BSP),true)
common_flags += -DQTI_BSP
endif
ifeq ($(ARCH_ARM_HAVE_NEON),true)
common_flags += -D__ARM_HAVE_NEON
endif
ifeq ($(call is-board-platform-in-list, $(MASTER_SIDE_CP_TARGET_LIST)), true)
common_flags += -DMASTER_SIDE_CP
msm8998: Update to LA.UM.5.7.R1.07.00.00.253.052 msm8998: from hardware/qcom/display 11f3152 Merge AU_LINUX_ANDROID_LA.UM.5.7.R1.07.00.00.253.042 on remote branch c8edaff Promotion of display.lnx.3.0-00073. 4b9f87f sdm: Fix infinite frame invalidates during camera bandwidth mode change. During camera bandwidth mode change, need_invalidate is set to true for to request new draw cycles to allow new bandwidth mode to take effect. This variable is not reset after mode is changed. fcd4ec5 Merge "sdm: Enable autorefresh only one single buffer layer is present" d92bdf3 Merge "sdm: Fix Map rect for offset in source domain" 982952a Merge "sdm: Multi rect partial update changes" 1e4ca32 Merge "hwc1: Add support for getHdrCapabilities" 6abdf82 Promotion of display.lnx.3.0-00070. c906e98 sdm: Enable autorefresh only one single buffer layer is present b82c9a0 sdm: Fix partial update control in display mode switch 6064cad sdm: Fix Map rect for offset in source domain 48a392c hwc1: Add support for getHdrCapabilities 5036d3d hwc2: Protect AcceptDisplayChanges with the hwc session lock 249e03b sdm: Multi rect partial update changes bce1d81 Merge "sdm: Issue two null commits for command mode panels" c41e42c sdm: Issue two null commits for command mode panels ebf4a0d hwc2: Fix missing unaligned width setting ecf1b50 sdm: color-manager: Detail Enhancer Enhancements. b2771bf display: Add color Metadata 8b3dddc Merge "sdm : Allow configurable sdm layer limit for external" 770e328 Merge "HWC: Set skip to layers with Non Integral Source Crop" e78a97f Merge "gralloc: Return an error if the buffer was not mapped" a61a5f8 sdm : Allow configurable sdm layer limit for external debd5ce gralloc: Return an error if the buffer was not mapped a9f9000 HWC: Set skip to layers with Non Integral Source Crop Bug: 33556391 Change-Id: If1886c87a823d583e5cec891468f5e2e2199d607 Signed-off-by: Thierry Strudel <tstrudel@google.com>
2016-12-13 21:51:15 +00:00
endif
use_hwc2 := false
ifeq ($(TARGET_USES_HWC2), true)
use_hwc2 := true
common_flags += -DVIDEO_MODE_DEFER_RETIRE_FENCE
endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
common_flags += -DUSER_DEBUG
endif
msm8998: Update to 07.00.00.279.069 msm8998: from hardware/qcom/display 18f22e7b9 qdutils: Return on null param c8ebaf46f gralloc1: Close acquire_fence in lock 922c3c434 qdutils: Fix mapping in qdMetaData 8cfb58786 gralloc1: Add support for layered buffers 10eb00c2d gralloc1: Refactor AllocateBuffer d8a342252 gralloc1: Fix for buffer mapping and metadata access 36c99394a display: Use getMetaData in hwc2 3fcd11371 hwc2: Do not delete hwc_session 03a0b16fe display: makefile fixes b5d8958dd Merge branch 'display.lnx-3.0-dev' into display.lnx.3.9-rel f9cc5172c Merge "display: Add missing TP10 formats checks" 54885f0b8 display: Add missing TP10 formats checks 1901fa371 gralloc1: Handle ZSL scenario 7df1e404a gralloc1: Do not delete on close 065cff7db sdm: Fix compilation issue with updated framework 92998628b gralloc1: Add RAW12 format 0acc8565a Merge "gralloc1: Fix RAW10 stride" 9c6f2f82b Merge "qdutils: Fix compilation issue" 33e36730d Merge "sdm: Add property to define max upscaling limit." dfd5e3394 gralloc1: Fix RAW10 stride 29a86ddd3 gralloc1: Work around handle delete by hidl wrapper 3a9d53a1a gralloc1: Import ion handle into registering process 08c3e40f1 qdutils: Fix compilation issue ad1e7dd2e Merge "sdm: Reset the H/W layers of display" 7edd00399 Merge "sdm: Add layer format information in commit dump." 8c305cc9e sdm: Add property to define max upscaling limit. 1fbf3a337 Merge "hwc2: Fix buffer allocator usage" 72d3062d4 Merge "gralloc1: Fix sign conversion error" d18304014 hwc2: Fix buffer allocator usage a2569b466 hwc2: End uevent thread in hwc_close cfa399d5a Merge "lights/sdm: Add support for new brightness node" 8b021cfac lights/sdm: Add support for new brightness node 96da72923 Merge "sdm: Fix file path for input layer dump." fcaabf2de Merge "liblight: Add brightness level extension support" 890f2dddd Merge "sdm: fb: Ensure backward compatibility for backlight extn" 7dc06d104 gralloc1: Fix sign conversion error 586c6d5f9 liblight: Add brightness level extension support 692f91424 Merge "gralloc1: Drop ZSL check" 0a7d5af8b Merge "gralloc1: Add Dump() in buffer manager" d0c5bb612 gralloc1: Drop ZSL check 699b45750 gralloc1: Add additional debug logging ef287dc13 gralloc1: Use handle as map key dce3654d9 sdm: Reset the H/W layers of display d77bc0880 Merge "sdm: Change idle fallback time dynamically." dc918136a gralloc1: Add Dump() in buffer manager 271403788 Merge "sdm: drm: Add user space to DRM driver struct conversion for PGC" bf805fdf0 Merge "sdm: Add property to disable partial split" 6c4b8c957 sdm: Add layer format information in commit dump. 5e2b69f44 sdm: fb: Ensure backward compatibility for backlight extn c31d7f8d9 sdm: add one action to set panel brightness and refresh screen 2fdd16ade sdm: Fix file path for input layer dump. 14ee4b688 sdm: rotator: Port min downscale and downscale compression cd557c190 sdm: drm: const correctness 319f1e808 Merge "sdm: drm: Add user space to DRM driver struct conversion for gamut" be5c2ef1d gralloc1: Fix typo in RAW8 format d00094273 sdm: drm: Add user space to DRM driver struct conversion for PGC d9f61ce2c Merge "gralloc: Add support for 8-bit RAW MIPI stream" ce565d219 Merge "sdm: Add support to handle idle power collapse event" c2b20a3a0 Merge "sdm: Destroy singleton DRMMaster instance" b0a253bf3 Merge "sdm: Add support for rotator with DRM" c1a71ca21 sdm: Add property to disable partial split 11e8ee03a Merge "sdm: Create HWCUevent thread before creating display." 1e54952f4 Revert "display: Move all opensource modules to vendor partition" a57cf169f sdm: Destroy singleton DRMMaster instance 4c790408b display: Move all opensource modules to vendor partition 2337d700f sdm: Add support to handle idle power collapse event 9f163268a sdm: Create HWCUevent thread before creating display. b06308d12 sdm: Change idle fallback time dynamically. 0beb2fd1a Merge "gralloc: Add support for raw12" 0f05e188a Merge "hwc2: Fix dumpsys bug" f48302a61 gralloc: Add support for 8-bit RAW MIPI stream 85d9c785a sdm: drm: Add user space to DRM driver struct conversion for gamut 281f48de8 sdm: drm: Add post-processing support in SDM 68f7040b1 sdm: color-manager: Add new PP versions to color manager 66d5b4915 hwc2: Fix dumpsys bug 1c473d817 gralloc: Add support for new system defined RGBA formats b08b43ff0 Merge "sdm: Fix vector initialization" 3394427d7 Merge "sdm: Add support to recompute rectangles considering flips" a228f120a sdm: Add support for rotator with DRM dd54f8443 Merge "sdm: Increase SurfaceFlinger fd limits" 8f9c7c323 gralloc1: Fixes for hidl 1738441b4 sdm: Fix vector initialization e2422e0e7 gralloc: Add support for raw12 5de9c6377 sdm: Add support to recompute rectangles considering flips 13321553e Merge "sdm: Add support to pass HDR metadata to HDR External Displays" 4275221d6 sdm: enable gralloc1 from hwc2 e69031e9c gralloc1: Add remaining functionality 441526d42 Merge "sdm: Add partial framebuffer roi info into dumpsys." 5c050a808 Merge "hwc: Set minfps during idlefallback" 788630c7a Merge "sdm: Fix the Y stride for YCbCr420P010 format" f78579a20 Merge "sdm: Add interface to update panel roi infromation." 694d11848 Merge "sdm: Validate mixer resolution read from property" b1bdf6e2a libdrmutils: Remove dependency on drmModeAddFB3 4640591c7 sdm: Increase SurfaceFlinger fd limits d6962cd5c sdm: Add support to pass HDR metadata to HDR External Displays 42be6d256 sdm: Add partial framebuffer roi info into dumpsys. 4894cf7db sdm: Fix the Y stride for YCbCr420P010 format ce82fd066 hwc: Set minfps during idlefallback 7d4d74860 sdm: Add interface to update panel roi infromation. 3f281b6f9 sdm: Validate mixer resolution read from property Bug: 37062945 Signed-off-by: Thierry Strudel <tstrudel@google.com> Change-Id: I4937210f3f6a3652fa8c2c7eefa3cba2a7664cea
2017-04-06 16:54:26 +00:00
common_includes := system/core/base/include
CHECK_VERSION_LE = $(shell if [ $(1) -le $(2) ] ; then echo true ; else echo false ; fi)
PLATFORM_SDK_NOUGAT = 25
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"
ifeq ($(call CHECK_VERSION_LE, $(PLATFORM_SDK_VERSION), $(PLATFORM_SDK_NOUGAT)), true)
version_flag := -D__NOUGAT__
# These include paths are deprecated post N
common_includes += $(display_top)/libqdutils
common_includes += $(display_top)/libqservice
msm8998: Update to 07.01.01.253.064 msm8998: from hardware/qcom/display 6e5ae080d Merge 4e72fab80bf8aab3442b7922273dd998763b3802 on remote branch 4e72fab80 Promotion of display.lnx.3.0-00093. da5e1f967 Promotion of display.lnx.3.0-00092. ec4cee0b9 libmemtrack: Fix integer overflow in kgsl function 9b50abe92 Merge "sdm: Add support for multiple tone map sessions" 8492f1af4 Merge "gpu_tonemapper: Clear EGLImage mappings in Tonemapper" 92ede0c97 Promotion of display.lnx.3.0-00090. 5bab55448 Merge "sdm: Fix hwc2 compilation" 0adafaff7 Promotion of display.lnx.3.0-00089. 40c8cf585 sdm: Add support for multiple tone map sessions e05cb6caa sdm: Use LayerRequests in Tonemapper. 622885460 sdm: Support ColorModes and HDR customizations e0636f332 sdm: Read HW HDR capabilities fb2f2a8a0 Merge "sdm: Add GetBufferInfo Interface" 230492a90 Merge "sdm: Use Lut indexes directly from HWScaleData" db087f65b sdm: Add GetBufferInfo Interface f3a6f1a9b gpu_tonemapper: Fix forward tonemap shader 1cc416f12 gpu_tonemapper: Clear EGLImage mappings in Tonemapper e50252bca sdm: Fix hwc2 compilation eb5c32bed Merge "gpu_tonemapper: Free eglImage on termination" e146c81a4 Merge "sdm: color-manager: Detail Enhancer Enhancements." bd6db5f56 Merge "sdm: Fix conditional logging of error and warning logs" 3c02c2497 Merge 4b32d52eae18ac558d5e2385ca5f16453f7629f7 on remote branch 310bca1de Promotion of display.lnx.3.0-00088. a4d319b71 Merge "libgralloc: Add gralloc support for P010 format" dbb86f2da gpu_tonemapper: Free eglImage on termination f2ec9452d sdm: Use Lut indexes directly from HWScaleData d9ced38e6 sdm: color-manager: Detail Enhancer Enhancements. 063f9b6fc Merge "sdm: skip null commit on command mode panels" 4a1506461 Merge "sdm: Add utils in SDM utils" f0472016a Merge "sdm: Define DPPS control interface" 938353c7e Merge "sdm: Define Socket Handler interface" 7d63f8248 sdm: Fix conditional logging of error and warning logs 3083fe9c4 libgralloc: Add gralloc support for P010 format 4b32d52ea Promotion of display.lnx.3.0-00084. 49a539b71 Merge "sdm: Fix dumpsys alignment" 088260ad8 Merge "display: Fix ColorMetaData" afe7ecb2d Merge "sdm : Fix output buffer dimensions for concurrent wb" 79819eada Merge "display: Add HDMI support in APIs exposed by display." dafb76ec7 Merge "sdm:scalar:intialize scaling params." 0b75aa236 Merge "sdm: Read downscale_compression capability from Rotator" e3ae4b05e Merge "sdm: Handle AVR and dynamic fps concurrency scenario." 0568ff182 sdm: Add utils in SDM utils 46db33696 sdm: Define DPPS control interface ca196fce5 display: Fix ColorMetaData 03e6ff664 Promotion of display.lnx.3.0-00079. a6e0f9f2d sdm: skip null commit on command mode panels 455b7f7aa sdm: Fix dumpsys alignment f27f5e7b4 sdm: Define Socket Handler interface bf2b25c10 sdm: Add support for HDR 2b75da399 gpu_tonemapper: Include gpu tonemapper 9c19cdd96 sdm: Add Layers to HWLayersInfo Intf bc0addf5a sdm: Use ColorMetadata in SDM a9a915add sdm: Handle AVR and dynamic fps concurrency scenario. bd5a8c759 Merge "sdm: Indicate driver about multi roi pu usage." 0e552d584 Merge "qdutils: Conditionally mute pu control error log" 03d567945 display: Add HDMI support in APIs exposed by display. f1e34b9d2 sdm : Fix output buffer dimensions for concurrent wb 5e4ae0c1e sdm: Read downscale_compression capability from Rotator 15f91e8e5 sdm: Indicate driver about multi roi pu usage. d14503786 sdm:scalar:intialize scaling params. 1afec3db7 qdutils: Conditionally mute pu control error log Bug: 34911851 Signed-off-by: Thierry Strudel <tstrudel@google.com> Change-Id: I7c3dce6f0e1febfaa1d0e6591c536c1409fe08ba # Conflicts: # msm8998/sdm/libs/hwc/Android.mk
2017-02-15 18:48:16 +00:00
common_includes += $(display_top)/gpu_tonemapper
ifneq ($(TARGET_IS_HEADLESS), true)
common_includes += $(display_top)/libcopybit
msm8998: Update to 07.00.00.279.027 msm8998: from hardware/qcom/display 9da3a9caf Merge "display: Move all opensource modules to vendor partition" cecde8719 display: Move all opensource modules to vendor partition 1d7f83c14 gralloc1: Fixes for hidl ecd7e84ea sdm: enable gralloc1 from hwc2 9c02dc799 gralloc1: Add remaining functionality a110e65f5 libdrmutils: Remove dependency on drmModeAddFB3 e9a2c4ece Merge branch 'display.lnx.3.0-dev' into display.lnx.3.9-rel 852358c51 Merge "sdm: Intf change propagating fb config for partial update" d0d29296a Merge "sdm: Do not mark video layer with non-integral crop as skip" 51915d6c1 Merge "sdm: Fix dynamic resolution change for virtual display" 96cffc4ce Merge "sdm: drm: Destroy DRMManager and resource info singletons" ab7807cd5 sdm: drm: Destroy DRMManager and resource info singletons fad1afd01 libdrmutils: Add support for RMFB2 672f0f788 Merge "sdm: Consider external display as active in doze suspend." 095e4405d Merge "sdm: Do not handle SKIP Cursor layer as H/W Cursor" 6d9608c9d Merge "libmemtrack: Update the flags field for sparse memory type" 66c941bd5 sdm: drm: Add Atomic commit support 7d476edfb sdm: drm: Add support for default non-atomic mode 0f26d84e3 libmemtrack: Update the flags field for sparse memory type 1f7aa5ccf sdm: Do not mark video layer with non-integral crop as skip 8ec9d36c2 sdm: Fix dynamic resolution change for virtual display 4cfb380e8 sdm: Intf change propagating fb config for partial update 172a743b1 sdm: Consider external display as active in doze suspend. 9b47ae740 sdm: Do not handle SKIP Cursor layer as H/W Cursor 2e06deff0 Add explicit liblog dependency 34f165638 Include additional system header search path Bug: 36064845 Signed-off-by: Thierry Strudel <tstrudel@google.com> Change-Id: If42b63f7cbc285dac84ea1970fcc7d21867bd70c
2017-03-08 18:37:34 +00:00
common_includes += $(display_top)/libdrmutils
endif
msm8998: Update to LA.UM.5.7.R1.07.00.00.253.052 msm8998: from hardware/qcom/display 11f3152 Merge AU_LINUX_ANDROID_LA.UM.5.7.R1.07.00.00.253.042 on remote branch c8edaff Promotion of display.lnx.3.0-00073. 4b9f87f sdm: Fix infinite frame invalidates during camera bandwidth mode change. During camera bandwidth mode change, need_invalidate is set to true for to request new draw cycles to allow new bandwidth mode to take effect. This variable is not reset after mode is changed. fcd4ec5 Merge "sdm: Enable autorefresh only one single buffer layer is present" d92bdf3 Merge "sdm: Fix Map rect for offset in source domain" 982952a Merge "sdm: Multi rect partial update changes" 1e4ca32 Merge "hwc1: Add support for getHdrCapabilities" 6abdf82 Promotion of display.lnx.3.0-00070. c906e98 sdm: Enable autorefresh only one single buffer layer is present b82c9a0 sdm: Fix partial update control in display mode switch 6064cad sdm: Fix Map rect for offset in source domain 48a392c hwc1: Add support for getHdrCapabilities 5036d3d hwc2: Protect AcceptDisplayChanges with the hwc session lock 249e03b sdm: Multi rect partial update changes bce1d81 Merge "sdm: Issue two null commits for command mode panels" c41e42c sdm: Issue two null commits for command mode panels ebf4a0d hwc2: Fix missing unaligned width setting ecf1b50 sdm: color-manager: Detail Enhancer Enhancements. b2771bf display: Add color Metadata 8b3dddc Merge "sdm : Allow configurable sdm layer limit for external" 770e328 Merge "HWC: Set skip to layers with Non Integral Source Crop" e78a97f Merge "gralloc: Return an error if the buffer was not mapped" a61a5f8 sdm : Allow configurable sdm layer limit for external debd5ce gralloc: Return an error if the buffer was not mapped a9f9000 HWC: Set skip to layers with Non Integral Source Crop Bug: 33556391 Change-Id: If1886c87a823d583e5cec891468f5e2e2199d607 Signed-off-by: Thierry Strudel <tstrudel@google.com>
2016-12-13 21:51:15 +00:00
common_includes += $(display_top)/include
common_includes += $(display_top)/sdm/include
msm8998: Update to 07.00.00.279.069 msm8998: from hardware/qcom/display 18f22e7b9 qdutils: Return on null param c8ebaf46f gralloc1: Close acquire_fence in lock 922c3c434 qdutils: Fix mapping in qdMetaData 8cfb58786 gralloc1: Add support for layered buffers 10eb00c2d gralloc1: Refactor AllocateBuffer d8a342252 gralloc1: Fix for buffer mapping and metadata access 36c99394a display: Use getMetaData in hwc2 3fcd11371 hwc2: Do not delete hwc_session 03a0b16fe display: makefile fixes b5d8958dd Merge branch 'display.lnx-3.0-dev' into display.lnx.3.9-rel f9cc5172c Merge "display: Add missing TP10 formats checks" 54885f0b8 display: Add missing TP10 formats checks 1901fa371 gralloc1: Handle ZSL scenario 7df1e404a gralloc1: Do not delete on close 065cff7db sdm: Fix compilation issue with updated framework 92998628b gralloc1: Add RAW12 format 0acc8565a Merge "gralloc1: Fix RAW10 stride" 9c6f2f82b Merge "qdutils: Fix compilation issue" 33e36730d Merge "sdm: Add property to define max upscaling limit." dfd5e3394 gralloc1: Fix RAW10 stride 29a86ddd3 gralloc1: Work around handle delete by hidl wrapper 3a9d53a1a gralloc1: Import ion handle into registering process 08c3e40f1 qdutils: Fix compilation issue ad1e7dd2e Merge "sdm: Reset the H/W layers of display" 7edd00399 Merge "sdm: Add layer format information in commit dump." 8c305cc9e sdm: Add property to define max upscaling limit. 1fbf3a337 Merge "hwc2: Fix buffer allocator usage" 72d3062d4 Merge "gralloc1: Fix sign conversion error" d18304014 hwc2: Fix buffer allocator usage a2569b466 hwc2: End uevent thread in hwc_close cfa399d5a Merge "lights/sdm: Add support for new brightness node" 8b021cfac lights/sdm: Add support for new brightness node 96da72923 Merge "sdm: Fix file path for input layer dump." fcaabf2de Merge "liblight: Add brightness level extension support" 890f2dddd Merge "sdm: fb: Ensure backward compatibility for backlight extn" 7dc06d104 gralloc1: Fix sign conversion error 586c6d5f9 liblight: Add brightness level extension support 692f91424 Merge "gralloc1: Drop ZSL check" 0a7d5af8b Merge "gralloc1: Add Dump() in buffer manager" d0c5bb612 gralloc1: Drop ZSL check 699b45750 gralloc1: Add additional debug logging ef287dc13 gralloc1: Use handle as map key dce3654d9 sdm: Reset the H/W layers of display d77bc0880 Merge "sdm: Change idle fallback time dynamically." dc918136a gralloc1: Add Dump() in buffer manager 271403788 Merge "sdm: drm: Add user space to DRM driver struct conversion for PGC" bf805fdf0 Merge "sdm: Add property to disable partial split" 6c4b8c957 sdm: Add layer format information in commit dump. 5e2b69f44 sdm: fb: Ensure backward compatibility for backlight extn c31d7f8d9 sdm: add one action to set panel brightness and refresh screen 2fdd16ade sdm: Fix file path for input layer dump. 14ee4b688 sdm: rotator: Port min downscale and downscale compression cd557c190 sdm: drm: const correctness 319f1e808 Merge "sdm: drm: Add user space to DRM driver struct conversion for gamut" be5c2ef1d gralloc1: Fix typo in RAW8 format d00094273 sdm: drm: Add user space to DRM driver struct conversion for PGC d9f61ce2c Merge "gralloc: Add support for 8-bit RAW MIPI stream" ce565d219 Merge "sdm: Add support to handle idle power collapse event" c2b20a3a0 Merge "sdm: Destroy singleton DRMMaster instance" b0a253bf3 Merge "sdm: Add support for rotator with DRM" c1a71ca21 sdm: Add property to disable partial split 11e8ee03a Merge "sdm: Create HWCUevent thread before creating display." 1e54952f4 Revert "display: Move all opensource modules to vendor partition" a57cf169f sdm: Destroy singleton DRMMaster instance 4c790408b display: Move all opensource modules to vendor partition 2337d700f sdm: Add support to handle idle power collapse event 9f163268a sdm: Create HWCUevent thread before creating display. b06308d12 sdm: Change idle fallback time dynamically. 0beb2fd1a Merge "gralloc: Add support for raw12" 0f05e188a Merge "hwc2: Fix dumpsys bug" f48302a61 gralloc: Add support for 8-bit RAW MIPI stream 85d9c785a sdm: drm: Add user space to DRM driver struct conversion for gamut 281f48de8 sdm: drm: Add post-processing support in SDM 68f7040b1 sdm: color-manager: Add new PP versions to color manager 66d5b4915 hwc2: Fix dumpsys bug 1c473d817 gralloc: Add support for new system defined RGBA formats b08b43ff0 Merge "sdm: Fix vector initialization" 3394427d7 Merge "sdm: Add support to recompute rectangles considering flips" a228f120a sdm: Add support for rotator with DRM dd54f8443 Merge "sdm: Increase SurfaceFlinger fd limits" 8f9c7c323 gralloc1: Fixes for hidl 1738441b4 sdm: Fix vector initialization e2422e0e7 gralloc: Add support for raw12 5de9c6377 sdm: Add support to recompute rectangles considering flips 13321553e Merge "sdm: Add support to pass HDR metadata to HDR External Displays" 4275221d6 sdm: enable gralloc1 from hwc2 e69031e9c gralloc1: Add remaining functionality 441526d42 Merge "sdm: Add partial framebuffer roi info into dumpsys." 5c050a808 Merge "hwc: Set minfps during idlefallback" 788630c7a Merge "sdm: Fix the Y stride for YCbCr420P010 format" f78579a20 Merge "sdm: Add interface to update panel roi infromation." 694d11848 Merge "sdm: Validate mixer resolution read from property" b1bdf6e2a libdrmutils: Remove dependency on drmModeAddFB3 4640591c7 sdm: Increase SurfaceFlinger fd limits d6962cd5c sdm: Add support to pass HDR metadata to HDR External Displays 42be6d256 sdm: Add partial framebuffer roi info into dumpsys. 4894cf7db sdm: Fix the Y stride for YCbCr420P010 format ce82fd066 hwc: Set minfps during idlefallback 7d4d74860 sdm: Add interface to update panel roi infromation. 3f281b6f9 sdm: Validate mixer resolution read from property Bug: 37062945 Signed-off-by: Thierry Strudel <tstrudel@google.com> Change-Id: I4937210f3f6a3652fa8c2c7eefa3cba2a7664cea
2017-04-06 16:54:26 +00:00
common_flags += -isystem $(TARGET_OUT_HEADERS)/qcom/display
endif
endif
common_header_export_path := qcom/display
#Common libraries external to display HAL
common_libs := liblog libutils libcutils libhardware
common_deps :=
kernel_includes :=
ifeq ($(TARGET_COMPILE_WITH_MSM_KERNEL),true)
# This check is to pick the kernel headers from the right location.
# If the macro above is defined, we make the assumption that we have the kernel
# available in the build tree.
# If the macro is not present, the headers are picked from hardware/qcom/msmXXXX
# failing which, they are picked from bionic.
common_deps += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
kernel_includes += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
endif