drm/qxl: Use drm_fb_helper deferred_io support
Use the fbdev deferred io support in drm_fb_helper which mirrors the one qxl has had. This patch has only been compile tested. Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Tested-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1461856717-6476-7-git-send-email-noralf@tronnes.org
此提交包含在：
Noralf Trønnes
@@ -46,15 +46,6 @@ struct qxl_fbdev {
|
||||
struct list_head delayed_ops;
|
||||
void *shadow;
|
||||
int size;
|
||||
|
||||
/* dirty memory logging */
|
||||
struct {
|
||||
spinlock_t lock;
|
||||
unsigned x1;
|
||||
unsigned y1;
|
||||
unsigned x2;
|
||||
unsigned y2;
|
||||
} dirty;
|
||||
};
|
||||
|
||||
static void qxl_fb_image_init(struct qxl_fb_image *qxl_fb_image,
|
||||
@@ -82,169 +73,18 @@ static void qxl_fb_image_init(struct qxl_fb_image *qxl_fb_image,
|
||||
}
|
||||
}
|
||||
|
||||
static void qxl_fb_dirty_flush(struct fb_info *info)
|
||||
{
|
||||
struct qxl_fbdev *qfbdev = info->par;
|
||||
struct qxl_device *qdev = qfbdev->qdev;
|
||||
struct qxl_fb_image qxl_fb_image;
|
||||
struct fb_image *image = &qxl_fb_image.fb_image;
|
||||
unsigned long flags;
|
||||
u32 x1, x2, y1, y2;
|
||||
|
||||
/* TODO: hard coding 32 bpp */
|
||||
int stride = qfbdev->qfb.base.pitches[0];
|
||||
|
||||
spin_lock_irqsave(&qfbdev->dirty.lock, flags);
|
||||
|
||||
x1 = qfbdev->dirty.x1;
|
||||
x2 = qfbdev->dirty.x2;
|
||||
y1 = qfbdev->dirty.y1;
|
||||
y2 = qfbdev->dirty.y2;
|
||||
qfbdev->dirty.x1 = 0;
|
||||
qfbdev->dirty.x2 = 0;
|
||||
qfbdev->dirty.y1 = 0;
|
||||
qfbdev->dirty.y2 = 0;
|
||||
|
||||
spin_unlock_irqrestore(&qfbdev->dirty.lock, flags);
|
||||
|
||||
/*
|
||||
* we are using a shadow draw buffer, at qdev->surface0_shadow
|
||||
*/
|
||||
qxl_io_log(qdev, "dirty x[%d, %d], y[%d, %d]", x1, x2, y1, y2);
|
||||
image->dx = x1;
|
||||
image->dy = y1;
|
||||
image->width = x2 - x1 + 1;
|
||||
image->height = y2 - y1 + 1;
|
||||
image->fg_color = 0xffffffff; /* unused, just to avoid uninitialized
|
||||
warnings */
|
||||
image->bg_color = 0;
|
||||
image->depth = 32; /* TODO: take from somewhere? */
|
||||
image->cmap.start = 0;
|
||||
image->cmap.len = 0;
|
||||
image->cmap.red = NULL;
|
||||
image->cmap.green = NULL;
|
||||
image->cmap.blue = NULL;
|
||||
image->cmap.transp = NULL;
|
||||
image->data = qfbdev->shadow + (x1 * 4) + (stride * y1);
|
||||
|
||||
qxl_fb_image_init(&qxl_fb_image, qdev, info, NULL);
|
||||
qxl_draw_opaque_fb(&qxl_fb_image, stride);
|
||||
}
|
||||
|
||||
static void qxl_dirty_update(struct qxl_fbdev *qfbdev,
|
||||
int x, int y, int width, int height)
|
||||
{
|
||||
struct qxl_device *qdev = qfbdev->qdev;
|
||||
unsigned long flags;
|
||||
int x2, y2;
|
||||
|
||||
x2 = x + width - 1;
|
||||
y2 = y + height - 1;
|
||||
|
||||
spin_lock_irqsave(&qfbdev->dirty.lock, flags);
|
||||
|
||||
if ((qfbdev->dirty.y2 - qfbdev->dirty.y1) &&
|
||||
(qfbdev->dirty.x2 - qfbdev->dirty.x1)) {
|
||||
if (qfbdev->dirty.y1 < y)
|
||||
y = qfbdev->dirty.y1;
|
||||
if (qfbdev->dirty.y2 > y2)
|
||||
y2 = qfbdev->dirty.y2;
|
||||
if (qfbdev->dirty.x1 < x)
|
||||
x = qfbdev->dirty.x1;
|
||||
if (qfbdev->dirty.x2 > x2)
|
||||
x2 = qfbdev->dirty.x2;
|
||||
}
|
||||
|
||||
qfbdev->dirty.x1 = x;
|
||||
qfbdev->dirty.x2 = x2;
|
||||
qfbdev->dirty.y1 = y;
|
||||
qfbdev->dirty.y2 = y2;
|
||||
|
||||
spin_unlock_irqrestore(&qfbdev->dirty.lock, flags);
|
||||
|
||||
schedule_work(&qdev->fb_work);
|
||||
}
|
||||
|
||||
static void qxl_deferred_io(struct fb_info *info,
|
||||
struct list_head *pagelist)
|
||||
{
|
||||
struct qxl_fbdev *qfbdev = info->par;
|
||||
unsigned long start, end, min, max;
|
||||
struct page *page;
|
||||
int y1, y2;
|
||||
|
||||
min = ULONG_MAX;
|
||||
max = 0;
|
||||
list_for_each_entry(page, pagelist, lru) {
|
||||
start = page->index << PAGE_SHIFT;
|
||||
end = start + PAGE_SIZE - 1;
|
||||
min = min(min, start);
|
||||
max = max(max, end);
|
||||
}
|
||||
|
||||
if (min < max) {
|
||||
y1 = min / info->fix.line_length;
|
||||
y2 = (max / info->fix.line_length) + 1;
|
||||
qxl_dirty_update(qfbdev, 0, y1, info->var.xres, y2 - y1);
|
||||
}
|
||||
};
|
||||
|
||||
static struct fb_deferred_io qxl_defio = {
|
||||
.delay = QXL_DIRTY_DELAY,
|
||||
.deferred_io = qxl_deferred_io,
|
||||
.deferred_io = drm_fb_helper_deferred_io,
|
||||
};
|
||||
|
||||
static void qxl_fb_fillrect(struct fb_info *info,
|
||||
const struct fb_fillrect *rect)
|
||||
{
|
||||
struct qxl_fbdev *qfbdev = info->par;
|
||||
|
||||
sys_fillrect(info, rect);
|
||||
qxl_dirty_update(qfbdev, rect->dx, rect->dy, rect->width,
|
||||
rect->height);
|
||||
}
|
||||
|
||||
static void qxl_fb_copyarea(struct fb_info *info,
|
||||
const struct fb_copyarea *area)
|
||||
{
|
||||
struct qxl_fbdev *qfbdev = info->par;
|
||||
|
||||
sys_copyarea(info, area);
|
||||
qxl_dirty_update(qfbdev, area->dx, area->dy, area->width,
|
||||
area->height);
|
||||
}
|
||||
|
||||
static void qxl_fb_imageblit(struct fb_info *info,
|
||||
const struct fb_image *image)
|
||||
{
|
||||
struct qxl_fbdev *qfbdev = info->par;
|
||||
|
||||
sys_imageblit(info, image);
|
||||
qxl_dirty_update(qfbdev, image->dx, image->dy, image->width,
|
||||
image->height);
|
||||
}
|
||||
|
||||
static void qxl_fb_work(struct work_struct *work)
|
||||
{
|
||||
struct qxl_device *qdev = container_of(work, struct qxl_device, fb_work);
|
||||
struct qxl_fbdev *qfbdev = qdev->mode_info.qfbdev;
|
||||
|
||||
qxl_fb_dirty_flush(qfbdev->helper.fbdev);
|
||||
}
|
||||
|
||||
int qxl_fb_init(struct qxl_device *qdev)
|
||||
{
|
||||
INIT_WORK(&qdev->fb_work, qxl_fb_work);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct fb_ops qxlfb_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
.fb_check_var = drm_fb_helper_check_var,
|
||||
.fb_set_par = drm_fb_helper_set_par, /* TODO: copy vmwgfx */
|
||||
.fb_fillrect = qxl_fb_fillrect,
|
||||
.fb_copyarea = qxl_fb_copyarea,
|
||||
.fb_imageblit = qxl_fb_imageblit,
|
||||
.fb_fillrect = drm_fb_helper_sys_fillrect,
|
||||
.fb_copyarea = drm_fb_helper_sys_copyarea,
|
||||
.fb_imageblit = drm_fb_helper_sys_imageblit,
|
||||
.fb_pan_display = drm_fb_helper_pan_display,
|
||||
.fb_blank = drm_fb_helper_blank,
|
||||
.fb_setcmap = drm_fb_helper_setcmap,
|
||||
@@ -338,6 +178,57 @@ out_unref:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* FIXME
|
||||
* It should not be necessary to have a special dirty() callback for fbdev.
|
||||
*/
|
||||
static int qxlfb_framebuffer_dirty(struct drm_framebuffer *fb,
|
||||
struct drm_file *file_priv,
|
||||
unsigned flags, unsigned color,
|
||||
struct drm_clip_rect *clips,
|
||||
unsigned num_clips)
|
||||
{
|
||||
struct qxl_device *qdev = fb->dev->dev_private;
|
||||
struct fb_info *info = qdev->fbdev_info;
|
||||
struct qxl_fbdev *qfbdev = info->par;
|
||||
struct qxl_fb_image qxl_fb_image;
|
||||
struct fb_image *image = &qxl_fb_image.fb_image;
|
||||
|
||||
/* TODO: hard coding 32 bpp */
|
||||
int stride = qfbdev->qfb.base.pitches[0];
|
||||
|
||||
/*
|
||||
* we are using a shadow draw buffer, at qdev->surface0_shadow
|
||||
*/
|
||||
qxl_io_log(qdev, "dirty x[%d, %d], y[%d, %d]", clips->x1, clips->x2,
|
||||
clips->y1, clips->y2);
|
||||
image->dx = clips->x1;
|
||||
image->dy = clips->y1;
|
||||
image->width = clips->x2 - clips->x1;
|
||||
image->height = clips->y2 - clips->y1;
|
||||
image->fg_color = 0xffffffff; /* unused, just to avoid uninitialized
|
||||
warnings */
|
||||
image->bg_color = 0;
|
||||
image->depth = 32; /* TODO: take from somewhere? */
|
||||
image->cmap.start = 0;
|
||||
image->cmap.len = 0;
|
||||
image->cmap.red = NULL;
|
||||
image->cmap.green = NULL;
|
||||
image->cmap.blue = NULL;
|
||||
image->cmap.transp = NULL;
|
||||
image->data = qfbdev->shadow + (clips->x1 * 4) + (stride * clips->y1);
|
||||
|
||||
qxl_fb_image_init(&qxl_fb_image, qdev, info, NULL);
|
||||
qxl_draw_opaque_fb(&qxl_fb_image, stride);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct drm_framebuffer_funcs qxlfb_fb_funcs = {
|
||||
.destroy = qxl_user_framebuffer_destroy,
|
||||
.dirty = qxlfb_framebuffer_dirty,
|
||||
};
|
||||
|
||||
static int qxlfb_create(struct qxl_fbdev *qfbdev,
|
||||
struct drm_fb_helper_surface_size *sizes)
|
||||
{
|
||||
@@ -383,7 +274,8 @@ static int qxlfb_create(struct qxl_fbdev *qfbdev,
|
||||
|
||||
info->par = qfbdev;
|
||||
|
||||
qxl_framebuffer_init(qdev->ddev, &qfbdev->qfb, &mode_cmd, gobj);
|
||||
qxl_framebuffer_init(qdev->ddev, &qfbdev->qfb, &mode_cmd, gobj,
|
||||
&qxlfb_fb_funcs);
|
||||
|
||||
fb = &qfbdev->qfb.base;
|
||||
|
||||
@@ -504,7 +396,6 @@ int qxl_fbdev_init(struct qxl_device *qdev)
|
||||
qfbdev->qdev = qdev;
|
||||
qdev->mode_info.qfbdev = qfbdev;
|
||||
spin_lock_init(&qfbdev->delayed_ops_lock);
|
||||
spin_lock_init(&qfbdev->dirty.lock);
|
||||
INIT_LIST_HEAD(&qfbdev->delayed_ops);
|
||||
|
||||
drm_fb_helper_prepare(qdev->ddev, &qfbdev->helper,
|
||||
|
||||
新增問題並參考
封鎖使用者