Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2c19870 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ben Skeggs
Browse files

drm/gk20a/fb: 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: default avatarAlexandre Courbot <acourbot@nvidia.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 67e26e41

drivers/gpu/drm/nouveau/core/subdev/fb/gk20a.c

+15 −1
Original line number Diff line number Diff line
@@ -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,