Commit 0424d7ba authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

staging: vboxvideo: Init fb_info.fix.smem once from fbdev_create 



The fbdev compat fb gets pinned into VRAM at creation and then gets pinned
a second time when set as scanout buffer and unpinned when replaced, this
means its pin count never becomes less then 1, so it is always at the same
address and there is no need for the vbox_fbdev_set_base() call.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb5eaf18

drivers/staging/vboxvideo/vbox_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ int vbox_framebuffer_init(struct vbox_private *vbox, 


int vbox_fbdev_init(struct vbox_private *vbox);

void vbox_fbdev_fini(struct vbox_private *vbox);

void vbox_fbdev_set_base(struct vbox_private *vbox, unsigned long gpu_addr);



struct vbox_bo {

	struct ttm_buffer_object bo;

drivers/staging/vboxvideo/vbox_fb.c

+5 −9
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static int vboxfb_create(struct drm_fb_helper *helper, 
	struct drm_gem_object *gobj;

	struct vbox_bo *bo;

	int size, ret;

	u64 gpu_addr;

	u32 pitch;



	mode_cmd.width = sizes->surface_width;
@@ -107,7 +108,7 @@ static int vboxfb_create(struct drm_fb_helper *helper, 
	if (ret)

		return ret;



	ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, NULL);

	ret = vbox_bo_pin(bo, TTM_PL_FLAG_VRAM, &gpu_addr);

	if (ret) {

		vbox_bo_unreserve(bo);

		return ret;
@@ -152,6 +153,9 @@ static int vboxfb_create(struct drm_fb_helper *helper, 
	drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width,

			       sizes->fb_height);



	info->fix.smem_start = info->apertures->ranges[0].base + gpu_addr;

	info->fix.smem_len = vbox->available_vram_size - gpu_addr;



	info->screen_base = (char __iomem *)bo->kmap.virtual;

	info->screen_size = size;
@@ -241,11 +245,3 @@ err_fini: 
	drm_fb_helper_fini(&fbdev->helper);

	return ret;

}
 


void vbox_fbdev_set_base(struct vbox_private *vbox, unsigned long gpu_addr)

{

	struct fb_info *fbdev = vbox->fbdev->helper.fbdev;



	fbdev->fix.smem_start = fbdev->apertures->ranges[0].base + gpu_addr;

	fbdev->fix.smem_len = vbox->available_vram_size - gpu_addr;

}

drivers/staging/vboxvideo/vbox_mode.c

+0 −3
Original line number Diff line number Diff line
@@ -276,9 +276,6 @@ static int vbox_crtc_set_base_and_mode(struct drm_crtc *crtc, 
	/* Commit: Update hardware to use the new fb */

	mutex_lock(&vbox->hw_mutex);



	if (&vbox->fbdev->afb == to_vbox_framebuffer(new_fb))

		vbox_fbdev_set_base(vbox, gpu_addr);



	vbox_crtc->fb_offset = gpu_addr;



	/* vbox_do_modeset() checks vbox->single_framebuffer so update it now */

CRA Git | Maintained and supported by SUSTech CRA and CCSE