| Message ID | 20171115142001.45358-4-noralf@tronnes.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Noralf, On Wed, 2017-11-15 at 15:19 +0100, Noralf Trønnes wrote: > Use drm_fb_cma_fbdev_init() and drm_fb_cma_fbdev_fini() which relies on > the fact that drm_device holds a pointer to the drm_fb_helper structure. > This means that the driver doesn't have to keep track of that. > Also use the drm_fb_helper functions directly. > Remove unused function prototype arcpgu_fbdev_cma_init(). > > Cc: Alexey Brodkin <abrodkin@synopsys.com> > Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
Hi Noralf, On Wed, 2017-11-15 at 15:19 +0100, Noralf Trønnes wrote: > Use drm_fb_cma_fbdev_init() and drm_fb_cma_fbdev_fini() which relies on > the fact that drm_device holds a pointer to the drm_fb_helper structure. > This means that the driver doesn't have to keep track of that. > Also use the drm_fb_helper functions directly. > Remove unused function prototype arcpgu_fbdev_cma_init(). > > Cc: Alexey Brodkin <abrodkin@synopsys.com> > Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Similarly to drm/fsl-dcu driver this one never made it upstream. I was under impression that entire series will be either accepted or not but looks like fixes for separate drivers were pulled via separate trees. Anyways I like this patch for ARC PGU and may confirm it works perfectly fine on top of 4.18.10 so should I pull this into my tree and send a pull-request to David or maybe all not yet accepted patches from the series may go through the same tree? -Alexey And essentially... Acked-by: Alexey Brodkin <abrodkin@synopsys.com>
Den 27.09.2018 10.49, skrev Alexey Brodkin: > Hi Noralf, > > On Wed, 2017-11-15 at 15:19 +0100, Noralf Trønnes wrote: >> Use drm_fb_cma_fbdev_init() and drm_fb_cma_fbdev_fini() which relies on >> the fact that drm_device holds a pointer to the drm_fb_helper structure. >> This means that the driver doesn't have to keep track of that. >> Also use the drm_fb_helper functions directly. >> Remove unused function prototype arcpgu_fbdev_cma_init(). >> >> Cc: Alexey Brodkin <abrodkin@synopsys.com> >> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> > Similarly to drm/fsl-dcu driver this one never made it upstream. > I was under impression that entire series will be either accepted or not > but looks like fixes for separate drivers were pulled via separate trees. > > Anyways I like this patch for ARC PGU and may confirm it works > perfectly fine on top of 4.18.10 so should I pull this into my tree and > send a pull-request to David or maybe all not yet accepted patches from the > series may go through the same tree? > > -Alexey > > And essentially... > Acked-by: Alexey Brodkin <abrodkin@synopsys.com> > It has been superseeded by this patch: [02/20] drm/arc: Use drm_fbdev_generic_setup() https://patchwork.freedesktop.org/patch/247862/ I'll reply to the cover letter of this series that it has been superseeded and why. Wrt to applying, I only do that if I get an ack from the driver maintainer or a DRM maintainer for trivial stuff. Some reply that they have applied/queued the patch in their tree for the next version. Noralf.
diff --git a/drivers/gpu/drm/arc/arcpgu.h b/drivers/gpu/drm/arc/arcpgu.h index e8fcf3ab1d9a..90ef76b19f8a 100644 --- a/drivers/gpu/drm/arc/arcpgu.h +++ b/drivers/gpu/drm/arc/arcpgu.h @@ -20,7 +20,6 @@ struct arcpgu_drm_private { void __iomem *regs; struct clk *clk; - struct drm_fbdev_cma *fbdev; struct drm_framebuffer *fb; struct drm_crtc crtc; struct drm_plane *plane; @@ -43,8 +42,5 @@ static inline u32 arc_pgu_read(struct arcpgu_drm_private *arcpgu, int arc_pgu_setup_crtc(struct drm_device *dev); int arcpgu_drm_hdmi_init(struct drm_device *drm, struct device_node *np); int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np); -struct drm_fbdev_cma *arcpgu_fbdev_cma_init(struct drm_device *dev, - unsigned int preferred_bpp, unsigned int num_crtc, - unsigned int max_conn_count); #endif diff --git a/drivers/gpu/drm/arc/arcpgu_drv.c b/drivers/gpu/drm/arc/arcpgu_drv.c index f067de4e1e82..e25981adbed0 100644 --- a/drivers/gpu/drm/arc/arcpgu_drv.c +++ b/drivers/gpu/drm/arc/arcpgu_drv.c @@ -16,6 +16,7 @@ #include <linux/clk.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> @@ -25,16 +26,9 @@ #include "arcpgu.h" #include "arcpgu_regs.h" -static void arcpgu_fb_output_poll_changed(struct drm_device *dev) -{ - struct arcpgu_drm_private *arcpgu = dev->dev_private; - - drm_fbdev_cma_hotplug_event(arcpgu->fbdev); -} - static const struct drm_mode_config_funcs arcpgu_drm_modecfg_funcs = { .fb_create = drm_gem_fb_create, - .output_poll_changed = arcpgu_fb_output_poll_changed, + .output_poll_changed = drm_fb_helper_output_poll_changed, .atomic_check = drm_atomic_helper_check, .atomic_commit = drm_atomic_helper_commit, }; @@ -51,13 +45,6 @@ static void arcpgu_setup_mode_config(struct drm_device *drm) DEFINE_DRM_GEM_CMA_FOPS(arcpgu_drm_ops); -static void arcpgu_lastclose(struct drm_device *drm) -{ - struct arcpgu_drm_private *arcpgu = drm->dev_private; - - drm_fbdev_cma_restore_mode(arcpgu->fbdev); -} - static int arcpgu_load(struct drm_device *drm) { struct platform_device *pdev = to_platform_device(drm->dev); @@ -113,13 +100,9 @@ static int arcpgu_load(struct drm_device *drm) drm_mode_config_reset(drm); drm_kms_helper_poll_init(drm); - arcpgu->fbdev = drm_fbdev_cma_init(drm, 16, - drm->mode_config.num_connector); - if (IS_ERR(arcpgu->fbdev)) { - ret = PTR_ERR(arcpgu->fbdev); - arcpgu->fbdev = NULL; - return -ENODEV; - } + ret = drm_fb_cma_fbdev_init(drm, 16, 0); + if (ret) + return ret; platform_set_drvdata(pdev, drm); return 0; @@ -127,12 +110,7 @@ static int arcpgu_load(struct drm_device *drm) static int arcpgu_unload(struct drm_device *drm) { - struct arcpgu_drm_private *arcpgu = drm->dev_private; - - if (arcpgu->fbdev) { - drm_fbdev_cma_fini(arcpgu->fbdev); - arcpgu->fbdev = NULL; - } + drm_fb_cma_fbdev_fini(drm); drm_kms_helper_poll_fini(drm); drm_mode_config_cleanup(drm); @@ -167,7 +145,7 @@ static int arcpgu_debugfs_init(struct drm_minor *minor) static struct drm_driver arcpgu_drm_driver = { .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | DRIVER_ATOMIC, - .lastclose = arcpgu_lastclose, + .lastclose = drm_fb_helper_lastclose, .name = "arcpgu", .desc = "ARC PGU Controller", .date = "20160219",
Use drm_fb_cma_fbdev_init() and drm_fb_cma_fbdev_fini() which relies on the fact that drm_device holds a pointer to the drm_fb_helper structure. This means that the driver doesn't have to keep track of that. Also use the drm_fb_helper functions directly. Remove unused function prototype arcpgu_fbdev_cma_init(). Cc: Alexey Brodkin <abrodkin@synopsys.com> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> --- drivers/gpu/drm/arc/arcpgu.h | 4 ---- drivers/gpu/drm/arc/arcpgu_drv.c | 36 +++++++----------------------------- 2 files changed, 7 insertions(+), 33 deletions(-)