[igt-dev] [PATCH i-g-t 4/5] lib/gen8_render: Cleanup of libs

[Kalamarz, Lukasz]

On Mon, 2018-06-11 at 09:58 +0200, Katarzyna Dec wrote:
> On Fri, Jun 08, 2018 at 01:38:54PM +0200, Lukasz Kalamarz wrote:
> > This patch implement
> 
> s/implement/implements
> > some changes in gen8_render header and
> > all files that include it. Renamed definition that were
> > introduced in that file to GEN8_* instead of previous names.
> 
> What did you mean by this sentence ^^^^^^?

There were some registers, that were introduced in this file with gen7
prefix, but when I checked gen7_render file, those definitions were
missing. this is why i swapped GEN7_ prefix to GEN8_ to be in sync with
 naming convention.

> > Modified include to use gen7_render header instead of gen6.
> > 
> > Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz at intel.com>
> > Cc: Katarzyna Dec <katarzyna.dec at intel.com>
> > Cc: Antonio Argenziano <antonio.argenziano at intel.com>
> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> > Cc: Ewelina Musial <ewelina.musial at intel.com>
> > ---
> >  lib/gen8_render.h                             | 74 ++++++---------
> > ------------
> >  lib/rendercopy_gen8.c                         | 22 ++++----
> >  lib/rendercopy_gen9.c                         | 22 ++++----
> >  tools/null_state_gen/intel_renderstate_gen8.c | 26 +++++-----
> >  tools/null_state_gen/intel_renderstate_gen9.c | 26 +++++-----
> >  5 files changed, 65 insertions(+), 105 deletions(-)
> > 
> > diff --git a/lib/gen8_render.h b/lib/gen8_render.h
> > index ba3f9f27..79f2f388 100644
> > --- a/lib/gen8_render.h
> > +++ b/lib/gen8_render.h
> > @@ -1,59 +1,33 @@
> >  #ifndef GEN8_RENDER_H
> >  #define GEN8_RENDER_H
> >  
> > -#include "gen6_render.h"
> > +#include "gen7_render.h"
> >  
> > -#define GEN7_3DSTATE_URB_VS (0x7830 << 16)
> > -#define GEN7_3DSTATE_URB_HS (0x7831 << 16)
> > -#define GEN7_3DSTATE_URB_DS (0x7832 << 16)
> > -#define GEN7_3DSTATE_URB_GS (0x7833 << 16)
> > +# define GEN8_WM_LEGACY_DIAMOND_LINE_RASTERIZATION	(1 <<
> > 26)
> >  
> > -# define GEN7_WM_LEGACY_DIAMOND_LINE_RASTERIZATION	(1 <<
> > 26)
> 
> If I see correctly there was so much mess in this libs previously, so
> gen7 definitions were included here as well? Right?
> Huge copy-paste in the past then...
> 

Previously this header included gen6_render.h and was missing some
registers definitions introduced by gen7. Once we fixed that, there is
no need to redefine them here.

> Kasia :)