diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-04-05 12:16:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-05 12:16:55 -0700 |
| commit | b8d554f7cb26611c26ae257d995d85c00c725612 (patch) | |
| tree | e599a4058af4edd14d54912508c31e23b35d6629 | |
| parent | c5751be200944a09b816a30e5ef698f41e0cfc0f (diff) | |
| parent | 341934ba388badf55d561cf0b78b7a6877b77247 (diff) | |
Merge "msm: kgsl: Use legacy PM4 check instead of adreno version"
| -rw-r--r-- | drivers/gpu/msm/adreno_ringbuffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/msm/adreno_ringbuffer.c b/drivers/gpu/msm/adreno_ringbuffer.c index 161b718b8a38..d79d9613043f 100644 --- a/drivers/gpu/msm/adreno_ringbuffer.c +++ b/drivers/gpu/msm/adreno_ringbuffer.c @@ -813,10 +813,10 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, dwords += 6; /* - * REG_TO_MEM packet on A5xx needs another ordinal. + * REG_TO_MEM packet on A5xx and above needs another ordinal. * Add 2 more dwords since we do profiling before and after. */ - if (adreno_is_a5xx(adreno_dev)) + if (!ADRENO_LEGACY_PM4(adreno_dev)) dwords += 2; /* @@ -833,7 +833,7 @@ int adreno_ringbuffer_submitcmd(struct adreno_device *adreno_dev, if (test_bit(CMDOBJ_PROFILE, &cmdobj->priv)) { kernel_profiling = true; dwords += 6; - if (adreno_is_a5xx(adreno_dev)) + if (!ADRENO_LEGACY_PM4(adreno_dev)) dwords += 2; } |