| Message ID | 20221102180705.459294-5-dmitry.baryshkov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,1/7] drm/poll-helper: merge drm_kms_helper_poll_disable() and _fini() | expand |
On 02/11/2022 19:07, Dmitry Baryshkov wrote: > The functionality of drm_bridge_connector_enable_hpd() and > drm_bridge_connector_disable_hpd() is provided automatically by the > drm_kms_poll helpers. Stop calling these functions manually. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/imx/dcss/dcss-dev.c | 4 ---- > drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 -- > 2 files changed, 6 deletions(-) > > diff --git a/drivers/gpu/drm/imx/dcss/dcss-dev.c b/drivers/gpu/drm/imx/dcss/dcss-dev.c > index 3f5750cc2673..0d8e44f20ec4 100644 > --- a/drivers/gpu/drm/imx/dcss/dcss-dev.c > +++ b/drivers/gpu/drm/imx/dcss/dcss-dev.c > @@ -257,8 +257,6 @@ int dcss_dev_suspend(struct device *dev) > struct dcss_kms_dev *kms = container_of(ddev, struct dcss_kms_dev, base); > int ret; > > - drm_bridge_connector_disable_hpd(kms->connector); > - > drm_mode_config_helper_suspend(ddev); > > if (pm_runtime_suspended(dev)) > @@ -292,8 +290,6 @@ int dcss_dev_resume(struct device *dev) > > drm_mode_config_helper_resume(ddev); > > - drm_bridge_connector_enable_hpd(kms->connector); > - > return 0; > } > #endif /* CONFIG_PM_SLEEP */ > diff --git a/drivers/gpu/drm/imx/dcss/dcss-kms.c b/drivers/gpu/drm/imx/dcss/dcss-kms.c > index b4f82ebca532..16ef8aa6da37 100644 > --- a/drivers/gpu/drm/imx/dcss/dcss-kms.c > +++ b/drivers/gpu/drm/imx/dcss/dcss-kms.c > @@ -151,7 +151,6 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss) > return kms; > > cleanup_crtc: > - drm_bridge_connector_disable_hpd(kms->connector); > drm_kms_helper_poll_fini(drm); > dcss_crtc_deinit(crtc, drm); > > @@ -167,7 +166,6 @@ void dcss_kms_detach(struct dcss_kms_dev *kms) > struct drm_device *drm = &kms->base; > > drm_dev_unregister(drm); > - drm_bridge_connector_disable_hpd(kms->connector); > drm_kms_helper_poll_fini(drm); > drm_atomic_helper_shutdown(drm); > drm_crtc_vblank_off(&kms->crtc.base); I get: /drivers/gpu/drm/imx/dcss/dcss-dev.c: In function ‘dcss_dev_suspend’: /drivers/gpu/drm/imx/dcss/dcss-dev.c:256:23: warning: unused variable ‘kms’ [-Wunused-variable] 256 | struct dcss_kms_dev *kms = container_of(ddev, struct dcss_kms_dev, base); | ^~~ /drivers/gpu/drm/imx/dcss/dcss-dev.c: In function ‘dcss_dev_resume’: /drivers/gpu/drm/imx/dcss/dcss-dev.c:277:23: warning: unused variable ‘kms’ [-Wunused-variable] 277 | struct dcss_kms_dev *kms = container_of(ddev, struct dcss_kms_dev, base); | ^~~ I'll fix while applying, Neil
diff --git a/drivers/gpu/drm/imx/dcss/dcss-dev.c b/drivers/gpu/drm/imx/dcss/dcss-dev.c index 3f5750cc2673..0d8e44f20ec4 100644 --- a/drivers/gpu/drm/imx/dcss/dcss-dev.c +++ b/drivers/gpu/drm/imx/dcss/dcss-dev.c @@ -257,8 +257,6 @@ int dcss_dev_suspend(struct device *dev) struct dcss_kms_dev *kms = container_of(ddev, struct dcss_kms_dev, base); int ret; - drm_bridge_connector_disable_hpd(kms->connector); - drm_mode_config_helper_suspend(ddev); if (pm_runtime_suspended(dev)) @@ -292,8 +290,6 @@ int dcss_dev_resume(struct device *dev) drm_mode_config_helper_resume(ddev); - drm_bridge_connector_enable_hpd(kms->connector); - return 0; } #endif /* CONFIG_PM_SLEEP */ diff --git a/drivers/gpu/drm/imx/dcss/dcss-kms.c b/drivers/gpu/drm/imx/dcss/dcss-kms.c index b4f82ebca532..16ef8aa6da37 100644 --- a/drivers/gpu/drm/imx/dcss/dcss-kms.c +++ b/drivers/gpu/drm/imx/dcss/dcss-kms.c @@ -151,7 +151,6 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss) return kms; cleanup_crtc: - drm_bridge_connector_disable_hpd(kms->connector); drm_kms_helper_poll_fini(drm); dcss_crtc_deinit(crtc, drm); @@ -167,7 +166,6 @@ void dcss_kms_detach(struct dcss_kms_dev *kms) struct drm_device *drm = &kms->base; drm_dev_unregister(drm); - drm_bridge_connector_disable_hpd(kms->connector); drm_kms_helper_poll_fini(drm); drm_atomic_helper_shutdown(drm); drm_crtc_vblank_off(&kms->crtc.base);
The functionality of drm_bridge_connector_enable_hpd() and drm_bridge_connector_disable_hpd() is provided automatically by the drm_kms_poll helpers. Stop calling these functions manually. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/gpu/drm/imx/dcss/dcss-dev.c | 4 ---- drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 -- 2 files changed, 6 deletions(-)