Commit e2d8b428 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev: Use pageref offset for deferred-I/O writeback 



Use pageref->offset instead of page->index for deferred-I/O writeback
where appropriate. Distinguishes between file-mapping offset and video-
memory offset. While at it, also remove unnecessary references to
struct page.

Fbdev's deferred-I/O code uses the two related page->index and
pageref->offset. The former is the page offset in the mapped file,
the latter is the byte offset in the video memory (or fbdev screen
buffer). It's the same value for fbdev drivers, but for DRM the values
can be different. Because GEM buffer objects are mapped at an offset
in the DRM device file, page->index has this offset added to it as well.
We currently don't hit this case in DRM, because all affected mappings
of GEM memory are performed with an internal, intermediate shadow buffer.

The value of page->index is required by page_mkclean(), which we
call to reset the mappings during the writeback phase of the deferred
I/O. The value of pageref->offset is for conveniently getting an offset
into video memory in fb helpers.

v4:
	* fix commit message (Javier)

Suggested-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220429100834.18898-6-tzimmermann@suse.de
parent e80eec1b

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+1 −2
Original line number Diff line number Diff line
@@ -327,8 +327,7 @@ static void vmw_deferred_io(struct fb_info *info, struct list_head *pagereflist) 
	min = ULONG_MAX;

	max = 0;

	list_for_each_entry(pageref, pagereflist, list) {

		struct page *page = pageref->page;

		start = page->index << PAGE_SHIFT;

		start = pageref->offset;

		end = start + PAGE_SIZE - 1;

		min = min(min, start);

		max = max(max, end);

drivers/staging/fbtft/fbtft-core.c

+3 −6
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagereflis 
	struct fbtft_par *par = info->par;

	unsigned int dirty_lines_start, dirty_lines_end;

	struct fb_deferred_io_pageref *pageref;

	unsigned long index;

	unsigned int y_low = 0, y_high = 0;

	int count = 0;
@@ -341,14 +340,12 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagereflis 


	/* Mark display lines as dirty */

	list_for_each_entry(pageref, pagereflist, list) {

		struct page *page = pageref->page;

		count++;

		index = page->index << PAGE_SHIFT;

		y_low = index / info->fix.line_length;

		y_high = (index + PAGE_SIZE - 1) / info->fix.line_length;

		y_low = pageref->offset / info->fix.line_length;

		y_high = (pageref->offset + PAGE_SIZE - 1) / info->fix.line_length;

		dev_dbg(info->device,

			"page->index=%lu y_low=%d y_high=%d\n",

			page->index, y_low, y_high);

			pageref->page->index, y_low, y_high);

		if (y_high > info->var.yres - 1)

			y_high = info->var.yres - 1;

		if (y_low < dirty_lines_start)

drivers/video/fbdev/broadsheetfb.c

+6 −7
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static void broadsheetfb_dpy_update(struct broadsheetfb_par *par) 
static void broadsheetfb_dpy_deferred_io(struct fb_info *info, struct list_head *pagereflist)

{

	u16 y1 = 0, h = 0;

	int prev_index = -1;

	unsigned long prev_offset = ULONG_MAX;

	struct fb_deferred_io_pageref *pageref;

	int h_inc;

	u16 yres = info->var.yres;
@@ -943,22 +943,21 @@ static void broadsheetfb_dpy_deferred_io(struct fb_info *info, struct list_head 


	/* walk the written page list and swizzle the data */

	list_for_each_entry(pageref, pagereflist, list) {

		struct page *cur = pageref->page;

		if (prev_index < 0) {

		if (prev_offset == ULONG_MAX) {

			/* just starting so assign first page */

			y1 = (cur->index << PAGE_SHIFT) / xres;

			y1 = pageref->offset / xres;

			h = h_inc;

		} else if ((prev_index + 1) == cur->index) {

		} else if ((prev_offset + PAGE_SIZE) == pageref->offset) {

			/* this page is consecutive so increase our height */

			h += h_inc;

		} else {

			/* page not consecutive, issue previous update first */

			broadsheetfb_dpy_update_pages(info->par, y1, y1 + h);

			/* start over with our non consecutive page */

			y1 = (cur->index << PAGE_SHIFT) / xres;

			y1 = pageref->offset / xres;

			h = h_inc;

		}

		prev_index = cur->index;

		prev_offset = pageref->offset;

	}



	/* if we still have any pages to update we do so now */

drivers/video/fbdev/hyperv_fb.c

+1 −2
Original line number Diff line number Diff line
@@ -437,8 +437,7 @@ static void synthvid_deferred_io(struct fb_info *p, struct list_head *pagereflis 
	 * value to yres.

	 */

	list_for_each_entry(pageref, pagereflist, list) {

		struct page *page = pageref->page;

		start = page->index << PAGE_SHIFT;

		start = pageref->offset;

		end = start + PAGE_SIZE - 1;

		y1 = start / p->fix.line_length;

		y2 = end / p->fix.line_length;

drivers/video/fbdev/metronomefb.c

+4 −5
Original line number Diff line number Diff line
@@ -473,11 +473,10 @@ static void metronomefb_dpy_deferred_io(struct fb_info *info, struct list_head * 


	/* walk the written page list and swizzle the data */

	list_for_each_entry(pageref, pagereflist, list) {

		struct page *cur = pageref->page;

		cksum = metronomefb_dpy_update_page(par,

					(cur->index << PAGE_SHIFT));

		par->metromem_img_csum -= par->csum_table[cur->index];

		par->csum_table[cur->index] = cksum;

		unsigned long pgoffset = pageref->offset >> PAGE_SHIFT;

		cksum = metronomefb_dpy_update_page(par, pageref->offset);

		par->metromem_img_csum -= par->csum_table[pgoffset];

		par->csum_table[pgoffset] = cksum;

		par->metromem_img_csum += cksum;

	}