Re: [PATCH 07/20] drm/rcar-du: Use drm_fbdev_generic_setup()

[Noralf Trønnes <noralf@xxxxxxxxxxx>]

Den 09.09.2018 16.13, skrev Laurent Pinchart:
> Hi Noralf,
>
> Thank you for the patch.
>
> On Saturday, 8 September 2018 16:46:35 EEST Noralf Trønnes wrote:
> > The CMA helper is already using the drm_fb_helper_generic_probe part of
> > the generic fbdev emulation. This patch makes full use of the generic
> > fbdev emulation by using its drm_client callbacks. This means that
> > drm_mode_config_funcs->output_poll_changed and drm_driver->lastclose are
> > now handled by the emulation code. Additionally fbdev unregister happens
> > automatically on drm_dev_unregister().
> >
> > The drm_fbdev_generic_setup() call is put after drm_dev_register() in the
> > driver. This is done to highlight the fact that fbdev emulation is an
> > internal client that makes use of the driver, it is not part of the
> > driver as such. If fbdev setup fails, an error is printed, but the driver
> > succeeds probing.
> >
> > Use the drm_mode_config_helper_suspend/resume helpers instead of open
> > coding it.
> As Sam already pointed out, shouldn't this change be split to a separate patch
> ?

I can split it up in the next round.

> Apart from that this patch looks good to me.
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
>
> I assume you will push the entire series through drm-misc. If you'd like me to
> take this patch in my tree instead please let me know.

Yes I plan to do that unless someone specifically says that they'll take
through their tree.

Noralf.

> > drm_fbdev_generic_setup() handles mode_config.num_connector being zero.
> > In that case it retries fbdev setup on the next .output_poll_changed.
> >
> > Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> > Signed-off-by: Noralf Trønnes <noralf@xxxxxxxxxxx>
> > ---
> >   drivers/gpu/drm/rcar-du/rcar_du_drv.c | 34 ++++++--------------------------
> >   drivers/gpu/drm/rcar-du/rcar_du_drv.h |  3 ---
> >   drivers/gpu/drm/rcar-du/rcar_du_kms.c | 21 ---------------------
> >   3 files changed, 6 insertions(+), 52 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 02aee6cb0e53..bcb01d7b4a89
> > 100644
> > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
> > @@ -25,7 +25,9 @@
> >   #include <drm/drm_atomic_helper.h>
> >   #include <drm/drm_crtc_helper.h>
> >   #include <drm/drm_fb_cma_helper.h>
> > +#include <drm/drm_fb_helper.h>
> >   #include <drm/drm_gem_cma_helper.h>
> > +#include <drm/drm_modeset_helper.h>
> >
> >   #include "rcar_du_drv.h"
> >   #include "rcar_du_kms.h"
> > @@ -316,19 +318,11 @@ MODULE_DEVICE_TABLE(of, rcar_du_of_table);
> >    * DRM operations
> >    */
> >
> > -static void rcar_du_lastclose(struct drm_device *dev)
> > -{
> > -	struct rcar_du_device *rcdu = dev->dev_private;
> > -
> > -	drm_fbdev_cma_restore_mode(rcdu->fbdev);
> > -}
> > -
> >   DEFINE_DRM_GEM_CMA_FOPS(rcar_du_fops);
> >
> >   static struct drm_driver rcar_du_driver = {
> >   	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME
> >
> >   				| DRIVER_ATOMIC,
> >
> > -	.lastclose		= rcar_du_lastclose,
> >   	.gem_free_object_unlocked = drm_gem_cma_free_object,
> >   	.gem_vm_ops		= &drm_gem_cma_vm_ops,
> >   	.prime_handle_to_fd	= drm_gem_prime_handle_to_fd,
> > @@ -357,30 +351,15 @@ static struct drm_driver rcar_du_driver = {
> >   static int rcar_du_pm_suspend(struct device *dev)
> >   {
> >   	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
> > -	struct drm_atomic_state *state;
> >
> > -	drm_kms_helper_poll_disable(rcdu->ddev);
> > -	drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true);
> > -
> > -	state = drm_atomic_helper_suspend(rcdu->ddev);
> > -	if (IS_ERR(state)) {
> > -		drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
> > -		drm_kms_helper_poll_enable(rcdu->ddev);
> > -		return PTR_ERR(state);
> > -	}
> > -
> > -	rcdu->suspend_state = state;
> > -
> > -	return 0;
> > +	return drm_mode_config_helper_suspend(rcdu->ddev);
> >   }
> >
> >   static int rcar_du_pm_resume(struct device *dev)
> >   {
> >   	struct rcar_du_device *rcdu = dev_get_drvdata(dev);
> >
> > -	drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state);
> > -	drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false);
> > -	drm_kms_helper_poll_enable(rcdu->ddev);
> > +	drm_mode_config_helper_resume(rcdu->ddev);
> >
> >   	return 0;
> >   }
> > @@ -401,9 +380,6 @@ static int rcar_du_remove(struct platform_device *pdev)
> >
> >   	drm_dev_unregister(ddev);
> >
> > -	if (rcdu->fbdev)
> > -		drm_fbdev_cma_fini(rcdu->fbdev);
> > -
> >   	drm_kms_helper_poll_fini(ddev);
> >   	drm_mode_config_cleanup(ddev);
> >
> > @@ -463,6 +439,8 @@ static int rcar_du_probe(struct platform_device *pdev)
> >
> >   	DRM_INFO("Device %s probed\n", dev_name(&pdev->dev));
> >
> > +	drm_fbdev_generic_setup(ddev, 32);
> > +
> >   	return 0;
> >
> >   error:
> > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
> > b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8e07d0..58d5c730d2d2
> > 100644
> > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
> > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
> > @@ -24,7 +24,6 @@
> >   struct clk;
> >   struct device;
> >   struct drm_device;
> > -struct drm_fbdev_cma;
> >   struct rcar_du_device;
> >
> >   #define RCAR_DU_FEATURE_CRTC_IRQ_CLOCK	(1 << 0)	/* Per-CRTC IRQ and clock
> > */ @@ -77,8 +76,6 @@ struct rcar_du_device {
> >   	void __iomem *mmio;
> >
> >   	struct drm_device *ddev;
> > -	struct drm_fbdev_cma *fbdev;
> > -	struct drm_atomic_state *suspend_state;
> >
> >   	struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS];
> >   	unsigned int num_crtcs;
> > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> > b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index f0bc7cc0e913..19dfe4bf5446
> > 100644
> > --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> > +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
> > @@ -216,13 +216,6 @@ rcar_du_fb_create(struct drm_device *dev, struct
> > drm_file *file_priv, return drm_gem_fb_create(dev, file_priv, mode_cmd);
> >   }
> >
> > -static void rcar_du_output_poll_changed(struct drm_device *dev)
> > -{
> > -	struct rcar_du_device *rcdu = dev->dev_private;
> > -
> > -	drm_fbdev_cma_hotplug_event(rcdu->fbdev);
> > -}
> > -
> >   /*
> > ---------------------------------------------------------------------------
> > -- * Atomic Check and Update
> >    */
> > @@ -269,7 +262,6 @@ static const struct drm_mode_config_helper_funcs
> > rcar_du_mode_config_helper = {
> >
> >   static const struct drm_mode_config_funcs rcar_du_mode_config_funcs = {
> >   	.fb_create = rcar_du_fb_create,
> > -	.output_poll_changed = rcar_du_output_poll_changed,
> >   	.atomic_check = rcar_du_atomic_check,
> >   	.atomic_commit = drm_atomic_helper_commit,
> >   };
> > @@ -504,7 +496,6 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
> >
> >   	struct drm_device *dev = rcdu->ddev;
> >   	struct drm_encoder *encoder;
> > -	struct drm_fbdev_cma *fbdev;
> >   	unsigned int num_encoders;
> >   	unsigned int num_groups;
> >   	unsigned int swindex;
> > @@ -621,17 +612,5 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
> >
> >   	drm_kms_helper_poll_init(dev);
> >
> > -	if (dev->mode_config.num_connector) {
> > -		fbdev = drm_fbdev_cma_init(dev, 32,
> > -					   dev->mode_config.num_connector);
> > -		if (IS_ERR(fbdev))
> > -			return PTR_ERR(fbdev);
> > -
> > -		rcdu->fbdev = fbdev;
> > -	} else {
> > -		dev_info(rcdu->dev,
> > -			 "no connector found, disabling fbdev emulation\n");
> > -	}
> > -
> >   	return 0;
> >   }

_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel