fb/gk20a: fix setting of large page size bit
PATCH 1/1 fb/gk20a: fix setting of large page size bit
Commit "ltc/gf100-: fix cbc issues on certain boards" moved the setting of the large page size bit from bar/nvc0 to fb/nvc0. GK20A uses its own FB device and the change was thus not applied to it - fix this.
--- nvkm/subdev/fb/gk20a.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
nvkm/subdev/fb/gk20a.c +15 -1
@@ -27,6 +27,20 @@ struct gk20a_fb_priv { };static int +gk20a_fb_init (struct nouveau_object *object) +{ +struct gk20a_fb_priv *priv = (void *)object; +int ret; + + ret =nouveau_fb_init (&priv->base); +if (ret) +return ret; + +nv_mask (priv,0x100c80 ,0x00000001 ,0x00000000 );/* 128KiB lpg */ +return 0 ; +} + +static int gk20a_fb_ctor (struct nouveau_object *parent,struct nouveau_object *engine,struct nouveau_oclass *oclass,void *data,u32 size,struct nouveau_object **pobject)
@@ -48,7 +62,7 @@ gk20a_fb_oclass = &(struct nouveau_fb_impl) { .base.ofuncs = &(struct nouveau_ofuncs) { .ctor = gk20a_fb_ctor, .dtor = _nouveau_fb_dtor, - .init = _nouveau_fb_init, + .init = gk20a_fb_init, .fini = _nouveau_fb_fini, }, .memtype = nvc0_fb_memtype_valid,
Signature · 6 lines
2.1.3 _______________________________________________ Nouveau mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/nouveau
A message that is not in the archive (sent off-list or not yet received): 1415769598-13516-1-git-send-email-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org
Quoted 3 lines · Alexandre Courbot
Commit "ltc/gf100-: fix cbc issues on certain boards" moved the setting of the large page size bit from bar/nvc0 to fb/nvc0. GK20A uses its own FB device and the change was thus not applied to it - fix this.
Oops, my apologies. Also another reminder of how I need to finish some work to get rid of so much glue :P
Anyways, I've merged the patch and sent it for 3.18-fixes also.
Thanks Alex,
Ben.
Quoted 43 lines
Signed-off-by Alexandre Courbot <[email protected]>--- nvkm/subdev/fb/gk20a.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)nvkm/subdev/fb/gk20a.c +15
-2@@ -27,6 +27,20 @@ struct gk20a_fb_priv { };static int +gk20a_fb_init (struct nouveau_object *object) +{ +struct gk20a_fb_priv *priv = (void *)object; +int ret; + + ret =nouveau_fb_init (&priv->base); +if (ret) +return ret; + +nv_mask (priv,0x100c80 ,0x00000001 ,0x00000000 );/* 128KiB lpg */ +return 0 ; +} + +static int gk20a_fb_ctor (struct nouveau_object *parent,struct nouveau_object *engine,struct nouveau_oclass *oclass,void *data,u32 size,struct nouveau_object **pobject)@@ -48,7 +62,7 @@ gk20a_fb_oclass = &(struct nouveau_fb_impl) { .base.ofuncs = &(struct nouveau_ofuncs) { .ctor = gk20a_fb_ctor, .dtor = _nouveau_fb_dtor, - .init = _nouveau_fb_init, + .init = gk20a_fb_init, .fini = _nouveau_fb_fini, }, .memtype = nvc0_fb_memtype_valid, --2.1.3
Quoted 4 lines
_______________________________________________
Nouveau mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau
_______________________________________________
Nouveau mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau