| Message ID | 20190816182030.1166-1-tjaalton@ubuntu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,B] UBUNTU: SAUCE: drm/i915: Partially revert d6edad3777c28ea | expand |
LGTM -- thanks for fixing this Timo. Acked-by: Kamal Mostafa <kamal@canonical.com> -Kamal On Fri, Aug 16, 2019 at 09:20:30PM +0300, Timo Aaltonen wrote: > From: Timo Aaltonen <timo.aaltonen@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1815172 > > Revert a hunk of backported commit: > d6edad3777c28ea drm/i915: Mark up GTT sizes as u64 > > ..which fixes a build warning and possibly the driver on > Sandy/Ivybridge (gen6). > > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 01ea8026d764..1f0ac050ad10 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -1666,7 +1666,7 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m) > if (!found) > continue; > > - seq_printf(m, "\t\t0x%llx [%03d,%04d]: =", va, pde, pte); > + seq_printf(m, "\t\t0x%lx [%03d,%04d]: =", va, pde, pte); > for (i = 0; i < 4; i++) { > if (pt_vaddr[pte + i] != scratch_pte) > seq_printf(m, " %08x", pt_vaddr[pte + i]); > -- > 2.20.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team
On 8/16/19 11:20 AM, Timo Aaltonen wrote: > From: Timo Aaltonen <timo.aaltonen@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1815172 > > Revert a hunk of backported commit: > d6edad3777c28ea drm/i915: Mark up GTT sizes as u64 > > ..which fixes a build warning and possibly the driver on > Sandy/Ivybridge (gen6). > > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> Acked-by: Connor Kuehl <connor.kuehl@canonical.com> > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 01ea8026d764..1f0ac050ad10 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -1666,7 +1666,7 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m) > if (!found) > continue; > > - seq_printf(m, "\t\t0x%llx [%03d,%04d]: =", va, pde, pte); > + seq_printf(m, "\t\t0x%lx [%03d,%04d]: =", va, pde, pte); > for (i = 0; i < 4; i++) { > if (pt_vaddr[pte + i] != scratch_pte) > seq_printf(m, " %08x", pt_vaddr[pte + i]); >
On 8/16/19 8:20 PM, Timo Aaltonen wrote: > From: Timo Aaltonen <timo.aaltonen@canonical.com> > > BugLink: https://bugs.launchpad.net/bugs/1815172 > > Revert a hunk of backported commit: > d6edad3777c28ea drm/i915: Mark up GTT sizes as u64 > > ..which fixes a build warning and possibly the driver on > Sandy/Ivybridge (gen6). > > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 01ea8026d764..1f0ac050ad10 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -1666,7 +1666,7 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m) > if (!found) > continue; > > - seq_printf(m, "\t\t0x%llx [%03d,%04d]: =", va, pde, pte); > + seq_printf(m, "\t\t0x%lx [%03d,%04d]: =", va, pde, pte); > for (i = 0; i < 4; i++) { > if (pt_vaddr[pte + i] != scratch_pte) > seq_printf(m, " %08x", pt_vaddr[pte + i]); > Applied to bionic/master-next branch. Thanks, Kleber
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 01ea8026d764..1f0ac050ad10 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -1666,7 +1666,7 @@ static void gen6_dump_ppgtt(struct i915_hw_ppgtt *ppgtt, struct seq_file *m) if (!found) continue; - seq_printf(m, "\t\t0x%llx [%03d,%04d]: =", va, pde, pte); + seq_printf(m, "\t\t0x%lx [%03d,%04d]: =", va, pde, pte); for (i = 0; i < 4; i++) { if (pt_vaddr[pte + i] != scratch_pte) seq_printf(m, " %08x", pt_vaddr[pte + i]);