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

Commit f01a9720 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: fix gpu page faults triggered by plymouthd 



The switch to separate BAR and channel address spaces made the fbcon memory
address calculation incorrect on NV50+ boards, this commit fixes that.

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 8b464bfe

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+2 −2
Original line number Diff line number Diff line
@@ -352,8 +352,8 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev, 
			      FBINFO_HWACCEL_IMAGEBLIT;

	info->flags |= FBINFO_CAN_FORCE_OUTPUT;

	info->fbops = &nouveau_fbcon_sw_ops;

	info->fix.smem_start = dev->mode_config.fb_base +

			       (nvbo->bo.mem.start << PAGE_SHIFT);

	info->fix.smem_start = nvbo->bo.mem.bus.base +

			       nvbo->bo.mem.bus.offset;

	info->fix.smem_len = size;



	info->screen_base = nvbo_kmap_obj_iovirtual(nouveau_fb->nvbo);