Commit 4b0cf3be authored by Ma Hai's avatar Ma Hai Committed by Zheng Zengkai
Browse files

drm/hisilicon: Features to support reading resolutions from EDID 

mainline inclusion
from mainline-v5.12-rc2
commit a0d078d0
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4M6CD?from=project-issue
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/gpu/drm/hisilicon/hibmc?h=v5.12-rc2&id=a0d078d06e516184e2f575f3803935697b5e3ac6



----------------------------------------------------------------------

Use drm_get_edid to get the resolution, if that fails, set it to
a fixed resolution. Rewrite the desrtoy callback function to release
resources.

Signed-off-by: default avatarMa Hai <mahai1@huawei.com>
Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarLi Dongming <lidongming5@huawei.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1600778670-60370-3-git-send-email-tiantao6@hisilicon.com


Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 4a4aed7a

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c

+33 −4
Original line number Diff line number Diff line
@@ -21,12 +21,24 @@ 
static int hibmc_connector_get_modes(struct drm_connector *connector)

{

	int count;

	void *edid;

	struct hibmc_connector *hibmc_connector = to_hibmc_connector(connector);



	edid = drm_get_edid(connector, &hibmc_connector->adapter);

	if (edid) {

		drm_connector_update_edid_property(connector, edid);

		count = drm_add_edid_modes(connector, edid);

		if (count)

			goto out;

	}



	count = drm_add_modes_noedid(connector,

				     connector->dev->mode_config.max_width,

				     connector->dev->mode_config.max_height);

	drm_set_preferred_mode(connector, 1024, 768);



out:

	kfree(edid);

	return count;

}
@@ -36,6 +48,14 @@ static enum drm_mode_status hibmc_connector_mode_valid(struct drm_connector *con 
	return MODE_OK;

}



static void hibmc_connector_destroy(struct drm_connector *connector)

{

	struct hibmc_connector *hibmc_connector = to_hibmc_connector(connector);



	i2c_del_adapter(&hibmc_connector->adapter);

	drm_connector_cleanup(connector);

}



static const struct drm_connector_helper_funcs

	hibmc_connector_helper_funcs = {

	.get_modes = hibmc_connector_get_modes,
@@ -44,7 +64,7 @@ static const struct drm_connector_helper_funcs 


static const struct drm_connector_funcs hibmc_connector_funcs = {

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = drm_connector_cleanup,

	.destroy = hibmc_connector_destroy,

	.reset = drm_atomic_helper_connector_reset,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
@@ -77,10 +97,17 @@ static const struct drm_encoder_funcs hibmc_encoder_funcs = { 
int hibmc_vdac_init(struct hibmc_drm_private *priv)

{

	struct drm_device *dev = priv->dev;

	struct hibmc_connector *hibmc_connector = &priv->connector;

	struct drm_encoder *encoder = &priv->encoder;

	struct drm_connector *connector = &priv->connector.base;

	struct drm_connector *connector = &hibmc_connector->base;

	int ret;



	ret = hibmc_ddc_create(dev, hibmc_connector);

	if (ret) {

		drm_err(dev, "failed to create ddc: %d\n", ret);

		return ret;

	}



	encoder->possible_crtcs = 0x1;

	ret = drm_encoder_init(dev, encoder, &hibmc_encoder_funcs,

			       DRM_MODE_ENCODER_DAC, NULL);
@@ -91,8 +118,10 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) 


	drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs);



	ret = drm_connector_init(dev, connector, &hibmc_connector_funcs,

				 DRM_MODE_CONNECTOR_VGA);

	ret = drm_connector_init_with_ddc(dev, connector,

					  &hibmc_connector_funcs,

					  DRM_MODE_CONNECTOR_VGA,

					  &hibmc_connector->adapter);

	if (ret) {

		drm_err(dev, "failed to init connector: %d\n", ret);

		return ret;