From: Alexandre Courbot Date: Thu, 27 Oct 2016 07:55:52 +0000 (+0900) Subject: drm/nouveau/fb/gk20a: fix constructor call X-Git-Tag: v4.10-rc1~154^2~38^2~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=635cb7da577e7893f728927015759392b61254e7;p=thirdparty%2Flinux.git drm/nouveau/fb/gk20a: fix constructor call The gf100 constructor should be called, otherwise we will allocate a smaller object than expected. This was without effect so far because gk20a did not allocate a page, but with gf100's page allocation moved to the oneinit() hook this problem has become apparent. Signed-off-by: Alexandre Courbot Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c index f815fe2bbf088..3f516f5adc304 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk20a.c @@ -20,6 +20,7 @@ * DEALINGS IN THE SOFTWARE. */ #include "priv.h" +#include "gf100.h" #include @@ -42,5 +43,5 @@ gk20a_fb = { int gk20a_fb_new(struct nvkm_device *device, int index, struct nvkm_fb **pfb) { - return nvkm_fb_new_(&gk20a_fb, device, index, pfb); + return gf100_fb_new_(&gk20a_fb, device, index, pfb); }