Commit 14d0066b authored by John Stultz's avatar John Stultz Committed by Xinliang Liu
Browse files

drm: kirin: Revert change to add register connect helper functions 

Daniel noted[1] that commit d606dc9a ("drm: kirin: Add
register connect helper functions in drm init") was unnecessary
and incorrect, as drm_dev_register does register connectors for
us.

Thus, this patch reverts the change as suggested by Daniel.

[1]: https://lore.kernel.org/lkml/CAKMK7uHr5U-pPsxdQ4MpfK5v8iLjphDFug_3VTiUAf06nhS=yQ@mail.gmail.com/



Cc: Xu YiPing <xuyiping@hisilicon.com>
Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinliang Liu <xinliang.liu@linaro.org>
Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Cc: Chen Feng <puck.chen@hisilicon.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarXinliang Liu <xinliang.liu@linaro.org>
Signed-off-by: default avatarXinliang Liu <xinliang.liu@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200409004306.18541-1-john.stultz@linaro.org
parent feea1aab

drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c

+0 −1
Original line number Diff line number Diff line
@@ -940,7 +940,6 @@ static struct drm_driver ade_driver = { 
};



struct kirin_drm_data ade_driver_data = {

	.register_connects = false,

	.num_planes = ADE_CH_NUM,

	.prim_plane = ADE_CH1,

	.channel_formats = channel_formats,

drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c

+0 −43
Original line number Diff line number Diff line
@@ -219,40 +219,6 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) 
	return 0;

}



static int kirin_drm_connectors_register(struct drm_device *dev)

{

	struct drm_connector *connector;

	struct drm_connector *failed_connector;

	struct drm_connector_list_iter conn_iter;

	int ret;



	mutex_lock(&dev->mode_config.mutex);

	drm_connector_list_iter_begin(dev, &conn_iter);

	drm_for_each_connector_iter(connector, &conn_iter) {

		ret = drm_connector_register(connector);

		if (ret) {

			failed_connector = connector;

			goto err;

		}

	}

	drm_connector_list_iter_end(&conn_iter);

	mutex_unlock(&dev->mode_config.mutex);



	return 0;



err:

	drm_connector_list_iter_begin(dev, &conn_iter);

	drm_for_each_connector_iter(connector, &conn_iter) {

		if (failed_connector == connector)

			break;

		drm_connector_unregister(connector);

	}

	drm_connector_list_iter_end(&conn_iter);

	mutex_unlock(&dev->mode_config.mutex);



	return ret;

}



static int kirin_drm_bind(struct device *dev)

{

	struct kirin_drm_data *driver_data;
@@ -277,19 +243,10 @@ static int kirin_drm_bind(struct device *dev) 
	if (ret)

		goto err_kms_cleanup;



	/* connectors should be registered after drm device register */

	if (driver_data->register_connects) {

		ret = kirin_drm_connectors_register(drm_dev);

		if (ret)

			goto err_drm_dev_unregister;

	}



	drm_fbdev_generic_setup(drm_dev, 32);



	return 0;



err_drm_dev_unregister:

	drm_dev_unregister(drm_dev);

err_kms_cleanup:

	kirin_drm_kms_cleanup(drm_dev);

err_drm_dev_put:

drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct kirin_drm_data { 
	u32 channel_formats_cnt;

	int config_max_width;

	int config_max_height;

	bool register_connects;

	u32 num_planes;

	u32 prim_plane;

CRA Git | Maintained and supported by SUSTech CRA and CCSE