| Message ID | 20191115092120.4445-8-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fb_create drive-through cleanups | expand |
Hi Am 15.11.19 um 10:21 schrieb Daniel Vetter: > Again we could delete a lot more if we'd switch over to the generic > fbdev stuff. Actually, I do have patches for this since forever. I didn't post them yet as I couldn't test them. Maybe I should post them and see what people say. Best regards Thomas > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 4 +- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 11 +--- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 5 +- > drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 62 +++++-------------- > 4 files changed, 19 insertions(+), 63 deletions(-) > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > index 6527a97f68a3..2d0920ec4554 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > @@ -99,14 +99,12 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane, > s64 gpu_addr = 0; > unsigned int line_l; > struct hibmc_drm_private *priv = plane->dev->dev_private; > - struct hibmc_framebuffer *hibmc_fb; > struct drm_gem_vram_object *gbo; > > if (!state->fb) > return; > > - hibmc_fb = to_hibmc_framebuffer(state->fb); > - gbo = drm_gem_vram_of_gem(hibmc_fb->obj); > + gbo = drm_gem_vram_of_gem(fb->obj[0]); > > gpu_addr = drm_gem_vram_offset(gbo); > if (WARN_ON_ONCE(gpu_addr < 0)) > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > index e58ecd7edcf8..ab5b4a4a2095 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > @@ -20,14 +20,9 @@ > struct drm_device; > struct drm_gem_object; > > -struct hibmc_framebuffer { > - struct drm_framebuffer fb; > - struct drm_gem_object *obj; > -}; > - > struct hibmc_fbdev { > struct drm_fb_helper helper; /* must be first */ > - struct hibmc_framebuffer *fb; > + struct drm_framebuffer *fb; > int size; > }; > > @@ -47,8 +42,6 @@ struct hibmc_drm_private { > struct hibmc_fbdev *fbdev; > }; > > -#define to_hibmc_framebuffer(x) container_of(x, struct hibmc_framebuffer, fb) > - > void hibmc_set_power_mode(struct hibmc_drm_private *priv, > unsigned int power_mode); > void hibmc_set_current_gate(struct hibmc_drm_private *priv, > @@ -61,7 +54,7 @@ void hibmc_fbdev_fini(struct hibmc_drm_private *priv); > > int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel, > struct drm_gem_object **obj); > -struct hibmc_framebuffer * > +struct drm_framebuffer * > hibmc_framebuffer_init(struct drm_device *dev, > const struct drm_mode_fb_cmd2 *mode_cmd, > struct drm_gem_object *obj); > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c > index b4c1cea051e8..446aeedc9e29 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c > @@ -141,15 +141,14 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, > > static void hibmc_fbdev_destroy(struct hibmc_fbdev *fbdev) > { > - struct hibmc_framebuffer *gfb = fbdev->fb; > struct drm_fb_helper *fbh = &fbdev->helper; > > drm_fb_helper_unregister_fbi(fbh); > > drm_fb_helper_fini(fbh); > > - if (gfb) > - drm_framebuffer_put(&gfb->fb); > + if (fbdev->fb) > + drm_framebuffer_put(fbdev->fb); > } > > static const struct drm_fb_helper_funcs hibmc_fbdev_helper_funcs = { > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > index 21b684eab5c9..386033b0d3a2 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > @@ -16,6 +16,7 @@ > #include <drm/drm_atomic_helper.h> > #include <drm/drm_gem.h> > #include <drm/drm_gem_vram_helper.h> > +#include <drm/drm_gem_framebuffer_helper.h> > #include <drm/drm_print.h> > > #include "hibmc_drm_drv.h" > @@ -97,74 +98,39 @@ int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, > return 0; > } > > -static void hibmc_user_framebuffer_destroy(struct drm_framebuffer *fb) > -{ > - struct hibmc_framebuffer *hibmc_fb = to_hibmc_framebuffer(fb); > - > - drm_gem_object_put_unlocked(hibmc_fb->obj); > - drm_framebuffer_cleanup(fb); > - kfree(hibmc_fb); > -} > - > static const struct drm_framebuffer_funcs hibmc_fb_funcs = { > - .destroy = hibmc_user_framebuffer_destroy, > + .destroy = drm_gem_fb_destroy, > + .create_handle = drm_gem_fb_create_handle, > }; > > -struct hibmc_framebuffer * > +struct drm_framebuffer * > hibmc_framebuffer_init(struct drm_device *dev, > const struct drm_mode_fb_cmd2 *mode_cmd, > struct drm_gem_object *obj) > { > - struct hibmc_framebuffer *hibmc_fb; > + struct drm_framebuffer *fb; > int ret; > > - hibmc_fb = kzalloc(sizeof(*hibmc_fb), GFP_KERNEL); > - if (!hibmc_fb) { > - DRM_ERROR("failed to allocate hibmc_fb\n"); > + fb = kzalloc(sizeof(*fb), GFP_KERNEL); > + if (!fb) { > + DRM_ERROR("failed to allocate fb\n"); > return ERR_PTR(-ENOMEM); > } > > - drm_helper_mode_fill_fb_struct(dev, &hibmc_fb->fb, mode_cmd); > - hibmc_fb->obj = obj; > - ret = drm_framebuffer_init(dev, &hibmc_fb->fb, &hibmc_fb_funcs); > + drm_helper_mode_fill_fb_struct(dev, fb, mode_cmd); > + fb->obj[0] = obj; > + ret = drm_framebuffer_init(dev, fb, &hibmc_fb_funcs); > if (ret) { > DRM_ERROR("drm_framebuffer_init failed: %d\n", ret); > - kfree(hibmc_fb); > + kfree(fb); > return ERR_PTR(ret); > } > > - return hibmc_fb; > -} > - > -static struct drm_framebuffer * > -hibmc_user_framebuffer_create(struct drm_device *dev, > - struct drm_file *filp, > - const struct drm_mode_fb_cmd2 *mode_cmd) > -{ > - struct drm_gem_object *obj; > - struct hibmc_framebuffer *hibmc_fb; > - > - DRM_DEBUG_DRIVER("%dx%d, format %c%c%c%c\n", > - mode_cmd->width, mode_cmd->height, > - (mode_cmd->pixel_format) & 0xff, > - (mode_cmd->pixel_format >> 8) & 0xff, > - (mode_cmd->pixel_format >> 16) & 0xff, > - (mode_cmd->pixel_format >> 24) & 0xff); > - > - obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]); > - if (!obj) > - return ERR_PTR(-ENOENT); > - > - hibmc_fb = hibmc_framebuffer_init(dev, mode_cmd, obj); > - if (IS_ERR(hibmc_fb)) { > - drm_gem_object_put_unlocked(obj); > - return ERR_PTR((long)hibmc_fb); > - } > - return &hibmc_fb->fb; > + return fb; > } > > const struct drm_mode_config_funcs hibmc_mode_funcs = { > .atomic_check = drm_atomic_helper_check, > .atomic_commit = drm_atomic_helper_commit, > - .fb_create = hibmc_user_framebuffer_create, > + .fb_create = drm_gem_fb_create, > }; >
Hi Am 15.11.19 um 10:21 schrieb Daniel Vetter: > Again we could delete a lot more if we'd switch over to the generic > fbdev stuff. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> There's one comment below. Except for that, Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 4 +- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 11 +--- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 5 +- > drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 62 +++++-------------- > 4 files changed, 19 insertions(+), 63 deletions(-) > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > index 6527a97f68a3..2d0920ec4554 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > @@ -99,14 +99,12 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane, > s64 gpu_addr = 0; > unsigned int line_l; > struct hibmc_drm_private *priv = plane->dev->dev_private; > - struct hibmc_framebuffer *hibmc_fb; > struct drm_gem_vram_object *gbo; > > if (!state->fb) > return; > > - hibmc_fb = to_hibmc_framebuffer(state->fb); > - gbo = drm_gem_vram_of_gem(hibmc_fb->obj); > + gbo = drm_gem_vram_of_gem(fb->obj[0]); There's no fb in this function. You have to use state->fb, > > gpu_addr = drm_gem_vram_offset(gbo); > if (WARN_ON_ONCE(gpu_addr < 0)) > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > index e58ecd7edcf8..ab5b4a4a2095 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > @@ -20,14 +20,9 @@ > struct drm_device; > struct drm_gem_object; > > -struct hibmc_framebuffer { > - struct drm_framebuffer fb; > - struct drm_gem_object *obj; > -}; > - > struct hibmc_fbdev { > struct drm_fb_helper helper; /* must be first */ > - struct hibmc_framebuffer *fb; > + struct drm_framebuffer *fb; > int size; > }; > > @@ -47,8 +42,6 @@ struct hibmc_drm_private { > struct hibmc_fbdev *fbdev; > }; > > -#define to_hibmc_framebuffer(x) container_of(x, struct hibmc_framebuffer, fb) > - > void hibmc_set_power_mode(struct hibmc_drm_private *priv, > unsigned int power_mode); > void hibmc_set_current_gate(struct hibmc_drm_private *priv, > @@ -61,7 +54,7 @@ void hibmc_fbdev_fini(struct hibmc_drm_private *priv); > > int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel, > struct drm_gem_object **obj); > -struct hibmc_framebuffer * > +struct drm_framebuffer * > hibmc_framebuffer_init(struct drm_device *dev, > const struct drm_mode_fb_cmd2 *mode_cmd, > struct drm_gem_object *obj); > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c > index b4c1cea051e8..446aeedc9e29 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c > @@ -141,15 +141,14 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, > > static void hibmc_fbdev_destroy(struct hibmc_fbdev *fbdev) > { > - struct hibmc_framebuffer *gfb = fbdev->fb; > struct drm_fb_helper *fbh = &fbdev->helper; > > drm_fb_helper_unregister_fbi(fbh); > > drm_fb_helper_fini(fbh); > > - if (gfb) > - drm_framebuffer_put(&gfb->fb); > + if (fbdev->fb) > + drm_framebuffer_put(fbdev->fb); > } > > static const struct drm_fb_helper_funcs hibmc_fbdev_helper_funcs = { > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > index 21b684eab5c9..386033b0d3a2 100644 > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > @@ -16,6 +16,7 @@ > #include <drm/drm_atomic_helper.h> > #include <drm/drm_gem.h> > #include <drm/drm_gem_vram_helper.h> > +#include <drm/drm_gem_framebuffer_helper.h> > #include <drm/drm_print.h> > > #include "hibmc_drm_drv.h" > @@ -97,74 +98,39 @@ int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, > return 0; > } > > -static void hibmc_user_framebuffer_destroy(struct drm_framebuffer *fb) > -{ > - struct hibmc_framebuffer *hibmc_fb = to_hibmc_framebuffer(fb); > - > - drm_gem_object_put_unlocked(hibmc_fb->obj); > - drm_framebuffer_cleanup(fb); > - kfree(hibmc_fb); > -} > - > static const struct drm_framebuffer_funcs hibmc_fb_funcs = { > - .destroy = hibmc_user_framebuffer_destroy, > + .destroy = drm_gem_fb_destroy, > + .create_handle = drm_gem_fb_create_handle, > }; > > -struct hibmc_framebuffer * > +struct drm_framebuffer * > hibmc_framebuffer_init(struct drm_device *dev, > const struct drm_mode_fb_cmd2 *mode_cmd, > struct drm_gem_object *obj) > { > - struct hibmc_framebuffer *hibmc_fb; > + struct drm_framebuffer *fb; > int ret; > > - hibmc_fb = kzalloc(sizeof(*hibmc_fb), GFP_KERNEL); > - if (!hibmc_fb) { > - DRM_ERROR("failed to allocate hibmc_fb\n"); > + fb = kzalloc(sizeof(*fb), GFP_KERNEL); > + if (!fb) { > + DRM_ERROR("failed to allocate fb\n"); > return ERR_PTR(-ENOMEM); > } > > - drm_helper_mode_fill_fb_struct(dev, &hibmc_fb->fb, mode_cmd); > - hibmc_fb->obj = obj; > - ret = drm_framebuffer_init(dev, &hibmc_fb->fb, &hibmc_fb_funcs); > + drm_helper_mode_fill_fb_struct(dev, fb, mode_cmd); > + fb->obj[0] = obj; > + ret = drm_framebuffer_init(dev, fb, &hibmc_fb_funcs); > if (ret) { > DRM_ERROR("drm_framebuffer_init failed: %d\n", ret); > - kfree(hibmc_fb); > + kfree(fb); > return ERR_PTR(ret); > } > > - return hibmc_fb; > -} > - > -static struct drm_framebuffer * > -hibmc_user_framebuffer_create(struct drm_device *dev, > - struct drm_file *filp, > - const struct drm_mode_fb_cmd2 *mode_cmd) > -{ > - struct drm_gem_object *obj; > - struct hibmc_framebuffer *hibmc_fb; > - > - DRM_DEBUG_DRIVER("%dx%d, format %c%c%c%c\n", > - mode_cmd->width, mode_cmd->height, > - (mode_cmd->pixel_format) & 0xff, > - (mode_cmd->pixel_format >> 8) & 0xff, > - (mode_cmd->pixel_format >> 16) & 0xff, > - (mode_cmd->pixel_format >> 24) & 0xff); > - > - obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]); > - if (!obj) > - return ERR_PTR(-ENOENT); > - > - hibmc_fb = hibmc_framebuffer_init(dev, mode_cmd, obj); > - if (IS_ERR(hibmc_fb)) { > - drm_gem_object_put_unlocked(obj); > - return ERR_PTR((long)hibmc_fb); > - } > - return &hibmc_fb->fb; > + return fb; > } > > const struct drm_mode_config_funcs hibmc_mode_funcs = { > .atomic_check = drm_atomic_helper_check, > .atomic_commit = drm_atomic_helper_commit, > - .fb_create = hibmc_user_framebuffer_create, > + .fb_create = drm_gem_fb_create, > }; >
On Fri, Nov 22, 2019 at 9:16 AM Thomas Zimmermann <tzimmermann@suse.de> wrote: > > Hi > > Am 15.11.19 um 10:21 schrieb Daniel Vetter: > > Again we could delete a lot more if we'd switch over to the generic > > fbdev stuff. > > > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > > There's one comment below. Except for that, > > Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > > > --- > > .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 4 +- > > .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 11 +--- > > .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 5 +- > > drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 62 +++++-------------- > > 4 files changed, 19 insertions(+), 63 deletions(-) > > > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > > index 6527a97f68a3..2d0920ec4554 100644 > > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c > > @@ -99,14 +99,12 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane, > > s64 gpu_addr = 0; > > unsigned int line_l; > > struct hibmc_drm_private *priv = plane->dev->dev_private; > > - struct hibmc_framebuffer *hibmc_fb; > > struct drm_gem_vram_object *gbo; > > > > if (!state->fb) > > return; > > > > - hibmc_fb = to_hibmc_framebuffer(state->fb); > > - gbo = drm_gem_vram_of_gem(hibmc_fb->obj); > > + gbo = drm_gem_vram_of_gem(fb->obj[0]); > > There's no fb in this function. You have to use state->fb, Uh, hibmc is the one driver that doesn't compile on arm32 :-/ I'll drop my patch here and take a look at your series and try to review it. Then imo wait 2 weeks or so for somet testing from maintainers, and push either way. If it works great, if it breaks you have your tester then :-) -Daniel > > > > > gpu_addr = drm_gem_vram_offset(gbo); > > if (WARN_ON_ONCE(gpu_addr < 0)) > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > > index e58ecd7edcf8..ab5b4a4a2095 100644 > > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h > > @@ -20,14 +20,9 @@ > > struct drm_device; > > struct drm_gem_object; > > > > -struct hibmc_framebuffer { > > - struct drm_framebuffer fb; > > - struct drm_gem_object *obj; > > -}; > > - > > struct hibmc_fbdev { > > struct drm_fb_helper helper; /* must be first */ > > - struct hibmc_framebuffer *fb; > > + struct drm_framebuffer *fb; > > int size; > > }; > > > > @@ -47,8 +42,6 @@ struct hibmc_drm_private { > > struct hibmc_fbdev *fbdev; > > }; > > > > -#define to_hibmc_framebuffer(x) container_of(x, struct hibmc_framebuffer, fb) > > - > > void hibmc_set_power_mode(struct hibmc_drm_private *priv, > > unsigned int power_mode); > > void hibmc_set_current_gate(struct hibmc_drm_private *priv, > > @@ -61,7 +54,7 @@ void hibmc_fbdev_fini(struct hibmc_drm_private *priv); > > > > int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel, > > struct drm_gem_object **obj); > > -struct hibmc_framebuffer * > > +struct drm_framebuffer * > > hibmc_framebuffer_init(struct drm_device *dev, > > const struct drm_mode_fb_cmd2 *mode_cmd, > > struct drm_gem_object *obj); > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c > > index b4c1cea051e8..446aeedc9e29 100644 > > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c > > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c > > @@ -141,15 +141,14 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, > > > > static void hibmc_fbdev_destroy(struct hibmc_fbdev *fbdev) > > { > > - struct hibmc_framebuffer *gfb = fbdev->fb; > > struct drm_fb_helper *fbh = &fbdev->helper; > > > > drm_fb_helper_unregister_fbi(fbh); > > > > drm_fb_helper_fini(fbh); > > > > - if (gfb) > > - drm_framebuffer_put(&gfb->fb); > > + if (fbdev->fb) > > + drm_framebuffer_put(fbdev->fb); > > } > > > > static const struct drm_fb_helper_funcs hibmc_fbdev_helper_funcs = { > > diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > > index 21b684eab5c9..386033b0d3a2 100644 > > --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > > +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c > > @@ -16,6 +16,7 @@ > > #include <drm/drm_atomic_helper.h> > > #include <drm/drm_gem.h> > > #include <drm/drm_gem_vram_helper.h> > > +#include <drm/drm_gem_framebuffer_helper.h> > > #include <drm/drm_print.h> > > > > #include "hibmc_drm_drv.h" > > @@ -97,74 +98,39 @@ int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, > > return 0; > > } > > > > -static void hibmc_user_framebuffer_destroy(struct drm_framebuffer *fb) > > -{ > > - struct hibmc_framebuffer *hibmc_fb = to_hibmc_framebuffer(fb); > > - > > - drm_gem_object_put_unlocked(hibmc_fb->obj); > > - drm_framebuffer_cleanup(fb); > > - kfree(hibmc_fb); > > -} > > - > > static const struct drm_framebuffer_funcs hibmc_fb_funcs = { > > - .destroy = hibmc_user_framebuffer_destroy, > > + .destroy = drm_gem_fb_destroy, > > + .create_handle = drm_gem_fb_create_handle, > > }; > > > > -struct hibmc_framebuffer * > > +struct drm_framebuffer * > > hibmc_framebuffer_init(struct drm_device *dev, > > const struct drm_mode_fb_cmd2 *mode_cmd, > > struct drm_gem_object *obj) > > { > > - struct hibmc_framebuffer *hibmc_fb; > > + struct drm_framebuffer *fb; > > int ret; > > > > - hibmc_fb = kzalloc(sizeof(*hibmc_fb), GFP_KERNEL); > > - if (!hibmc_fb) { > > - DRM_ERROR("failed to allocate hibmc_fb\n"); > > + fb = kzalloc(sizeof(*fb), GFP_KERNEL); > > + if (!fb) { > > + DRM_ERROR("failed to allocate fb\n"); > > return ERR_PTR(-ENOMEM); > > } > > > > - drm_helper_mode_fill_fb_struct(dev, &hibmc_fb->fb, mode_cmd); > > - hibmc_fb->obj = obj; > > - ret = drm_framebuffer_init(dev, &hibmc_fb->fb, &hibmc_fb_funcs); > > + drm_helper_mode_fill_fb_struct(dev, fb, mode_cmd); > > + fb->obj[0] = obj; > > + ret = drm_framebuffer_init(dev, fb, &hibmc_fb_funcs); > > if (ret) { > > DRM_ERROR("drm_framebuffer_init failed: %d\n", ret); > > - kfree(hibmc_fb); > > + kfree(fb); > > return ERR_PTR(ret); > > } > > > > - return hibmc_fb; > > -} > > - > > -static struct drm_framebuffer * > > -hibmc_user_framebuffer_create(struct drm_device *dev, > > - struct drm_file *filp, > > - const struct drm_mode_fb_cmd2 *mode_cmd) > > -{ > > - struct drm_gem_object *obj; > > - struct hibmc_framebuffer *hibmc_fb; > > - > > - DRM_DEBUG_DRIVER("%dx%d, format %c%c%c%c\n", > > - mode_cmd->width, mode_cmd->height, > > - (mode_cmd->pixel_format) & 0xff, > > - (mode_cmd->pixel_format >> 8) & 0xff, > > - (mode_cmd->pixel_format >> 16) & 0xff, > > - (mode_cmd->pixel_format >> 24) & 0xff); > > - > > - obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]); > > - if (!obj) > > - return ERR_PTR(-ENOENT); > > - > > - hibmc_fb = hibmc_framebuffer_init(dev, mode_cmd, obj); > > - if (IS_ERR(hibmc_fb)) { > > - drm_gem_object_put_unlocked(obj); > > - return ERR_PTR((long)hibmc_fb); > > - } > > - return &hibmc_fb->fb; > > + return fb; > > } > > > > const struct drm_mode_config_funcs hibmc_mode_funcs = { > > .atomic_check = drm_atomic_helper_check, > > .atomic_commit = drm_atomic_helper_commit, > > - .fb_create = hibmc_user_framebuffer_create, > > + .fb_create = drm_gem_fb_create, > > }; > > > > -- > Thomas Zimmermann > Graphics Driver Developer > SUSE Software Solutions Germany GmbH > Maxfeldstr. 5, 90409 Nürnberg, Germany > (HRB 36809, AG Nürnberg) > Geschäftsführer: Felix Imendörffer >
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c index 6527a97f68a3..2d0920ec4554 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c @@ -99,14 +99,12 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane, s64 gpu_addr = 0; unsigned int line_l; struct hibmc_drm_private *priv = plane->dev->dev_private; - struct hibmc_framebuffer *hibmc_fb; struct drm_gem_vram_object *gbo; if (!state->fb) return; - hibmc_fb = to_hibmc_framebuffer(state->fb); - gbo = drm_gem_vram_of_gem(hibmc_fb->obj); + gbo = drm_gem_vram_of_gem(fb->obj[0]); gpu_addr = drm_gem_vram_offset(gbo); if (WARN_ON_ONCE(gpu_addr < 0)) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index e58ecd7edcf8..ab5b4a4a2095 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -20,14 +20,9 @@ struct drm_device; struct drm_gem_object; -struct hibmc_framebuffer { - struct drm_framebuffer fb; - struct drm_gem_object *obj; -}; - struct hibmc_fbdev { struct drm_fb_helper helper; /* must be first */ - struct hibmc_framebuffer *fb; + struct drm_framebuffer *fb; int size; }; @@ -47,8 +42,6 @@ struct hibmc_drm_private { struct hibmc_fbdev *fbdev; }; -#define to_hibmc_framebuffer(x) container_of(x, struct hibmc_framebuffer, fb) - void hibmc_set_power_mode(struct hibmc_drm_private *priv, unsigned int power_mode); void hibmc_set_current_gate(struct hibmc_drm_private *priv, @@ -61,7 +54,7 @@ void hibmc_fbdev_fini(struct hibmc_drm_private *priv); int hibmc_gem_create(struct drm_device *dev, u32 size, bool iskernel, struct drm_gem_object **obj); -struct hibmc_framebuffer * +struct drm_framebuffer * hibmc_framebuffer_init(struct drm_device *dev, const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj); diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c index b4c1cea051e8..446aeedc9e29 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c @@ -141,15 +141,14 @@ static int hibmc_drm_fb_create(struct drm_fb_helper *helper, static void hibmc_fbdev_destroy(struct hibmc_fbdev *fbdev) { - struct hibmc_framebuffer *gfb = fbdev->fb; struct drm_fb_helper *fbh = &fbdev->helper; drm_fb_helper_unregister_fbi(fbh); drm_fb_helper_fini(fbh); - if (gfb) - drm_framebuffer_put(&gfb->fb); + if (fbdev->fb) + drm_framebuffer_put(fbdev->fb); } static const struct drm_fb_helper_funcs hibmc_fbdev_helper_funcs = { diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c index 21b684eab5c9..386033b0d3a2 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c @@ -16,6 +16,7 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_print.h> #include "hibmc_drm_drv.h" @@ -97,74 +98,39 @@ int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev, return 0; } -static void hibmc_user_framebuffer_destroy(struct drm_framebuffer *fb) -{ - struct hibmc_framebuffer *hibmc_fb = to_hibmc_framebuffer(fb); - - drm_gem_object_put_unlocked(hibmc_fb->obj); - drm_framebuffer_cleanup(fb); - kfree(hibmc_fb); -} - static const struct drm_framebuffer_funcs hibmc_fb_funcs = { - .destroy = hibmc_user_framebuffer_destroy, + .destroy = drm_gem_fb_destroy, + .create_handle = drm_gem_fb_create_handle, }; -struct hibmc_framebuffer * +struct drm_framebuffer * hibmc_framebuffer_init(struct drm_device *dev, const struct drm_mode_fb_cmd2 *mode_cmd, struct drm_gem_object *obj) { - struct hibmc_framebuffer *hibmc_fb; + struct drm_framebuffer *fb; int ret; - hibmc_fb = kzalloc(sizeof(*hibmc_fb), GFP_KERNEL); - if (!hibmc_fb) { - DRM_ERROR("failed to allocate hibmc_fb\n"); + fb = kzalloc(sizeof(*fb), GFP_KERNEL); + if (!fb) { + DRM_ERROR("failed to allocate fb\n"); return ERR_PTR(-ENOMEM); } - drm_helper_mode_fill_fb_struct(dev, &hibmc_fb->fb, mode_cmd); - hibmc_fb->obj = obj; - ret = drm_framebuffer_init(dev, &hibmc_fb->fb, &hibmc_fb_funcs); + drm_helper_mode_fill_fb_struct(dev, fb, mode_cmd); + fb->obj[0] = obj; + ret = drm_framebuffer_init(dev, fb, &hibmc_fb_funcs); if (ret) { DRM_ERROR("drm_framebuffer_init failed: %d\n", ret); - kfree(hibmc_fb); + kfree(fb); return ERR_PTR(ret); } - return hibmc_fb; -} - -static struct drm_framebuffer * -hibmc_user_framebuffer_create(struct drm_device *dev, - struct drm_file *filp, - const struct drm_mode_fb_cmd2 *mode_cmd) -{ - struct drm_gem_object *obj; - struct hibmc_framebuffer *hibmc_fb; - - DRM_DEBUG_DRIVER("%dx%d, format %c%c%c%c\n", - mode_cmd->width, mode_cmd->height, - (mode_cmd->pixel_format) & 0xff, - (mode_cmd->pixel_format >> 8) & 0xff, - (mode_cmd->pixel_format >> 16) & 0xff, - (mode_cmd->pixel_format >> 24) & 0xff); - - obj = drm_gem_object_lookup(filp, mode_cmd->handles[0]); - if (!obj) - return ERR_PTR(-ENOENT); - - hibmc_fb = hibmc_framebuffer_init(dev, mode_cmd, obj); - if (IS_ERR(hibmc_fb)) { - drm_gem_object_put_unlocked(obj); - return ERR_PTR((long)hibmc_fb); - } - return &hibmc_fb->fb; + return fb; } const struct drm_mode_config_funcs hibmc_mode_funcs = { .atomic_check = drm_atomic_helper_check, .atomic_commit = drm_atomic_helper_commit, - .fb_create = hibmc_user_framebuffer_create, + .fb_create = drm_gem_fb_create, };
Again we could delete a lot more if we'd switch over to the generic fbdev stuff. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- .../gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 4 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 11 +--- .../gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 5 +- drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 62 +++++-------------- 4 files changed, 19 insertions(+), 63 deletions(-)