Commit Graph

4336 Commits

Author SHA1 Message Date
Naseer Ahmed 56410401ad hwc2: Fix color mode lock am: 9bb6568f16 am: cd56508c2e
am: 6a47289828

Change-Id: I13e83a2e1e1b52da411c8f97ffd4ea295109fa55
2017-07-27 04:51:09 +00:00
Naseer Ahmed 9573313b03 hwc2: Fix color mode lock am: 9bb6568f16 am: efa414aa12
am: a43ffb7e27

Change-Id: Ic0c88a890d0635ae56cf189513c7947b170a70f2
2017-07-27 04:50:37 +00:00
Naseer Ahmed 6a47289828 hwc2: Fix color mode lock am: 9bb6568f16
am: cd56508c2e

Change-Id: I8b724f6496fbc19e10694d4feeeb848f5936c43b
2017-07-27 02:08:19 +00:00
Naseer Ahmed cd56508c2e hwc2: Fix color mode lock
am: 9bb6568f16

Change-Id: Ieb45697d6035b554181fa054d531e7d89f66cae5
2017-07-27 01:07:59 +00:00
Naseer Ahmed a43ffb7e27 hwc2: Fix color mode lock am: 9bb6568f16
am: efa414aa12

Change-Id: I4882ed7beaa5fbcd2f09da6ab8715a567554bff8
2017-07-26 23:37:48 +00:00
Naseer Ahmed efa414aa12 hwc2: Fix color mode lock
am: 9bb6568f16

Change-Id: I7ff0578a59e9701902f08c676fe66484a0db7335
2017-07-26 23:25:24 +00:00
Naseer Ahmed 9bb6568f16 hwc2: Fix color mode lock
Bug: 64020849
Change-Id: I2e9386e953ed764eb7f5924ed599a79fb5b3d911
2017-07-26 13:16:38 -07:00
Naseer Ahmed b149d5d84b hwc2: Add more tracing am: c22578f608 am: d1d621051f
am: bd6f40ec0e

Change-Id: I793a438432098768b607789468bedb9a91c55960
2017-07-26 00:40:50 +00:00
Thierry Strudel 0d50004e62 Merge commit '272267430caca35ed8f93afa4fe52f091f3a83b5' into HEAD am: 1e855334c8
am: dd361dc9ae

Change-Id: I5844c0d6443ca5f693321fb43a2349017e072f04
2017-07-26 00:40:24 +00:00
Naseer Ahmed bd6f40ec0e hwc2: Add more tracing am: c22578f608
am: d1d621051f

Change-Id: I561885c35ce15d78855195530c51dc44cc6ad640
2017-07-25 23:46:43 +00:00
Thierry Strudel dd361dc9ae Merge commit '272267430caca35ed8f93afa4fe52f091f3a83b5' into HEAD
am: 1e855334c8

Change-Id: If3deabb2d5f39453d5a28f843f2c95da36041985
2017-07-25 23:46:34 +00:00
Naseer Ahmed d1d621051f hwc2: Add more tracing
am: c22578f608

Change-Id: I1a38b857b4ded6bad4132970455c3f210bbfdf47
2017-07-25 23:34:58 +00:00
Naseer Ahmed 2ca68065d1 hwc2: Add more tracing am: c22578f608 am: c2c1ea9a5d
am: 7aa4ac42d0

Change-Id: I6b438d847c7f1c48b9f3f3ad66a20557d8834e4f
2017-07-24 22:45:17 +00:00
Naseer Ahmed 7aa4ac42d0 hwc2: Add more tracing am: c22578f608
am: c2c1ea9a5d

Change-Id: I33e9de98ff72569a02b2d7065a1b02753af22c81
2017-07-24 22:42:47 +00:00
Naseer Ahmed c2c1ea9a5d hwc2: Add more tracing
am: c22578f608

Change-Id: Ica348999cd03ea1d54e70b7ee2ead2d12696496b
2017-07-24 22:40:18 +00:00
Naseer Ahmed c22578f608 hwc2: Add more tracing
Bug: 63626797
Change-Id: I702e886904ed8823f1b73eeed494fba76f7f469b
2017-07-24 15:29:33 -07:00
Thierry Strudel 69e02aff20 Merge commit '599e41cc2940d1935469b7e008e1fca1ce551c7d' into HEAD
am: 1881cd60ee

Change-Id: I0ae9c766df3948659716e601df2a44746daaf648
2017-07-24 21:48:13 +00:00
Thierry Strudel 1e855334c8 Merge commit '272267430caca35ed8f93afa4fe52f091f3a83b5' into HEAD
Change-Id: I4ff3c0080b7856baabeab3954af4504a3d7c012d
2017-07-24 12:59:53 -07:00
Thierry Strudel 1881cd60ee Merge commit '599e41cc2940d1935469b7e008e1fca1ce551c7d' into HEAD
Change-Id: I94ac399a7075f2853c84404f97770229faf0c9c4
2017-07-24 12:46:35 -07:00
Naseer Ahmed 599e41cc29 msm8998: display: Update to LA.UM.6.4.9
am: 272267430c

Change-Id: I8565422f5bfdbb98f6586d3fc34c05cf9608ebe3
2017-07-24 06:18:53 +00:00
Naseer Ahmed 272267430c msm8998: display: Update to LA.UM.6.4.9
986f06e953 hwc2: Extend GetClientTargetSupport API
68326e2eb3 hwc2: validate display id in SetColorModeById
4436e52a74 gralloc1: Additional checks in release
4d52eb143c hwc2: cursor fixes
5023c503ad hwc2: Partial revert of 82c9033a8b
1933da3aeb sdm: Cleanup unused code, round 2
e85c316234 hwc2: Allow non-atomic execution of validate and present apis
a124ea3639 sdm: Synchronized write of xlogs
c6d27ee1ff sdm: Fixes for Skip Validate feature
768a791ebd hwc2: Check and set CSC only for device layers
4775fc505e gpu_tm: Use vendor module for header includes
a296c8f493 sdm: Change error log to conditional verbose
3f82fca6a9 cec: Calculate buffer length to protect from overflow
82c9033a8b hwc2: Handle corner and error conditions properly.
e2ac3bb4ba gralloc1: Do not do early validation on Release
eaa0a4d697 gralloc1: Do not map metadata in gralloc
b6569c6679 display: Cleanup unused code
3ab38f43fa hwc2: Use CSC information from android dataspace

Bug: 63146977
Bug: 63691933
Bug: 62992393
Bug: 37480806
Change-Id: I1ba2c33e04f637e424355854f32f3c6cdf789a8d
2017-07-21 19:54:59 -07:00
Chia-I Wu bd8cdbdcaa sdm: hwc2: validate display id in SetColorModeById am: cba1cee475
am: 017c58a2ad

Change-Id: I504b64b503635f17a5a66e801b293877a63cb120
2017-07-19 23:09:18 +00:00
Chia-I Wu 017c58a2ad sdm: hwc2: validate display id in SetColorModeById
am: cba1cee475

Change-Id: I2eb8aec6ce13600a7339d023dfbc32006c901b18
2017-07-19 23:05:13 +00:00
Chia-I Wu cba1cee475 sdm: hwc2: validate display id in SetColorModeById
Bug: 63144992
Test: manual vndservice call
Change-Id: I239670334560b9db4ef781aac2612a86ea4363a9
2017-07-19 14:02:05 -07:00
Naseer Ahmed 89c3eb0568 sdm: Synchronized write of xlogs am: e0f39648ed
am: c6942b3c1e

Change-Id: I2860555994214aa49fe03868a7d6e453ef3315a8
2017-07-17 20:52:37 +00:00
Naseer Ahmed c6942b3c1e sdm: Synchronized write of xlogs
am: e0f39648ed

Change-Id: Id999a95b7a6b5990c5ead01b610f4c5806356d09
2017-07-17 20:50:36 +00:00
TreeHugger Robot 387b5939f0 Merge "Build libqdMetaData with BOARD_VNDK_VERSION" 2017-07-17 19:48:36 +00:00
Naseer Ahmed e0f39648ed sdm: Synchronized write of xlogs
Make sure xlogs are flushed to the data partition before the dump
function returns.

Bug: 63539182
Change-Id: Ifd18146e3d93efdb140633e36bcc8321bdf4a238
2017-07-17 11:21:14 -07:00
Tim Kryger 9f2f450884 Merge changes Idcceacb5,Ic511f925,Icd2dc230,I36b03e49,I1be3b339, ...
* changes:
  libmemtrack: Fix fd leak in kgsl function
  libmemtrack: Fix integer overflow in kgsl function
  libmemtrack: fix ion memory tracking
  libmemtrack: Update parsing of kgsl mem file
  libmemtrack: Properly account for memory usage
  libmemtrack: Update the parsing of flags field
2017-07-14 22:31:46 +00:00
TreeHugger Robot a45fc80940 Merge changes from topic '845-es2'
* changes:
  Merge commit '01146fe7' into HEAD
  sdm845: AU_LINUX_ANDROID_LA.UM.6.3.R1.06.00.01.301.017
2017-07-14 21:53:44 +00:00
Ajit Kumar 0f511585b9 libmemtrack: Fix fd leak in kgsl function
Added code to close fd for error cases in kgsl
function to prevent possible leak in fd.

Change-Id: Idcceacb5aa19a269ad187e668ed4fbc5280fcd24
2017-07-14 13:47:36 -07:00
Ajit Kumar 9e454ef658 libmemtrack: Fix integer overflow in kgsl function
In the kgsl function which gets memory info for a
pid, there could be possibility of integer overflow
in operations with size, mapsize, accounted_size,
and unaccounted_size due to which result might be
smaller than these values. External inputs size and
mapsize are verified, and overflow check has been added.

Change-Id: Ic511f92574d80e0d596975db16a43787699ae543
2017-07-14 13:47:36 -07:00
Ajit Kumar 8ac6f5bad2 libmemtrack: fix ion memory tracking
Use 2 new columns from the kgsl debugfs mem file:
egl_surface_count: # of buffer attachments with usage=egl_surface
egl_image_count:   # of buffer attachments with usage=egl_image

If an ion buffer is mapped with usage=egl_surface, the entire size will
be counted towards the egl_surface. The assumption is that the buffer
will be freed if the producer process is killed.

To handle buffers such as the wallpaper and texture atlas which have
no producer and are potentially mapped multiple times, assign each
process where usage=egl_image a size of "size / egl_image_count". This
ensures that the total memory usage is correct, while still assigning
some memory to each process which maps the buffer.

The above replaces the attempts to avoid double counting buffers using
the "is_surfaceflinger" check.

Change-Id: Icd2dc230edb6b5beb7a20dad45d2d066e9e4d623
2017-07-14 13:47:36 -07:00
Ajit Kumar 08a008ea03 libmemtrack: Update parsing of kgsl mem file
The mem file now has additional field, the mapsize. This
represents the size in bytes mapped to userspace. Use this
value and total size of an object to derive the unaccounted
size.

Change-Id: I36b03e49f431f11db7b06f1366cd37d264381747
2017-07-14 13:47:36 -07:00
Ajit Kumar 7dae3de110 libmemtrack: Properly account for memory usage
Do not count the memory usage for egl_surfaces since its used
as egl_image in surface flinger.

Change-Id: I1be3b339080eb352f41a7bedd615ddfe0c2aa04c
2017-07-14 13:47:36 -07:00
Ajit Kumar 66a04c6a91 libmemtrack: Update the parsing of flags field
The length of flags field in kgsl debugfs mem file has changed
from 7 to 8. Hence, change the parsing in libmemtrack accordingly

Change-Id: Ia94ee7b41a7903badc42851a05c61940ece67ef5
2017-07-14 13:47:36 -07:00
Chris Fries ee2e2bceb5 Merge commit '01146fe7' into HEAD
ES2
2017-07-14 10:42:11 -05:00
Chris Fries 01146fe71a sdm845: AU_LINUX_ANDROID_LA.UM.6.3.R1.06.00.01.301.017
commit 03b4aefb8800e42f55de59caf535527be14f88cb
Author: Rajesh Yadav <ryadav@codeaurora.org>
Date:   Wed May 10 18:51:57 2017 +0530

    color_manager: Update display color api libname

    Update display color api libname present in /vendor
    partition.

    Change-Id: I3626975ddff8458c641dc60b3632581512f91b94

Change-Id: I06cc38b25face1c7731a15a57e4975f7286f80a9
2017-07-14 10:41:20 -05:00
Jiyong Park 165d17febd Build libqdMetaData with BOARD_VNDK_VERSION
The header lib 'display_headers' exports headers under libgralloc1.
However, headers at libgralloc1 is internally using libhardware_headers.
Export this to the clients of display_headers.

Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j libqdMetaData

Change-Id: I2cdf699468aca3f9142e1ef5e756ec9f040e7a6e
2017-07-14 14:44:03 +09:00
Tri Vo 2ad4b087e0 Build gpu_tonemapper with VNDK.
(partial revert of f1fe88efc1)

Bug: 37342627
Test: cd hardware/qcom/display/msm8998/gpu_tonemapper &&
BOARD_VNDK_VERSION=current mma -j64 -k
Change-Id: I07900345b395c3322ac2ca42b9d907e1f6868760
2017-07-13 18:23:02 +00:00
Naseer Ahmed 634e7b4dac display: Update to AU 269 am: f1fe88efc1
am: 3533a776b5

Change-Id: Icc4c6d0e1aa37bf4b37c1ff4a94bee0613f2de0a
2017-07-13 05:43:21 +00:00
Naseer Ahmed 3533a776b5 display: Update to AU 269
am: f1fe88efc1

Change-Id: Ib84b004a908d8155cd1800f01b82521386688f12
2017-07-13 05:40:55 +00:00
Jayant Chowdhary e54e422cee Build lights.msm8998 with the VNDK.
When the vndk is enabled (BOARD_VNDK_VERSION=current),
vendor libraries must only link against vendor variants
in the build system. This also means that they receive
restricted sets of headers and that automatic global
headers are restricted.

Test: BOARD_VNDK_VERSION=current m -j k lights.msm8998

Bug: 37342627

Change-Id: I300654fbe4774c43a61104b9be0833fd06fa1548
2017-07-10 15:53:15 -07:00
Naseer Ahmed f1fe88efc1 display: Update to AU 269
af20b3030 qdutils: Add dependency on libhardware headers
07a82a250 display: Mark header modules as vendor
596d6789d hwc2: Do not reapply mode if it is the same as before
02f73fd2c sdm: hwc2: Support Skip Validate feature
2174cfe4b sdm: Use sync task utility for hdr tonemapping.
d002e1e90 sdm: Add sync task utility.
ea6921875 sdm: Add factory template for compile time exclusion.
77555e0a1 sdm: Use color metadata if Android framework metadata is not set
13f038dd6 gpu_tonemapper: Tonemap unaligned width and height of source
4a6a02514 hwc2: Add support to disable HDR handling
a58b93ebf hwc: gpu_tonemapper: Create Secure EGL Context
d7aed8703 hwc2: Pass secure flag to GPU tonemapper
3aff84da4 hwc2: Add support for HDR and HWC tonemapping
177e21f29 display: Store and restore the current eglContext
c659af50a gpu_tonemapper: Adjust sample points to maintain linearity
6e37120ce hwc2: Set client target dataspace
dc34aca12 gralloc1: Align buffer size for each layer
8cf3382bc gralloc1: Update client allocated handle behaviour
2d151167f hwc2: Fix compilation issue
40c96cd19 sdm: handle debug data in hw_device
4e520db60 sdm: hwc2: Check for HDR support by Display interface
9a534715b hwc2: Check composition type in SetLayerBuffer
3507a146a sdm: Update xlogs dump
ba5bbd5a9 hwc2: Disable detail enhancer
3a1f7b12a sdm: Save debug logs on pingpong timeout

Bug: 63111041
Bug: 63335893
Change-Id: I645b5d82c73100821879bf03fd5b836dca2d2c63
2017-07-07 11:38:11 -07:00
Chris Fries 3f9dd32785 Merge changes I95c96cae,I206b8606,I496529d7,If5d7a309
* changes:
  sdm845: libgralloc1: remove dependency on libqdutils
  sdm845: Add const specifier to SortLayersByZ comparator
  Android.mk: Refactor target directory inclusion (to add sdm845)
  sdm845: AU_LINUX_ANDROID_LA.UM.6.3.R1.06.00.01.301.010
2017-06-30 04:36:43 +00:00
Naseer Ahmed 418cca1cc7 Merge "hwc2: invalidate on format change am: dd6edac0dc am: 37e38ea681" into oc-dr1-dev-plus-aosp
am: 1bcef5acae

Change-Id: Ifb7ee3421ce37fe9fa8c54c8e8c85f16b708d79d
2017-06-28 23:23:18 +00:00
Naseer Ahmed 9a34f1b7a9 hwc2: invalidate on format change am: dd6edac0dc am: 110d13c815
am: 985b4e311a

Change-Id: I7b91664a18abe5e80b01a61ff2479a410b277419
2017-06-28 23:23:04 +00:00
Android Build Merger (Role) 1bcef5acae Merge "hwc2: invalidate on format change am: dd6edac0dc am: 37e38ea681" into oc-dr1-dev-plus-aosp 2017-06-28 23:19:10 +00:00
Naseer Ahmed 985b4e311a hwc2: invalidate on format change am: dd6edac0dc
am: 110d13c815

Change-Id: Idff7439d1250c66dc177e5aeb61db4dfb78118f0
2017-06-28 23:19:04 +00:00
Naseer Ahmed be8b91683a hwc2: invalidate on format change am: dd6edac0dc
am: 37e38ea681

Change-Id: I5f77e6819b6dbd31064fb1cb5cc043bab3d8f39b
2017-06-28 23:19:04 +00:00