| Message ID | 9fcb81f939a6c4f09204f084519bf29d993b005a.1687423204.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | drm: renesas: shmobile: Atomic conversion + DT support | expand |
Hi Geert, Thank you for the patch. On Thu, Jun 22, 2023 at 11:21:50AM +0200, Geert Uytterhoeven wrote: > Complete the conversion to atomic mode setting by converting the > connector, and setting the DRIVER_ATOMIC flag. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 5 +---- > drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- > 2 files changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > index f2332bb0fbbd51a1..17456dde57637ab8 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c > @@ -574,7 +574,6 @@ static void shmob_drm_connector_destroy(struct drm_connector *connector) > } > > static const struct drm_connector_funcs connector_funcs = { > - .dpms = drm_helper_connector_dpms, > .reset = drm_atomic_helper_connector_reset, > .fill_modes = drm_helper_probe_single_connector_modes, > .destroy = shmob_drm_connector_destroy, > @@ -644,9 +643,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev, > if (ret < 0) > goto error; > > - drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); > - drm_object_property_set_value(&connector->base, > - sdev->ddev.mode_config.dpms_property, DRM_MODE_DPMS_OFF); > + connector->dpms = DRM_MODE_DPMS_OFF; > > sdev->connector = connector; > > diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c > index c43f408d6b1fcc5b..576869164479ec6b 100644 > --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c > +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c > @@ -98,7 +98,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg) > DEFINE_DRM_GEM_DMA_FOPS(shmob_drm_fops); > > static const struct drm_driver shmob_drm_driver = { > - .driver_features = DRIVER_GEM | DRIVER_MODESET, > + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, > DRM_GEM_DMA_DRIVER_OPS, > .fops = &shmob_drm_fops, > .name = "shmob-drm",
diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c index f2332bb0fbbd51a1..17456dde57637ab8 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c @@ -574,7 +574,6 @@ static void shmob_drm_connector_destroy(struct drm_connector *connector) } static const struct drm_connector_funcs connector_funcs = { - .dpms = drm_helper_connector_dpms, .reset = drm_atomic_helper_connector_reset, .fill_modes = drm_helper_probe_single_connector_modes, .destroy = shmob_drm_connector_destroy, @@ -644,9 +643,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev, if (ret < 0) goto error; - drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF); - drm_object_property_set_value(&connector->base, - sdev->ddev.mode_config.dpms_property, DRM_MODE_DPMS_OFF); + connector->dpms = DRM_MODE_DPMS_OFF; sdev->connector = connector; diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index c43f408d6b1fcc5b..576869164479ec6b 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -98,7 +98,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg) DEFINE_DRM_GEM_DMA_FOPS(shmob_drm_fops); static const struct drm_driver shmob_drm_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, DRM_GEM_DMA_DRIVER_OPS, .fops = &shmob_drm_fops, .name = "shmob-drm",
Complete the conversion to atomic mode setting by converting the connector, and setting the DRIVER_ATOMIC flag. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 5 +---- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)