Commit 60c376e4 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Neil Armstrong
Browse files

drm/imx/dcss: stop using drm_bridge_connector_en/disable_hpd() 



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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
[narmstrong: removed now unused kms var in dcss_dev_suspend|resume()]
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20221102180705.459294-5-dmitry.baryshkov@linaro.org
parent 92d755d8

drivers/gpu/drm/imx/dcss/dcss-dev.c

+0 −6
Original line number Diff line number Diff line
@@ -253,11 +253,8 @@ static int dcss_dev_suspend(struct device *dev) 
{

	struct dcss_dev *dcss = dcss_drv_dev_to_dcss(dev);

	struct drm_device *ddev = dcss_drv_dev_to_drm(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))
@@ -276,7 +273,6 @@ static int dcss_dev_resume(struct device *dev) 
{

	struct dcss_dev *dcss = dcss_drv_dev_to_dcss(dev);

	struct drm_device *ddev = dcss_drv_dev_to_drm(dev);

	struct dcss_kms_dev *kms = container_of(ddev, struct dcss_kms_dev, base);



	if (pm_runtime_suspended(dev)) {

		drm_mode_config_helper_resume(ddev);
@@ -291,8 +287,6 @@ static int dcss_dev_resume(struct device *dev) 


	drm_mode_config_helper_resume(ddev);



	drm_bridge_connector_enable_hpd(kms->connector);



	return 0;

}

drivers/gpu/drm/imx/dcss/dcss-kms.c

+0 −2
Original line number Diff line number Diff line
@@ -150,7 +150,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);
@@ -166,7 +165,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);