[7.1.r1] drm/msm/sde: sde_hw_top: Fix UBWC version detection for SDM630#2356
Draft
konradybcio wants to merge 1 commit intosonyxperiadev:aosp/LA.UM.7.1.r1from
Draft
[7.1.r1] drm/msm/sde: sde_hw_top: Fix UBWC version detection for SDM630#2356konradybcio wants to merge 1 commit intosonyxperiadev:aosp/LA.UM.7.1.r1from
konradybcio wants to merge 1 commit intosonyxperiadev:aosp/LA.UM.7.1.r1from
Conversation
SDM630 (and by extension 636/660 and probably 8998) don't seem to have a working UBWC version register, but the UBWC version is already specified in the DT and then read out by SDE, so let's make use of that instead. Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
pablomh
reviewed
Dec 14, 2020
| c.blk_off = 0x0; | ||
| ubwc_version = SDE_REG_READ(&c, UBWC_DEC_HW_VERSION); | ||
| /* 630 doesn't seem to have the UBWC version register */ | ||
| //ubwc_version = SDE_REG_READ(&c, UBWC_DEC_HW_VERSION); |
There was a problem hiding this comment.
Please, remove the line instead of commenting it.
Contributor
Author
There was a problem hiding this comment.
I thought keeping it for reference is okay, newer platforms have this feature.
Contributor
There was a problem hiding this comment.
I think this is WIP code. The original below reads both the register in ubwc_version and what was stored in DT as m->ubwc_version. Seems like it's done on purpose, I doubt this is correct. @konradybcio What do they do on mainline?
There was a problem hiding this comment.
FWIW, we can see in drivers/gpu/drm/msm/sde/sde_hw_catalog.h:
* @ubwc_version UBWC feature version (0x0 for not supported)
Contributor
Author
There was a problem hiding this comment.
@MarijnS95 on mainline the version is hardcoded per platform.
1aa2204 to
838a06e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
SDM630 (and by extension 636/660 and probably 8998) don't
seem to have a working UBWC version register, but the UBWC
version is already specified in the DT and then read out
by SDE, so let's make use of that instead.
Please test on tama/kumano!
dmesg | sed 3000q | grep -i uwbcshould return nothing. In case it returns
Unsupported UBWC version 0xsomenumberplease paste the output here so that I can fix it up.