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

Commit 0c324971 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50: fix fbcon when framebuffer above 4GiB mark 



This can't actually happen right now, but lets fix it anyway.

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

drivers/gpu/drm/nouveau/nv50_fbcon.c

+7 −6
Original line number Diff line number Diff line
@@ -157,8 +157,11 @@ nv50_fbcon_accel_init(struct fb_info *info) 
	struct drm_nouveau_private *dev_priv = dev->dev_private;

	struct nouveau_channel *chan = dev_priv->channel;

	struct nouveau_gpuobj *eng2d = NULL;

	uint64_t fb;

	int ret, format;



	fb = info->fix.smem_start - dev_priv->fb_phys + dev_priv->vm_vram_base;



	switch (info->var.bits_per_pixel) {

	case 8:

		format = 0xf3;
@@ -248,9 +251,8 @@ nv50_fbcon_accel_init(struct fb_info *info) 
	OUT_RING(chan, info->fix.line_length);

	OUT_RING(chan, info->var.xres_virtual);

	OUT_RING(chan, info->var.yres_virtual);

	OUT_RING(chan, 0);

	OUT_RING(chan, info->fix.smem_start - dev_priv->fb_phys +

			 dev_priv->vm_vram_base);

	OUT_RING(chan, upper_32_bits(fb));

	OUT_RING(chan, lower_32_bits(fb));

	BEGIN_RING(chan, NvSub2D, 0x0230, 2);

	OUT_RING(chan, format);

	OUT_RING(chan, 1);
@@ -258,9 +260,8 @@ nv50_fbcon_accel_init(struct fb_info *info) 
	OUT_RING(chan, info->fix.line_length);

	OUT_RING(chan, info->var.xres_virtual);

	OUT_RING(chan, info->var.yres_virtual);

	OUT_RING(chan, 0);

	OUT_RING(chan, info->fix.smem_start - dev_priv->fb_phys +

			 dev_priv->vm_vram_base);

	OUT_RING(chan, upper_32_bits(fb));

	OUT_RING(chan, lower_32_bits(fb));



	return 0;

}