On Sun, Sep 8, 2013 at 11:04 AM, Ilia Mirkin <[email protected]> wrote:
> Signed-off-by: Ilia Mirkin <[email protected]>
Series merged:
http://cgit.freedesktop.org/~darktama/nouveau/commit/?id=997d90216a8318e0a6c4de6377f63a8272f26086
Cheers,
Ben.
> ---
> drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
> b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
> index c190043..5c54aa1 100644
> --- a/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
> +++ b/drivers/gpu/drm/nouveau/core/engine/mpeg/nv31.c
> @@ -34,7 +34,6 @@
>
> #include <engine/fifo.h>
> #include <engine/mpeg.h>
> -#include <engine/graph/nv40.h>
>
> struct nv31_mpeg_priv {
> struct nouveau_mpeg base;
> @@ -284,10 +283,7 @@ nv31_mpeg_init(struct nouveau_object *object)
> /* PMPEG init */
> nv_wr32(priv, 0x00b32c, 0x00000000);
> nv_wr32(priv, 0x00b314, 0x00000100);
> - if (nv_device(priv)->chipset >= 0x40 && nv44_graph_class(priv))
> - nv_wr32(priv, 0x00b220, 0x00000044);
> - else
> - nv_wr32(priv, 0x00b220, 0x00000031);
> + nv_wr32(priv, 0x00b220, 0x00000031);
> nv_wr32(priv, 0x00b300, 0x02001ec1);
> nv_mask(priv, 0x00b32c, 0x00000001, 0x00000001);
>
> --
> 1.8.1.5
>
> _______________________________________________
> Nouveau mailing list
> [email protected]
> http://lists.freedesktop.org/mailman/listinfo/nouveau
_______________________________________________
Nouveau mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau
