| Message ID | 20190124165831.16427-20-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | some cleanups, mostly around fbdev emulation | expand |
On Thu, Jan 24, 2019 at 05:58:24PM +0100, Daniel Vetter wrote:
> This should not result in any changes.
I'd love to merge https://patchwork.freedesktop.org/series/53951/
instead (which will -- among other things -- switch qxl over to the
generic fbdev emulation and remove the code you are patching here).
Anyone willing to review? Dave?
thanks,
Gerd
On Fri, Jan 25, 2019 at 07:39:26AM +0100, Gerd Hoffmann wrote: > On Thu, Jan 24, 2019 at 05:58:24PM +0100, Daniel Vetter wrote: > > This should not result in any changes. > > I'd love to merge https://patchwork.freedesktop.org/series/53951/ > instead (which will -- among other things -- switch qxl over to the > generic fbdev emulation and remove the code you are patching here). Ah yes very happy to drop my patch in favour of yours. > Anyone willing to review? Dave? Noralf might be a good choice too, with you cross-reviewing some of his in-flight work. -Daniel
diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index d028471597ef..22dc9a7a643b 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c @@ -219,8 +219,6 @@ static int qxlfb_create(struct drm_fb_helper *helper, goto out_unref; } - info->par = helper; - fb = drm_gem_fbdev_fb_create(&qdev->ddev, sizes, 64, gobj, &qxlfb_fb_funcs); if (IS_ERR(fb)) { @@ -232,10 +230,6 @@ static int qxlfb_create(struct drm_fb_helper *helper, /* setup helper with fb data */ qdev->fb_helper.fb = fb; - strcpy(info->fix.id, "qxldrmfb"); - - drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); - info->fbops = &qxlfb_ops; /* @@ -247,8 +241,7 @@ static int qxlfb_create(struct drm_fb_helper *helper, info->screen_base = shadow; info->screen_size = gobj->size; - drm_fb_helper_fill_var(info, &qdev->fb_helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, &qdev->fb_helper); /* setup aperture base/size for vesafb takeover */ info->apertures->ranges[0].base = qdev->ddev.mode_config.fb_base;
This should not result in any changes. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Dave Airlie <airlied@redhat.com> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: virtualization@lists.linux-foundation.org Cc: spice-devel@lists.freedesktop.org --- drivers/gpu/drm/qxl/qxl_fb.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)