959719 - Add support for HWC_BLIT composition in HwcComposer2D.

Status: RESOLVED FIXED

(Firefox OS Graveyard :: General, defect, P2)

Description

[Sushil]

Attachment: Add support for HWC_BLIT composition in HwcComposer2D.

HWC_BLIT composition type has been added to inform framework to flip FrameBuffer target and pass updated FB handle and acquireFenceFd in hwc set because composition will happen on FB layer (backbuffer of FrameBuffer). I have attached the patch for review.

Previously, intermediate render buffers were used in HAL for BLIT composition. So usage of such intermediate buffers is not required if correct composition type (HWC_BLIT) is being set on HWC layers by HAL.

Comment 1

[Diego Wilson [:diego]]

Comment on attachment 8359911 [details] [diff] [review]
Add support for HWC_BLIT composition in HwcComposer2D.

Review of attachment 8359911 [details] [diff] [review]:
-----------------------------------------------------------------

LGTM overall, just one nit.

::: widget/gonk/HwcComposer2D.cpp
@@ +501,5 @@
> +                case HWC_FRAMEBUFFER:
> +                    gpuComposite = true;
> +                    break;
> +                case HWC_BLIT:
> +                    hwcComposite = true;

Reusing hwcComposite is a little confusing to me. Can we have a separete blitComposite var instead?

Comment 2

[Sushil]

Attachment: Add support for HWC_BLIT composition in HwcComposer2D.

Addressed the review comment.

Comment 3

[Sushil]

Attachment: Bug 959719 - Add support for HWC_BLIT composition in HwcComposer2D. r=dwilson

Uploaded HG friendly version of reviewed patch.

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/b2g-inbound/rev/bcf74bd6c78f

Comment 5

[Ryan VanderMeulen [:RyanVM]]

Backed out for JB bustage.
https://hg.mozilla.org/integration/b2g-inbound/rev/360f73f60d5d

https://tbpl.mozilla.org/php/getParsedLog.php?id=33038778&tree=B2g-Inbound
https://tbpl.mozilla.org/php/getParsedLog.php?id=33037187&tree=B2g-Inbound

Comment 6

[Diego Wilson [:diego]]

Sushil,

Looks like HWC_BLIT is not defined in AOSP. I think all you'll have to define it locally.

Comment 8

[Michael Vines [:m1] [:evilmachines]]

Shud've used try first 'eh.

Comment 9

[Sushil]

Defining it locally will fix it in Gecko framework only. We need to define it in HAL as well until it lands upstream in AOSP HWC header. So we need to maintain HAL patch as well. Please let me know if it sounds good otherwise we need to keep this bug on hold until HWC_BLIT definition lands upstream.

Comment 10

[Diego Wilson [:diego]]

(In reply to Sushil from comment #9)
> Defining it locally will fix it in Gecko framework only. We need to define
> it in HAL as well until it lands upstream in AOSP HWC header. So we need to
> maintain HAL patch as well. Please let me know if it sounds good otherwise
> we need to keep this bug on hold until HWC_BLIT definition lands upstream.

If it's not already defined in the HAL that means the target does not use HWC_BLIT, right? So it should be safe to land this patch with HWC_BLIT defined locally until it lands on AOSP, if it lands at all.

Comment 11

[Sushil]

Attachment: Add support for HWC_BLIT composition in HwcComposer2D.

1. Tested compilation and functionality with an HWC header without HWC_BLIT.
2. Also tested compilation and functionality by removing HWC_BLIT support from HAL to make sure it takes full OVERLAY composition path in HwcComposer2D like before.

Comment 12

[Diego Wilson [:diego]]

LGTM. Let me see if I can push it to the try server before we request another checkin.

Comment 13

[Diego Wilson [:diego]]

Having trouble pushing to try. See bug 817631. Let's wait to see if I get it. If it takes longer than I day we can just go ahead and try landing it again.

Comment 14

[Diego Wilson [:diego]]

Pushed to try server: https://tbpl.mozilla.org/?tree=Try&rev=8d6081045676

Comment 15

[Diego Wilson [:diego]]

Comment on attachment 8360613 [details] [diff] [review]
Add support for HWC_BLIT composition in HwcComposer2D.

Review of attachment 8360613 [details] [diff] [review]:
-----------------------------------------------------------------

Try build looks good

Comment 16

[Sushil]

Attachment: Add support for HWC_BLIT composition in HwcComposer2D. r=dwilson

Uploaded HG friendly version of reviewed patch.

Comment 17

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/b2g-inbound/rev/dce75e24fefc

Comment 18

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/dce75e24fefc

Comment 19

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/8d2d7087d6ad