[PATCH i-g-t 01/12] lib/rendercopy: Add deltas to all surface relocs

[Ville Syrjälä]

On Fri, Dec 22, 2023 at 08:06:32AM +0200, Ville Syrjälä wrote:
> On Fri, Dec 22, 2023 at 08:01:03AM +0200, Ville Syrjälä wrote:
> > On Fri, Dec 22, 2023 at 06:37:31AM +0100, Zbigniew Kempczyński wrote:
> > > On Wed, Dec 20, 2023 at 07:59:23PM +0200, Ville Syrjala wrote:
> > > > From: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > > 
> > > > In order to copy stuff not at offset 0 in the BO we need
> > > > to include the delta in the relocs/etc.
> > > > 
> > > > Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> > > > ---
> > > >  lib/rendercopy_gen4.c |  9 +++++----
> > > >  lib/rendercopy_gen6.c |  9 +++++----
> > > >  lib/rendercopy_gen7.c |  9 +++++----
> > > >  lib/rendercopy_gen8.c |  9 +++++----
> > > >  lib/rendercopy_gen9.c | 13 +++++++------
> > > >  lib/rendercopy_i830.c | 10 +++++++---
> > > >  lib/rendercopy_i915.c |  6 ++++--
> > > >  7 files changed, 38 insertions(+), 27 deletions(-)
> > > > 
> > > > diff --git a/lib/rendercopy_gen4.c b/lib/rendercopy_gen4.c
> > > > index 8536d6b632c5..d10e5b7780c0 100644
> > > > --- a/lib/rendercopy_gen4.c
> > > > +++ b/lib/rendercopy_gen4.c
> > > > @@ -148,10 +148,11 @@ gen4_bind_buf(struct intel_bb *ibb, const struct intel_buf *buf, int is_dst)
> > > >  	ss->ss0.data_return_format = SURFACERETURNFORMAT_FLOAT32;
> > > >  	ss->ss0.color_blend = 1;
> > > >  
> > > > -	address = intel_bb_offset_reloc(ibb, buf->handle,
> > > > -					read_domain, write_domain,
> > > > -					intel_bb_offset(ibb) + 4,
> > > > -					buf->addr.offset);
> > > > +	address = intel_bb_offset_reloc_with_delta(ibb, buf->handle,
> > > > +						   read_domain, write_domain,
> > > > +						   buf->surface[0].offset,
> > > > +						   intel_bb_offset(ibb) + 4,
> > > > +						   buf->addr.offset);
> > > >  	ss->ss1.base_addr = (uint32_t) address;
> > > 
> > > I've just took a look to intel_bb_add_reloc() because I didn't
> > > remember all details and I see address returned there is offset
> > > at which object will be binded, not offset + delta.
> > > Until this patch only users of this function reside in
> > > rendercopy_gen9.c so for older platforms it doesn't matter
> > > (xe driver doesn't support them).
> > > 
> > > Anyway, delta addition sets up 10-bit if buf->cc.offset is not zero.
> > > I mean:
> > > 
> > > address = intel_bb_offset_reloc_with_delta(ibb, buf->handle,
> > > 					   read_domain, write_domain,
> > > 					   (buf->cc.offset ? (1 << 10) : 0)
> > > 					   | buf->ccs[0].offset,
> > > 					   intel_bb_offset(ibb) + 4 * 10,
> > > 					   buf->addr.offset);
> > > ss->ss10.aux_base_addr = (address + buf->ccs[0].offset) >> 12;
> > > ss->ss11.aux_base_addr_hi = (address + buf->ccs[0].offset) >> 32;
> > > 
> > > I wonder shouldn't intel_bb_add_reloc() return offset + delta.
> > > 
> > > I also have some doubts regarding:
> > > 
> > > 	(buf->cc.offset ? (1 << 10) : 0) | buf->ccs[0].offset
> > > 
> > > This will set up bit-10 (if I'm not wrong clearvalue enable) only
> > > when relocation will happen. Without relocation or on softpinning
> > > this bit is never set.
> > > 
> > > Above also would require remove delta in __intel_bb_emit_reloc()
> > > but if I'm not wrong this would be enough to start directly using
> > > offset returned in intel_bb_add_reloc() derivatives.
> > > 
> > > Have I missed something?
> > 
> > No, I think you're right. The lack of the cc enable bit diretly
> > written to ss10 would seem to be wrong for the no-reloc case.
> > Also the >>12 there looks wrong. And the >>6 in the ss12 clear
> > color address looks wrong (and the reloc case should again
> > get fixed up by the kernel).
> 
> Actually no, the extra shift are correct due to the bitfields.
> But yeah clear color enable was missing for the no-reloc case.
> But that doesn't help either. And I just realized that I'm actually
> testing a modifier w/o CC anyway so the problem must be elsewhere.

OK, the problem seems to be that somehow the hardware thinks the
initial state of the AUX surface is compressed. So any part of the
FB I don't explicitly touch is left with interesting rainbow colors
when the zeroed main surface data is treated as compressed.
Did the AUX format change such that all zeroes in AUX is no 
longer uncompressed?

-- 
Ville Syrjälä
Intel