[Intel-gfx] [PATCH] Update generation checks to provide basic support for Ivybridge.

[Ben Widawsky]

On 02/08/2012 09:05 PM, Kenneth Graunke wrote:
> There may be some updates required, but assuming Ivybridge is similar to
> Sandybridge is a decent start; previously it fell through to the Gen2/3
> case and nothing worked.

I didn't think anyone actually used this register map... so I never
bothered to update it myself :-).

For the record, I bet if I did this someone would yell at me that this
should be two patches, since you also moved to the new intel_gen stuff.
But you're definitely cooler than me.

> 
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ben Widawsky <ben at bwidawsk.net>

> ---
>  lib/intel_reg_map.c |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/intel_reg_map.c b/lib/intel_reg_map.c
> index 86cf9a6..0c8d49c 100644
> --- a/lib/intel_reg_map.c
> +++ b/lib/intel_reg_map.c
> @@ -128,14 +128,15 @@ struct intel_register_map
>  intel_get_register_map(uint32_t devid)
>  {
>  	struct intel_register_map map;
> +	const int gen = intel_gen(devid);
>  
> -	if (IS_GEN6(devid)) {
> +	if (gen >= 6) {
>  		map.map = gen6_gt_register_map;
>  		map.top = 0x180000;
>  	} else if (IS_BROADWATER(devid) || IS_CRESTLINE(devid)) {
>  		map.map = gen_bwcl_register_map;
>  		map.top = 0x80000;
> -	} else if (IS_GEN4(devid) || IS_GEN5(devid)) {
> +	} else if (gen >= 4) {
>  		map.map = gen4_register_map;
>  		map.top = 0x80000;
>  	} else {