diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-28 08:26:53 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-02-28 08:26:53 +0000 |
commit | 817dbd33324d41d76916b8d0c11cbaf2ea7c0a65 (patch) | |
tree | 8bf9daaab702c2c8703f2f172ea418fe7e46df3d | |
parent | 916132ad8943b0216b91421c97051188f02ef586 (diff) | |
parent | feda861bb4a8d792ddbd2bd00917b4f324db87c2 (diff) | |
download | hwcomposer-pie-r2-release.tar.gz |
Snap for 4625912 from feda861bb4a8d792ddbd2bd00917b4f324db87c2 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-release
Change-Id: Ib484346cff8ca194d43083c8a9c91cd03c57aa83
-rw-r--r-- | merrifield/common/planes/DisplayPlane.cpp | 6 | ||||
-rw-r--r-- | merrifield/common/planes/DisplayPlaneManager.cpp | 1 | ||||
-rw-r--r-- | merrifield/include/DisplayPlane.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/merrifield/common/planes/DisplayPlane.cpp b/merrifield/common/planes/DisplayPlane.cpp index 2a1ca51..cbab8e0 100644 --- a/merrifield/common/planes/DisplayPlane.cpp +++ b/merrifield/common/planes/DisplayPlane.cpp @@ -326,6 +326,12 @@ void DisplayPlane::invalidateBufferCache() mCurrentDataBuffer = 0; } +void DisplayPlane::resetCurrentBuffer() +{ + // reset current data buffer + mCurrentDataBuffer = 0; +} + bool DisplayPlane::assignToDevice(int disp) { RETURN_FALSE_IF_NOT_INIT(); diff --git a/merrifield/common/planes/DisplayPlaneManager.cpp b/merrifield/common/planes/DisplayPlaneManager.cpp index 1b60d93..0461ef0 100644 --- a/merrifield/common/planes/DisplayPlaneManager.cpp +++ b/merrifield/common/planes/DisplayPlaneManager.cpp @@ -269,6 +269,7 @@ void DisplayPlaneManager::reclaimPlane(int dsp, DisplayPlane& plane) } putPlane(index, mReclaimedPlanes[type]); + plane.resetCurrentBuffer(); // NOTE: don't invalidate plane's data cache here because the reclaimed // plane might be re-assigned to the same layer later diff --git a/merrifield/include/DisplayPlane.h b/merrifield/include/DisplayPlane.h index 250d485..6110152 100644 --- a/merrifield/include/DisplayPlane.h +++ b/merrifield/include/DisplayPlane.h @@ -87,7 +87,7 @@ public: // data source virtual bool setDataBuffer(buffer_handle_t handle); - + virtual void resetCurrentBuffer(); virtual void invalidateBufferCache(); // display device |