[igt-dev] [PATCH i-g-t v2 1/1] lib: Let gen7/gen8 inherit gen4_render.h

[Kamil Konieczny]

Hi Christoph,

On 2023-06-13 at 11:44:55 +0200, Christoph Manszewski wrote:
> Currently 'PIPELINE_SELECT_3D' macros are redifined. This can lead to
> compiler warnings when including headers containing those redifinitions.
> Instead of redefining pipe selects, inherit them from gen4_render.h
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>
> Signed-off-by: Christoph Manszewski <christoph.manszewski at intel.com>

Lgtm,
Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>

> ---
>  lib/gen7_media.h | 2 +-
>  lib/gen8_media.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/gen7_media.h b/lib/gen7_media.h
> index b5e49cae..93dc7312 100644
> --- a/lib/gen7_media.h
> +++ b/lib/gen7_media.h
> @@ -3,6 +3,7 @@
>  
>  #include <stdint.h>
>  #include "surfaceformat.h"
> +#include "gen4_render.h"
>  
>  #define GEN7_FLOATING_POINT_IEEE_754		0
>  #define GEN7_FLOATING_POINT_NON_IEEE_754	1
> @@ -13,7 +14,6 @@
>  						((Subopcode) << 16))
>  
>  #define GEN7_PIPELINE_SELECT			GFXPIPE(1, 1, 4)
> -# define PIPELINE_SELECT_3D			(0 << 0)
>  # define PIPELINE_SELECT_GPGPU			(2 << 0)
>  
>  #define GEN7_STATE_BASE_ADDRESS			GFXPIPE(0, 1, 1)
> diff --git a/lib/gen8_media.h b/lib/gen8_media.h
> index b5c19e50..07ea2ac0 100644
> --- a/lib/gen8_media.h
> +++ b/lib/gen8_media.h
> @@ -3,6 +3,7 @@
>  
>  #include <stdint.h>
>  #include "surfaceformat.h"
> +#include "gen4_render.h"
>  
>  #define GEN8_FLOATING_POINT_IEEE_754		0
>  #define GEN8_FLOATING_POINT_NON_IEEE_754	1
> @@ -13,7 +14,6 @@
>  						((Subopcode) << 16))
>  
>  #define GEN8_PIPELINE_SELECT			GFXPIPE(1, 1, 4)
> -# define PIPELINE_SELECT_3D			(0 << 0)
>  
>  #define GEN8_STATE_BASE_ADDRESS			GFXPIPE(0, 1, 1)
>  
> -- 
> 2.40.1
>