Message ID | 20171107203935.159491-1-ytht.net@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Nov 07, 2017 at 12:39:35PM -0800, Lepton Wu wrote: > Add create_handle support to cirrus and virtio fb which are used > in virtual machines. Without this, screenshot tool in chromium OS > can't work. > > Signed-off-by: Lepton Wu <ytht.net@gmail.com> Please split per-driver and cc relevant driver maintainers on each individually. Would also be sweet if you could somewhat move these over to Noralf's shiny new gem helpers. Thanks, Daniel > --- > drivers/gpu/drm/cirrus/cirrus_main.c | 9 +++++++++ > drivers/gpu/drm/virtio/virtgpu_display.c | 12 ++++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c > index b5f528543956..26df1e8cd490 100644 > --- a/drivers/gpu/drm/cirrus/cirrus_main.c > +++ b/drivers/gpu/drm/cirrus/cirrus_main.c > @@ -13,6 +13,14 @@ > > #include "cirrus_drv.h" > > +static int cirrus_create_handle(struct drm_framebuffer *fb, > + struct drm_file* file_priv, > + unsigned int* handle) > +{ > + struct cirrus_framebuffer *cirrus_fb = to_cirrus_framebuffer(fb); > + > + return drm_gem_handle_create(file_priv, cirrus_fb->obj, handle); > +} > > static void cirrus_user_framebuffer_destroy(struct drm_framebuffer *fb) > { > @@ -24,6 +32,7 @@ static void cirrus_user_framebuffer_destroy(struct drm_framebuffer *fb) > } > > static const struct drm_framebuffer_funcs cirrus_fb_funcs = { > + .create_handle = cirrus_create_handle, > .destroy = cirrus_user_framebuffer_destroy, > }; > > diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c > index b6d52055a11f..274b4206ca96 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_display.c > +++ b/drivers/gpu/drm/virtio/virtgpu_display.c > @@ -71,7 +71,19 @@ virtio_gpu_framebuffer_surface_dirty(struct drm_framebuffer *fb, > return virtio_gpu_surface_dirty(virtio_gpu_fb, clips, num_clips); > } > > +static int > +virtio_gpu_framebuffer_create_handle(struct drm_framebuffer *fb, > + struct drm_file *file_priv, > + unsigned int *handle) > +{ > + struct virtio_gpu_framebuffer *virtio_gpu_fb = > + to_virtio_gpu_framebuffer(fb); > + > + return drm_gem_handle_create(file_priv, virtio_gpu_fb->obj, handle); > +} > + > static const struct drm_framebuffer_funcs virtio_gpu_fb_funcs = { > + .create_handle = virtio_gpu_framebuffer_create_handle, > .destroy = virtio_gpu_user_framebuffer_destroy, > .dirty = virtio_gpu_framebuffer_surface_dirty, > }; > -- > 2.15.0.403.gc27cc4dac6-goog > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/cirrus/cirrus_main.c b/drivers/gpu/drm/cirrus/cirrus_main.c index b5f528543956..26df1e8cd490 100644 --- a/drivers/gpu/drm/cirrus/cirrus_main.c +++ b/drivers/gpu/drm/cirrus/cirrus_main.c @@ -13,6 +13,14 @@ #include "cirrus_drv.h" +static int cirrus_create_handle(struct drm_framebuffer *fb, + struct drm_file* file_priv, + unsigned int* handle) +{ + struct cirrus_framebuffer *cirrus_fb = to_cirrus_framebuffer(fb); + + return drm_gem_handle_create(file_priv, cirrus_fb->obj, handle); +} static void cirrus_user_framebuffer_destroy(struct drm_framebuffer *fb) { @@ -24,6 +32,7 @@ static void cirrus_user_framebuffer_destroy(struct drm_framebuffer *fb) } static const struct drm_framebuffer_funcs cirrus_fb_funcs = { + .create_handle = cirrus_create_handle, .destroy = cirrus_user_framebuffer_destroy, }; diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c index b6d52055a11f..274b4206ca96 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c @@ -71,7 +71,19 @@ virtio_gpu_framebuffer_surface_dirty(struct drm_framebuffer *fb, return virtio_gpu_surface_dirty(virtio_gpu_fb, clips, num_clips); } +static int +virtio_gpu_framebuffer_create_handle(struct drm_framebuffer *fb, + struct drm_file *file_priv, + unsigned int *handle) +{ + struct virtio_gpu_framebuffer *virtio_gpu_fb = + to_virtio_gpu_framebuffer(fb); + + return drm_gem_handle_create(file_priv, virtio_gpu_fb->obj, handle); +} + static const struct drm_framebuffer_funcs virtio_gpu_fb_funcs = { + .create_handle = virtio_gpu_framebuffer_create_handle, .destroy = virtio_gpu_user_framebuffer_destroy, .dirty = virtio_gpu_framebuffer_surface_dirty, };
Add create_handle support to cirrus and virtio fb which are used in virtual machines. Without this, screenshot tool in chromium OS can't work. Signed-off-by: Lepton Wu <ytht.net@gmail.com> --- drivers/gpu/drm/cirrus/cirrus_main.c | 9 +++++++++ drivers/gpu/drm/virtio/virtgpu_display.c | 12 ++++++++++++ 2 files changed, 21 insertions(+)