[Nouveau] [PATCH 3/3] drm/nv31/mpeg: don't recognize nv3x cards as having nv44 graph class

[Emil Velikov]

On 30/07/13 00:05, Ilia Mirkin wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>  drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
> index 9f7c7d5..c190043 100644
> --- a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
> +++ b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
> @@ -284,7 +284,10 @@ nv31_mpeg_init(struct nouveau_object *object)
>  	/* PMPEG init */
>  	nv_wr32(priv, 0x00b32c, 0x00000000);
>  	nv_wr32(priv, 0x00b314, 0x00000100);
> -	nv_wr32(priv, 0x00b220, nv44_graph_class(priv) ? 0x00000044 : 0x00000031);
> +	if (nv_device(priv)->chipset >= 0x40 && nv44_graph_class(priv))
> +		nv_wr32(priv, 0x00b220, 0x00000044);
> +	else
> +		nv_wr32(priv, 0x00b220, 0x00000031);
Might be a nitpicking too much, but I believe the check makes more sense
inside nv44_graph_class(), despite that this is the only nv3x context
that uses it

Emil
>  	nv_wr32(priv, 0x00b300, 0x02001ec1);
>  	nv_mask(priv, 0x00b32c, 0x00000001, 0x00000001);
>  
>