| Message ID | 20201029133347.4088884-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/qxl: Remove fbcon acceleration leftovers | expand |
On Thu, Oct 29, 2020 at 02:33:47PM +0100, Daniel Vetter wrote: > These are leftovers from 13aff184ed9f ("drm/qxl: remove dead qxl fbdev > emulation code"). > > v2: Somehow these structs provided the struct qxl_device pre-decl, > reorder the header to not anger compilers. > > Acked-by: Gerd Hoffmann <kraxel@redhat.com> > 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 Entire series applied to drm-misc-next. -Daniel > --- > drivers/gpu/drm/qxl/qxl_drv.h | 18 ++---------------- > 1 file changed, 2 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h > index 3602e8b34189..6239626503ef 100644 > --- a/drivers/gpu/drm/qxl/qxl_drv.h > +++ b/drivers/gpu/drm/qxl/qxl_drv.h > @@ -166,20 +166,6 @@ struct qxl_drm_image { > struct list_head chunk_list; > }; > > -struct qxl_fb_image { > - struct qxl_device *qdev; > - uint32_t pseudo_palette[16]; > - struct fb_image fb_image; > - uint32_t visual; > -}; > - > -struct qxl_draw_fill { > - struct qxl_device *qdev; > - struct qxl_rect rect; > - uint32_t color; > - uint16_t rop; > -}; > - > /* > * Debugfs > */ > @@ -188,8 +174,6 @@ struct qxl_debugfs { > unsigned int num_files; > }; > > -int qxl_debugfs_fence_init(struct qxl_device *rdev); > - > struct qxl_device { > struct drm_device ddev; > > @@ -271,6 +255,8 @@ struct qxl_device { > > #define to_qxl(dev) container_of(dev, struct qxl_device, ddev) > > +int qxl_debugfs_fence_init(struct qxl_device *rdev); > + > extern const struct drm_ioctl_desc qxl_ioctls[]; > extern int qxl_max_ioctl; > > -- > 2.28.0 >
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index 3602e8b34189..6239626503ef 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h @@ -166,20 +166,6 @@ struct qxl_drm_image { struct list_head chunk_list; }; -struct qxl_fb_image { - struct qxl_device *qdev; - uint32_t pseudo_palette[16]; - struct fb_image fb_image; - uint32_t visual; -}; - -struct qxl_draw_fill { - struct qxl_device *qdev; - struct qxl_rect rect; - uint32_t color; - uint16_t rop; -}; - /* * Debugfs */ @@ -188,8 +174,6 @@ struct qxl_debugfs { unsigned int num_files; }; -int qxl_debugfs_fence_init(struct qxl_device *rdev); - struct qxl_device { struct drm_device ddev; @@ -271,6 +255,8 @@ struct qxl_device { #define to_qxl(dev) container_of(dev, struct qxl_device, ddev) +int qxl_debugfs_fence_init(struct qxl_device *rdev); + extern const struct drm_ioctl_desc qxl_ioctls[]; extern int qxl_max_ioctl;
These are leftovers from 13aff184ed9f ("drm/qxl: remove dead qxl fbdev emulation code"). v2: Somehow these structs provided the struct qxl_device pre-decl, reorder the header to not anger compilers. Acked-by: Gerd Hoffmann <kraxel@redhat.com> 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_drv.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)