[Mesa-dev] [PATCH1/2] radeonsi: add support for Mullins asics.

[Tom Stellard]

On Thu, May 01, 2014 at 01:27:58PM -0400, Samuel Li wrote:
> v2: name defaults to kabini for older llvm
> 
> Signed-off-by: Samuel Li <samuel.li at amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Leo Liu <leo.liu at amd.com>
> Reviewed-by: Marek Olšák <marek.olsak at amd.com>
> 
> ---
>  src/gallium/drivers/radeon/r600_pipe_common.c     | 7 +++++++
>  src/gallium/drivers/radeonsi/si_state.c           | 2 ++
>  src/gallium/winsys/radeon/drm/radeon_drm_winsys.c | 1 +
>  src/gallium/winsys/radeon/drm/radeon_winsys.h     | 1 +
>  4 files changed, 11 insertions(+)
> 
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
> index 7508865..607521d 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
> @@ -293,6 +293,7 @@ static const char* r600_get_name(struct pipe_screen* pscreen)
>  	case CHIP_KAVERI: return "AMD KAVERI";
>  	case CHIP_KABINI: return "AMD KABINI";
>  	case CHIP_HAWAII: return "AMD HAWAII";
> +	case CHIP_MULLINS: return "AMD MULLINS";
>  	default: return "AMD unknown";
>  	}
>  }
> @@ -410,6 +411,12 @@ const char *r600_get_llvm_processor_name(enum radeon_family family)
>  	case CHIP_KABINI: return "kabini";
>  	case CHIP_KAVERI: return "kaveri";
>  	case CHIP_HAWAII: return "hawaii";
> +	case CHIP_MULLINS:
> +#if HAVE_LLVM >= 0x305

The convention is to leave the leading zero when specifying LLVM version e.g:

#if HAVE_LLVM >= 0x0305

With that fixed:

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

> +		return "mullins";
> +#else
> +		return "kabini";
> +#endif
>  	default: return "";
>  #endif
>  	}
> diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
> index 80f54e2..6d5408b 100644
> --- a/src/gallium/drivers/radeonsi/si_state.c
> +++ b/src/gallium/drivers/radeonsi/si_state.c
> @@ -3101,6 +3101,8 @@ void si_init_config(struct si_context *sctx)
>  			/* XXX todo */
>  		case CHIP_KABINI:
>  			/* XXX todo */
> +		case CHIP_MULLINS:
> +			/* XXX todo */
>  		default:
>  			si_pm4_set_reg(pm4, R_028350_PA_SC_RASTER_CONFIG, 0x00000000);
>  			si_pm4_set_reg(pm4, R_028354_PA_SC_RASTER_CONFIG_1, 0x00000000);
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> index b53beba..ca34359 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> @@ -276,6 +276,7 @@ static boolean do_winsys_init(struct radeon_drm_winsys *ws)
>      case CHIP_KAVERI:
>      case CHIP_KABINI:
>      case CHIP_HAWAII:
> +    case CHIP_MULLINS:
>          ws->info.chip_class = CIK;
>          break;
>      }
> diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h
> index fe0617b..1c0c825 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h
> +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h
> @@ -130,6 +130,7 @@ enum radeon_family {
>      CHIP_KAVERI,
>      CHIP_KABINI,
>      CHIP_HAWAII,
> +    CHIP_MULLINS,
>      CHIP_LAST,
>  };
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev