From 3a5dda18f5132555e9f6d4dfd08774a0082445e5 Mon Sep 17 00:00:00 2001 From: Alexandre Courbot Date: Wed, 12 Nov 2014 14:19:58 +0900 Subject: 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. Signed-off-by: Alexandre Courbot Signed-off-by: Ben Skeggs --- nvkm/subdev/fb/gk20a.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'nvkm') diff --git a/nvkm/subdev/fb/gk20a.c b/nvkm/subdev/fb/gk20a.c index a16024a74..fde42e4d1 100644 --- a/nvkm/subdev/fb/gk20a.c +++ b/nvkm/subdev/fb/gk20a.c @@ -26,6 +26,20 @@ struct gk20a_fb_priv { struct nouveau_fb base; }; +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, @@ -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, -- cgit v1.2.1