drm/qxl: Change drm_fb_helper_sys_*() calls to sys_*()

notro · danvet · commit 2b5e8e579be4 · 2016-05-02T16:21:46.000+02:00
Now that drm_fb_helper gets deferred io support, the drm_fb_helper_sys_{fillrect,copyarea,imageblit} functions will schedule a worker that will call the (struct drm_framebuffer *)->funcs->dirty() function. This will break this driver so use the sys_{fillrect,copyarea,imageblit} functions directly. Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1461856717-6476-3-git-send-email-noralf@tronnes.org
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c
@@ -199,7 +199,7 @@ static void qxl_fb_fillrect(struct fb_info *info,
 {
 	struct qxl_fbdev *qfbdev = info->par;
 
-	drm_fb_helper_sys_fillrect(info, rect);
+	sys_fillrect(info, rect);
 	qxl_dirty_update(qfbdev, rect->dx, rect->dy, rect->width,
 			 rect->height);
 }
@@ -209,7 +209,7 @@ static void qxl_fb_copyarea(struct fb_info *info,
 {
 	struct qxl_fbdev *qfbdev = info->par;
 
-	drm_fb_helper_sys_copyarea(info, area);
+	sys_copyarea(info, area);
 	qxl_dirty_update(qfbdev, area->dx, area->dy, area->width,
 			 area->height);
 }
@@ -219,7 +219,7 @@ static void qxl_fb_imageblit(struct fb_info *info,
 {
 	struct qxl_fbdev *qfbdev = info->par;
 
-	drm_fb_helper_sys_imageblit(info, image);
+	sys_imageblit(info, image);
 	qxl_dirty_update(qfbdev, image->dx, image->dy, image->width,
 			 image->height);
 }

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ static void qxl_fb_fillrect(struct fb_info *info,`
`199`	`199`	`{`
`200`	`200`	`struct qxl_fbdev *qfbdev = info->par;`
`201`	`201`
`202`		`- drm_fb_helper_sys_fillrect(info, rect);`
	`202`	`+ sys_fillrect(info, rect);`
`203`	`203`	`qxl_dirty_update(qfbdev, rect->dx, rect->dy, rect->width,`
`204`	`204`	`rect->height);`
`205`	`205`	`}`
`@@ -209,7 +209,7 @@ static void qxl_fb_copyarea(struct fb_info *info,`
`209`	`209`	`{`
`210`	`210`	`struct qxl_fbdev *qfbdev = info->par;`
`211`	`211`
`212`		`- drm_fb_helper_sys_copyarea(info, area);`
	`212`	`+ sys_copyarea(info, area);`
`213`	`213`	`qxl_dirty_update(qfbdev, area->dx, area->dy, area->width,`
`214`	`214`	`area->height);`
`215`	`215`	`}`
`@@ -219,7 +219,7 @@ static void qxl_fb_imageblit(struct fb_info *info,`
`219`	`219`	`{`
`220`	`220`	`struct qxl_fbdev *qfbdev = info->par;`
`221`	`221`
`222`		`- drm_fb_helper_sys_imageblit(info, image);`
	`222`	`+ sys_imageblit(info, image);`
`223`	`223`	`qxl_dirty_update(qfbdev, image->dx, image->dy, image->width,`
`224`	`224`	`image->height);`
`225`	`225`	`}`