Skip to content
This repository was archived by the owner on Jan 7, 2023. It is now read-only.

Mesa#138

Merged
feijiang1 merged 3 commits into
intel:masterfrom
kanlihu:mesa
Dec 18, 2019
Merged

Mesa#138
feijiang1 merged 3 commits into
intel:masterfrom
kanlihu:mesa

Conversation

@kanlihu

@kanlihu kanlihu commented Dec 18, 2019

Copy link
Copy Markdown
Contributor

mesa: don't forget to clear _Layer field on texture unit

On the Android Antutu benchmark we ran into an assert in ISL where the
(base layer + num layers) > total layers. It turns out the core of
mesa forgot to clear the _Layer variable, potentially leaving an
inconsistent value.

enable GLX_USE_TLS on android

On the Android deqp test when we run
dEQP-EGL.functional.sharing.gles2.multithread.random.textures.gen_delete.15
we will find two thread using one context. It will case gpu hang.

draw 2 prims in GL_PATCH mode.

antutu 7.3 benchmark test will cause gpu hang
when I draw 2 prims in one glDrawElements command, The gpu hang won't be reproduced.

On the Android Antutu benchmark we ran into an assert in ISL where the
(base layer + num layers) > total layers. It turns out the core of
mesa forgot to clear the _Layer variable, potentially leaving an
inconsistent value.

v2: Pull setting u->_Layer out of the conditional blocks (Jason)
Signed-off-by: Lionel Landwerlin's avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Jason Ekstrand's avatarJason Ekstrand <jason@jlekstrand.net>

https://gitlab.freedesktop.org/mesa/mesa/commit/2208d79ddeebd1673f477611d508566ef82bd7c0
On the Android deqp test when we run
dEQP-EGL.functional.sharing.gles2.multithread.random.textures.gen_delete.15
we will find two thread using one context. It will case gpu hang.
antutu 7.3 benchmark test will cause gpu hang
when I draw 2 prims in one glDrawElements command, The gpu hang won't be reproduced.

@sysopenci sysopenci left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Autobuild started from pull-request-changes on this PR.

FAILURE: CheckBug Bad comments/Bugs

For more information, see: /absp/builders/celadon-autobuild/builds/1481

@tpalli

tpalli commented Dec 18, 2019

Copy link
Copy Markdown
Contributor

The commit message in the "mesa: don't forget to clear _Layer field on texture unit" patch does not match upstream patch, something has went wrong there.

@feijiang1
feijiang1 merged commit 74ae967 into intel:master Dec 18, 2019
@tpalli

tpalli commented Dec 20, 2019

Copy link
Copy Markdown
Contributor

@feijiang1 Did you spot my comment? The commit message on first patch is invalid, see following lines:

Signed-off-by: Lionel Landwerlin's avatarLionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Jason Ekstrand's avatarJason Ekstrand <jason@jlekstrand.net>

Please do not copy-paste or handwrite patches. You can use git format-patch or save the patches from gitlab instead.

@renchenglei

Copy link
Copy Markdown
Contributor

So sorry, I also break the rule with my previous PR #139.
Recently, we have a urgent integration to celadon. Once it is done, we will consider a new round of mesa rebase from upstream, which the mesa version is 19.3.x now. Then we will scrub all of Android specific patch. Reorganize the commit info(e.g add [INTERNAL] to title; rewrite reviewer :) )

@feijiang1

Copy link
Copy Markdown
Contributor

@tpalli sorry, I didn't notice your comments when merge the patch, we will pay attention for that. As Chenglei's said, we will do a new round of mesa rebase, it will be fixed that time.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants