| Message ID | 1461530942-22485-4-git-send-email-noralf@tronnes.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Apr 24, 2016 at 10:48:57PM +0200, Noralf Trønnes wrote: > 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> For patches 2&3: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/qxl/qxl_fb.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c > index 7136e52..06f032d 100644 > --- 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); > } > -- > 2.2.2 >
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index 7136e52..06f032d 100644 --- 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); }
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> --- drivers/gpu/drm/qxl/qxl_fb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)