OSDN Git Service
Kalyan Kondapally [Wed, 3 Jan 2018 13:57:30 +0000 (05:57 -0800)]
Track render state correctly.
We need to render layers in case plane has more than one layer
/needs gpu composition.
Jira: None.
Test: Content is correct after rendering idle frame on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 3 Jan 2018 13:48:25 +0000 (05:48 -0800)]
Postpone re-validation when only removing layers.
In this case we shouldn't be showing any new content but only
removing old layers. We can avoid full revalidation.
Jira: None.
Test: We dont trigget a full revalidation in case cursor layer
becomes invisible.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 3 Jan 2018 13:46:39 +0000 (05:46 -0800)]
Fix indentation.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 3 Jan 2018 13:43:47 +0000 (05:43 -0800)]
Add more traces.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 3 Jan 2018 12:24:15 +0000 (04:24 -0800)]
Fix cursor layer check in DrmPlane.
We might be using Overlay to show cursor. Let's check
if the layer is a cursor layer instead of assuming we will
use only cursor plane for cursor layer.
Jira: None.
Test: Cursor layer size is correct ir-respective of the plane
in use.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 3 Jan 2018 12:22:37 +0000 (04:22 -0800)]
Don't ignore alpha when using overlays.
The preffered format order always had x* components as first.
We want to prefer these only in case of primary.
Jira: None.
Test: Right format is used with overlays on APL.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 3 Jan 2018 12:20:59 +0000 (04:20 -0800)]
Let's make sure we use single plane when in idle mode.
We ignored this state and continued to use multiple planes.
Jira: None.
Test: Only single plane is used when we are rendering an idle
frame.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Tue, 2 Jan 2018 15:36:23 +0000 (07:36 -0800)]
Enable Damage support.
We now keep track of both surface damage of buffer and any
damage incurred due to geometry changes i.e. Transform change,
alpha value change etc. We rely on this and not just buffer
damage. With this we are able to now do partial updates, doing
full, partial or no clear as needed.
Jira: None.
Test: Sliders work fine, Mouse GPU composition doesn't show any
artifacts.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Tue, 2 Jan 2018 14:19:45 +0000 (06:19 -0800)]
Ensure we reset composition region cache when we add new layers.
Jira: None.
Test: Check that we re-calculate the region when ever new layers
are added.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Tue, 2 Jan 2018 11:28:09 +0000 (03:28 -0800)]
Ensure we clear surface when display rect has changed.
Jira: None.
Test: Cursor doesn't render garbage when being gpu composited.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Tue, 2 Jan 2018 09:22:11 +0000 (01:22 -0800)]
Ensure we swap surface as needed.
We should do this when we add new layers.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Tue, 2 Jan 2018 08:07:30 +0000 (00:07 -0800)]
Fix Logical Display.
We assume cursor layer is always the top layer. Let's make sure
this is valid in case of logicaldisplaymanager.
Jira: None.
Test: No crashes when using logical displays.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Mon, 1 Jan 2018 00:01:56 +0000 (16:01 -0800)]
Avoid redundant test commit.
We now track if validatelayers did a test commit with current
combination of layers. In this case we can avoid the same in
ReValidatePlanes.
Jira: None.
Test: No commit failures seen on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 31 Dec 2017 13:31:09 +0000 (05:31 -0800)]
Fix commit failure when rotating the screen.
Let's ensure we do a test commit when layers are added, even
if they are for last plane. DisplayQueue assumed PlaneManager
handled this even though it didn't. Let's track this
information and pass to DisplayQueue.
Jira: None.
Test: No commit failures while rotating the screen to 90 degress.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 31 Dec 2017 12:02:59 +0000 (04:02 -0800)]
Minor cleanup.
Only call SetLayerComposition from RenderState. This is when
we know that the layer is actually going through GPU composition.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 31 Dec 2017 08:28:22 +0000 (00:28 -0800)]
Add support to track when surfaces need to be refreshed.
We can avoid redundant validation of NativeSurface in case
nothing has actually changed. Let's keep a track of this
without DisplayPlaneState.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 31 Dec 2017 08:05:34 +0000 (00:05 -0800)]
Remove UsePlaneScalar from OverlayLayer.
Same can be queried from DisplayPlaneState.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 31 Dec 2017 01:20:27 +0000 (17:20 -0800)]
Combine all incremental plane checks to one.
We currently do checks whenever a layer needs to be revalidated
and also whenever a particular plane needs revalidation. Let's
combine all these checks into one instead of splitting them up.
Jira: None.
Test: Layer scaling works as now and dont see any commit failures.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sat, 30 Dec 2017 23:19:58 +0000 (15:19 -0800)]
Let's ensure we test layers as rects change.
As we start to enable scaling, let's make sure we do a test
commit every time display frame or source rect change
compared to previous frame.
Jira: None.
Test: Video works as now.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sat, 30 Dec 2017 22:58:12 +0000 (14:58 -0800)]
Track source correctly in displayplanestate.
We currently use scalars only for media but in future this
could be used for any layer. Let's make sure we track this
correctly and internally decide if source_rect should remain
the union of rects of all layers or equal to display frame.
This decision depends if display scalar flag is enabled
or disabled in displayplanestate.
Jira: None.
Test: Video still uses scaling as now.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 29 Dec 2017 19:31:42 +0000 (11:31 -0800)]
Ensure we do a test commit in case cursor checks fail.
Jira: None.
Test: No Atomic commit failures seen when rotating screen.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 29 Dec 2017 14:47:38 +0000 (06:47 -0800)]
Remove redundant inputs to validate layers.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 29 Dec 2017 14:33:01 +0000 (06:33 -0800)]
Cache cursor test results.
Adds basic caching to save last test results for cursor layer
with a given plane. This should avoid redundant test checks
for cursor when other layers have been added or removed.
Jira: None.
Test: No test commit is requested if same transform and plane is
used for cursor.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 29 Dec 2017 03:58:07 +0000 (19:58 -0800)]
Avoid surfacedamage/rects calculations in case layers are removed.
This is redundant as we will be clearing surface and also all
display rects would have been re-calculated when layers are
reset.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Xiaosong Wei [Mon, 25 Dec 2017 04:44:51 +0000 (12:44 +0800)]
Add RestoreDefaultVideoColor implementation
Restore the default values for VPP and then remove the effect applied
before.
Jira: None
Test: Set/Restore color works as expected
Change-Id: Ied474e6e37124b35a80e96c5f2b9c403bb38c3a7
Tracked-On:
Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com>
Kalyan Kondapally [Thu, 28 Dec 2017 00:56:59 +0000 (16:56 -0800)]
Avoid extra test commit checks.
We don't need to do this if we have already done while
validating the layers. Let's keep track of it and do
final validation if still needed.
Jira: None.
Test: No commit fails on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Tue, 26 Dec 2017 09:49:04 +0000 (01:49 -0800)]
Avoid full validation when adding new layers.
We can avoid re-validating whole commit when a layer is added
like we do for cursor. This is useful as complexity increases
with various combinations i.e. down/upscaling.
Also added tracing support to track down any duplicate layers
being added to a plane or in case we miss to add any layer.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Mon, 25 Dec 2017 16:08:42 +0000 (08:08 -0800)]
Avoid full validation when layers are removed.
We now reset layers for the plane and check if this commit
passes before doing a full validation. One case which is
yet to be handled is when we have free planes and determining
if we can distrbiute layers to these planes.
Jira: None.
Test: No crashes when navigating between different views on
Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 24 Dec 2017 17:08:42 +0000 (09:08 -0800)]
Revert "Clip Viewport to DisplayFrame bounds when not using Scalar."
Fixes bugs related to popups being displayed in wrong position.
This reverts commit
644a9828859793da2b39689caa004985cfc5d47e.
Kalyan Kondapally [Sun, 24 Dec 2017 17:07:56 +0000 (09:07 -0800)]
Revert "Always use source crop to set viewport."
This reverts commit
e937df968d2077a98a8d0842e53021aa5df224a4.
Kalyan Kondapally [Sat, 23 Dec 2017 10:36:46 +0000 (02:36 -0800)]
Remove redundant checks in overlaylayer.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sat, 23 Dec 2017 08:13:46 +0000 (00:13 -0800)]
Don't track Primary plane separately.
This should simplify logic when validating layers. Also,
these changes fix case where we added cursor layer to an
overlay and also to the cursor plane separately.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sat, 23 Dec 2017 03:36:12 +0000 (19:36 -0800)]
Cache DisplayPlaneState.
This patch adds support to cache relevant private data, instead
of having to manually track it for every frame. This simplifies
lot of things like keeping track of any new surfaces when commit
has failed for that frame, display rect changes etc. Also, this
avoids redundant copies of plane state every frame.
Jira: None.
Test: No flicker seen while moving between different views.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sat, 23 Dec 2017 02:22:36 +0000 (18:22 -0800)]
Rework DisplayPlaneState API.
This is to make sure they align with rest of the classes in
code base.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Harish Krupo [Tue, 5 Dec 2017 12:45:08 +0000 (18:15 +0530)]
Add package config file
Add package config file to export the necessary flags.
Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>
Harish Krupo [Sun, 26 Nov 2017 00:11:43 +0000 (05:41 +0530)]
Makefile: Remove unneeded LDADDs
The LDADD for libhwcomposer_{common,wsi} is not needed as it is
already linked into libhwcomposer.so in the linker flags as whole
archives. Adding this causes "multiple definition" errors during
linking.
Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>
Harish Krupo [Mon, 20 Nov 2017 13:26:02 +0000 (18:56 +0530)]
ifdef guard for GBM_BO_USE_CAMERA_{WRITE,READ}
This fixes compilation error when compiled using --enable-gbm
as gbm doesn't have these definitions.
Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>
Harish Krupo [Thu, 30 Nov 2017 17:10:23 +0000 (22:40 +0530)]
travis: Add compilation check against libgbm (mesa)
Signed-off-by: Harish Krupo <harish.krupo.kps@intel.com>
Kalyan Kondapally [Fri, 22 Dec 2017 08:31:27 +0000 (00:31 -0800)]
Fix build with Debug logs.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 22 Dec 2017 08:16:53 +0000 (00:16 -0800)]
Force full re-validation in case last commit failed.
In this case their are too many combinations to take care of.
Instead, let's just force a full validation.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 22 Dec 2017 08:41:00 +0000 (00:41 -0800)]
Add surface age to NativeSurface.
We need to track how many frames before a surface can be
re-cycled. Otherwise, we will end up updating the surface
while it's still on-screen. Once the age is zero it can be
re-cycled for other planes. If age is 2 or 1 it means we need
to wait that many frames before the surface is free to be
re-used for another plane.
Jira: None.
Test: No flicker seen when navigating between views.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 22 Dec 2017 03:03:27 +0000 (19:03 -0800)]
Dont try to use cursor plane always for non cursor layers.
We should use this only when cursor is reported as an universal
plane.
Jira: None.
Test: Check the cursor plane is not used for other layers during
test commit.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 22 Dec 2017 02:27:22 +0000 (18:27 -0800)]
Use consumer_usage instead of usage from gralloc side.
Minigbm structure has changed and we should be using this.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 22 Dec 2017 01:35:52 +0000 (17:35 -0800)]
Add DRM_FORMAT_ARGB8888 checks in drmplane.
We support this for Cursor Plane. Also, add verbose
to print when we are using pixel_format = 0 and layer
is Video.
Jira: None.
Test: Check that we are allocating buffers of this format for
Cursor Plane and not using 0.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 22 Dec 2017 00:25:25 +0000 (16:25 -0800)]
Ensure we track layer usage correctly.
As we now can interchange between different usage and buffer's
cached, let's make sure we track this state correctly.
Jira: None.
Test: Video plays correctly in multi mode.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Thu, 21 Dec 2017 20:59:00 +0000 (12:59 -0800)]
Pop Out of scope Cached Buffers as part of PreparePurgedResources.
This would have all buffer destruction in one place and also
make sure we have last 4 frame buffer cache while current is
being populated.
Jira: None.
Test: Build passes on Android. Also, gemhandle failures are
minimized.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Thu, 21 Dec 2017 10:55:33 +0000 (02:55 -0800)]
Ensure we clear surfaces when last commit fails.
This should make sure we don't see garbage in these cases.
Jira: None.
Test: Surfaces are cleared when commit fails on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Xiaosong Wei [Thu, 21 Dec 2017 09:16:41 +0000 (17:16 +0800)]
Add more tests in hwcservice_test
Add more tests for setting/restoring video colors
Jira: None
Test: tests work as expected
Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com>
Lin Johnson [Wed, 20 Dec 2017 09:11:56 +0000 (17:11 +0800)]
No need to delete fb if we already have one.
Jira: None
Tests: Build passes on Android.
Signed-off-by: Lin Johnson <johnson.lin@intel.com>
Kalyan Kondapally [Thu, 21 Dec 2017 10:01:59 +0000 (02:01 -0800)]
Remove unused cursor related code.
We added code to create cursor buffers but are not really
using it. Remove this code, same time add error logs in case
we end up creating rgb buffers to store YUV data.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Thu, 21 Dec 2017 09:06:00 +0000 (01:06 -0800)]
Remove redundant code.
We now check for preffered format from plane before
creating the buffer. We can remove these checks.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Thu, 21 Dec 2017 07:12:22 +0000 (23:12 -0800)]
Fix error log.
We where reporting about resources even though the draw
failed.
Jira: None.
Test: Build passes on Android and Linux.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Wang,Fei [Thu, 21 Dec 2017 05:46:30 +0000 (13:46 +0800)]
Add sharp adjustment on VA module.
Jira: None.
Test: Build passes on Linux and Android.
Signed-off-by: Wang,Fei <fei.w.wang@intel.com>
Kalyan Kondapally [Thu, 21 Dec 2017 00:43:18 +0000 (16:43 -0800)]
Minimize locking while purging resources.
We destroy all resources in thread handling present call
but postpone the destruction of gl, media and Native
resources to be done in compositor thread. To handle
synchronization we lock every purge call. Instead, of
this what we do now is store the request for destorying
these resources in same thread, at end of present call
we copy these requests which are then read from
compositor thread. This way we just need to have the locks
only during this copy.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Thu, 21 Dec 2017 00:13:30 +0000 (16:13 -0800)]
Print more data when GEM handle fails to close.
This is useful to help understand which buffers have issues.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Thu, 21 Dec 2017 00:01:48 +0000 (16:01 -0800)]
No need to reset composition results in case of idle frame.
If we are here than the composition should be exactly same as
previous frame.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 20 Dec 2017 23:58:30 +0000 (15:58 -0800)]
Ensure we mark on-screen & in-flight surface as in use always.
We recycle surfaces when validating new commits. We set only
the current onscreen surface as in use. However, we might have
a surface in flight to be shown during current vblank. Ensure
we mark both these surfaces in use. This was highlighted now
as we seem to fail test commits/fb creations with AB24 format
for some reason in certain cases.
Jira: None.
Test: No garbage seen when moving between different views on
Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 20 Dec 2017 14:50:59 +0000 (06:50 -0800)]
Trigger a full validation in case fb creation fails.
In this case we should fallback to gpu composition and be able
to create a fb which we support. We cannot determine this without
full validation of layers. Let's force that in this case.
Jira: None.
Test: No atomic commit failues seen on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 20 Dec 2017 12:23:40 +0000 (04:23 -0800)]
Remove gem_handle_ as part of handle.
This is already part of meta data.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 20 Dec 2017 12:15:47 +0000 (04:15 -0800)]
Make Initialize private in drmbuffer.
This is not expected to be used by anyone else.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 20 Dec 2017 10:14:33 +0000 (02:14 -0800)]
No need to clear surface when rect is updated.
As we now keep proper track of damage, display, src
rects we can avoid this completely.
Jira: None.
Test: No regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 20 Dec 2017 09:13:46 +0000 (01:13 -0800)]
Partial revert of SufaceDamage.
Sliders, Progress bar where not getting updated correctly.
For some reason, the damage area is always constant in these
cases. For now, we only consider when surface damage is zero,
otherwise fall back to display frame rect always.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 20 Dec 2017 01:56:34 +0000 (17:56 -0800)]
Always use source crop to set viewport.
Jira: None.
Test: Popups are positioned correctly.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 20 Dec 2017 01:41:34 +0000 (17:41 -0800)]
Remove vasurface.
This is just a dummy class doing nothing. Instead just use
NativeSurface.
Jira: None.
Test: Build compiles on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Wed, 20 Dec 2017 00:39:51 +0000 (16:39 -0800)]
Unify resource tracking for Media and 3D buffers.
We want to make sure we re-use caching, resource management
for all backends. We didn't take this into use for va backend.
This patchs adds the needed support for this.
Jira: None.
Test: Video continues to work as now.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Tue, 19 Dec 2017 09:54:29 +0000 (01:54 -0800)]
Ensure we release all surfaces.
When doing full validation, we don't mark current on-screen
surface as not in use. This is not tracked after the validation
and state is never set again for this surface to be re-cycled.
Let's make sure we track these surfaces and recycle them.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Tue, 19 Dec 2017 08:03:56 +0000 (00:03 -0800)]
No need to handle VideoEffect state in PlaneManager.
Now, we have an helper function in Queue which can handle
this, let's use it.
Jira: None.
Test: Video plays as now on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Tue, 19 Dec 2017 03:20:23 +0000 (19:20 -0800)]
Remove Composition state in displayplanestate.
We are now having too many combinations and will get bit more
complicated when we start adding under/over scaling support
completely. Let's hide all this different combination complexity
in DisplayPlaneState and add API to query if offscreen composition
is needed for displayplane.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Mon, 18 Dec 2017 23:41:07 +0000 (15:41 -0800)]
Add a common function to reset queue state.
We have bunch of state which needs to be re-initialized everytime
queue is re started. We where now doing this in Exit and Initialize
call. Instead let's have a helper function do this.
Jira: None.
Test: No new regressions in Linux tests and Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 17 Dec 2017 21:50:20 +0000 (13:50 -0800)]
Ensure video effect status change doesn't trigger full validation.
In this case we only need to make sure all Video layers are
gpu rendered. We can avoid a full validation if we are not
already doing it for any other reason.
Jira: None.
Test: Video works as now.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Mon, 18 Dec 2017 11:58:00 +0000 (03:58 -0800)]
UpdateCaps & Param only when they have really changed.
Jira: None.
Test: No new regressions when playing Video.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Fri, 15 Dec 2017 23:23:12 +0000 (15:23 -0800)]
Recycle vasurface.
This will be similar to what we do with 3D Backend. One vasurface
which backs up the native surface.
Jira: None.
Test: No new regressions with Video on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Mon, 18 Dec 2017 05:35:50 +0000 (21:35 -0800)]
Clip Viewport to DisplayFrame bounds when not using Scalar.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Mon, 18 Dec 2017 03:02:50 +0000 (19:02 -0800)]
Ensure we flip surfaces when source rect has changed.
Jira: None.
Test: No flicker seen with layers using scalars.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Mon, 18 Dec 2017 01:44:30 +0000 (17:44 -0800)]
No need to pass clear_surface to draw call.
We already have NativeSurface pointer here which should
have all the information we need.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 17 Dec 2017 21:34:21 +0000 (13:34 -0800)]
Ensure we reset video buffer in case of layers > 1.
We always try to find a separate plane for Video. However, we
can be constrained by no of planes and in this case blend
layers for the last available plane. In this case we should
ensure we are resetting buffer to something which our
3DCompositor can write into.
Jira: None.
Test: No regressions found with cursor layer when using Logical
Display.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 17 Dec 2017 11:02:35 +0000 (03:02 -0800)]
Fix plane scaling issues with 3D backend.
We didn't track source rect properly in case the plane was
not using scalar. This caused rendering artifacts.
Jira: None.
Test: Don't see content scaled incorrectly in home screen.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 17 Dec 2017 09:32:36 +0000 (01:32 -0800)]
Simplify cursor layer tracking in DisplayQueue.
Jira: None.
Test: We dont re-validate layers when cursor layer is added
or removed on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 17 Dec 2017 06:21:14 +0000 (22:21 -0800)]
Remove HasLayerAttributesChanged in Overlaylayer.
This is not used anymore.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 17 Dec 2017 06:13:49 +0000 (22:13 -0800)]
Revalidate layers when rects change and using scalar.
When using plane scalar, we need to ensure when either
display frame or source rect change the commit can still pass.
Instead of doing full validation, we first do a test commit to
check if the combination is still valid. If the test commit
fails than we fall back to full validation of layers.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 17 Dec 2017 04:26:28 +0000 (20:26 -0800)]
Take DisplayScalar usage into account in Renderstate.
In this case we should use source rect for display frame
too.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 17 Dec 2017 02:10:27 +0000 (18:10 -0800)]
Keep track of src rect.
We need this information to determine when we need to
do a test commit in case we are using plane scalars for
scaling content of a layer.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 17 Dec 2017 00:54:47 +0000 (16:54 -0800)]
Add support to copy common displayplanestates between frames.
We now need to copy source rect, display frame, cursor state,
plane scalar state. Let's have a handy function which can do all
this rather than manually setting them in Display Queue.
Jira: None.
Test: No new regressions in Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sat, 16 Dec 2017 23:57:56 +0000 (15:57 -0800)]
Add support for using PlaneScalar for Video.
We can fall back to use our compositor for video layer
for various reasons i.e. Not supported format, video effects
etc. In this case if display frame and source crop are not
same, we scale it today using our Compositor. This patch
adds support to use Plane Scalars as much as possible(when upscaling)
and fall back to current solution in case Display cannot
support it or we need to downscale.
Jira: None.
Test: Check that Video layer is scaled when playing full screen
and source rect is smaller than display resolution.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Xiaosong Wei [Wed, 20 Dec 2017 07:40:28 +0000 (15:40 +0800)]
Fix float value read/write in IControls
Fix the float value read/write in Parcel for IControls
Jira: None
Test: SetColorParam works as expected.
Change-Id: I94625eccc2d001b0ff5d4fe237df7f4f46e8f273
Tracked-On:
Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com>
Xiaosong Wei [Fri, 15 Dec 2017 07:37:19 +0000 (15:37 +0800)]
Don't create VA context for each drawing
vaCreateContext takes long time to initialize video driver
so we don't create the context in each drawing.
Jira: OAM-54014
Test: Build passes on both Android & Linux and video playback works
Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com>
Kalyan Kondapally [Sat, 16 Dec 2017 04:02:33 +0000 (20:02 -0800)]
No need to copy rects.
We are not changing the rect in any way here.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sat, 16 Dec 2017 03:32:15 +0000 (19:32 -0800)]
Fix error code in RegisterCallback.
If it's not a valid callback registration, we should
return HWC2::Error::BadParameter.
Jira: None.
Test: Related tests in frameworks/native/services/surfaceflinger/tests/hwc2 should pass.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Wang,Fei [Tue, 12 Dec 2017 02:13:21 +0000 (10:13 +0800)]
Add color balance(Hue, Saturation, Brightness, Contrast) adjustment on VA module.
Jira: None.
Test: Build passes on Linux and Android.
Signed-off-by: Wang,Fei <fei.w.wang@intel.com>
Pallavi G [Fri, 15 Dec 2017 06:19:17 +0000 (11:49 +0530)]
Fix for external display hot plug/unplug
with current code the nested display is also having the display id of 0
and we are wrongly notifying the plug/unplug of the external display to
the primary display.
Looke like the nested display support is not completed,
So just moved the nested display hotplug notification under the
NESTED_DISPLAY_SUPPORT flag which is not defined
Jira: None
Test: External display Hot plug and unplug works fine
Signed-off-by: Pallavi G <pallavi.g@intel.com>
Kalyan Kondapally [Mon, 11 Dec 2017 04:06:28 +0000 (20:06 -0800)]
Ensure we release all virtual display resources.
We didn't purge resources when destroying the display.
Jira: None.
Test: No new regressions for Virtual Display on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Mon, 11 Dec 2017 02:09:00 +0000 (18:09 -0800)]
Enable SurfaceDamage.
With most of the display frame, scissor rect bugs fixed, let's
enable this support.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 10 Dec 2017 12:26:56 +0000 (04:26 -0800)]
Fix Linux build.
Jira: None.
Test: Build passes on Linux.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 10 Dec 2017 12:02:00 +0000 (04:02 -0800)]
Allow to create FB with preferred format.
On primary plane, we sometimes fallback to use XRGB format if
ARGB is not supported. As we cache buffers now, we check if fb is
present and if so ignore the request. In this case we should
delete existing fb and create a new one.
Jira: None.
Test: All hwc-val tests pass on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 10 Dec 2017 10:18:01 +0000 (02:18 -0800)]
Call ReleaseGraphicsBuffer only for imported handles.
This is the only time when we have valid GEM handles.
Jira: None.
Test: Ensure app open/close doesn't show memory leak on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 10 Dec 2017 10:11:25 +0000 (02:11 -0800)]
Remove redundant code.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 10 Dec 2017 09:26:25 +0000 (01:26 -0800)]
Use Gralloc 1.0 API directly.
Instead of using GrallocMapper API, let's use Gralloc
API directly. This is needed to set modifiers in future.
Jira: None.
Test: No new regressions on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 10 Dec 2017 08:08:08 +0000 (00:08 -0800)]
Use ResourceManager to release Virtual display resources.
Similar to other resources, let's use ResourceManager to
handle this.
Jira: None.
Test: Virtual Display still works on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 10 Dec 2017 03:28:09 +0000 (19:28 -0800)]
Don't try to check for GPU resources if we dont have one.
We now check if we have valid GPU resources to release
before trying to delete them in CompositorThread. This avoids
the need to initialize gl context if not needed.
Jira: None.
Test: Boots to home screen on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
Kalyan Kondapally [Sun, 10 Dec 2017 03:02:34 +0000 (19:02 -0800)]
Fix build when RESOURCE_CACHE_TRACING is enabled.
Jira: None.
Test: Build passes on Android.
Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>