* Yongqin Liu [off-list ref] [211123 17:27]:

Hi, Neil

On Tue, 23 Nov 2021 at 20:47, Neil Armstrong [off-list ref] wrote:

quoted

Hi,

On 23/11/2021 13:17, Yongqin Liu wrote:

quoted

Hi, Neil, Tony

# sorry for the confusion if you have received the mail which I sent
before, which is not in plain text mode.

We have one out of tree change to enable the SGX544 gpu for the
beagleboard-X15 Android build,
    https://android-review.linaro.org/c/kernel/common/+/20521/11/arch/arm/boot/dts/dra7.dtsi

and that seems to conflict with this BB2D enabling change,
Could you please help give some suggestions on how we should update our patch
to make it work with BB2D, without the revert of this change?

This BB2D patch alters the target-module@59000000 while your SGX
change alters the target-module@56000000.

Please rebase your patches.

I am sorry if the "conflict" I used previously caused the confusion.
What I meant with the "conflict" word is the feature conflict, not the
patch merge conflict.

I could merge my SGX change with the BB2D change there, but then my
build could not boot successfully to the homescreen,
I need to revert the BB2D change to have it boot to the homescreen successfully.

Here are the serial console output in case you want to check:
https://pastebin.com/RY472b96  work with the BB2D change reverted
https://pastebin.com/aP97r7rJ    does not work with the BB2D change.

Not sure if you have any idea about the problem.
Please help give some suggestions on what I could try.

Sounds like your out of tree SGX patches also tinker with the BB2D module.

To me it sounds like you can just tag the new target-module@59000000 added
by this patch with status = "disabled" in your SGX patch until you have
updated the driver code.

I'm adding this patch into omap-for-v5.17/dt as for 2D acceleration there
is the etnaviv driver in the mainline kernel that should be usable to
some extent.

Regards,

Tony