Commit 4156bea3 authored by Jani Nikula's avatar Jani Nikula Committed by Yongbang Shi
Browse files

drm/hisilicon/hibmc: convert to struct drm_edid 

maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IBSNIA
CVE: NA

Reference: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ff2a391349afcf62e99897de9bfd854ecf9d21b8



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

Prefer the struct drm_edid based functions for reading the EDID and
updating the connector.

Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/386e3a64efbdd61c3eaed3f49ea9c3ebd4fcd41d.1715691257.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarBaihan Li <libaihan@huawei.com>
parent 9176bda5

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

+10 −7
Original line number Diff line number Diff line
@@ -23,14 +23,16 @@ 


static int hibmc_connector_get_modes(struct drm_connector *connector)

{

	int count;

	void *edid;

	struct hibmc_connector *hibmc_connector = to_hibmc_connector(connector);

	const struct drm_edid *drm_edid;

	int count;



	drm_edid = drm_edid_read_ddc(connector, &hibmc_connector->adapter);



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

	if (edid) {

		drm_connector_update_edid_property(connector, edid);

		count = drm_add_edid_modes(connector, edid);

	drm_edid_connector_update(connector, drm_edid);



	if (drm_edid) {

		count = drm_edid_connector_add_modes(connector);

		if (count)

			goto out;

	}
@@ -41,7 +43,8 @@ static int hibmc_connector_get_modes(struct drm_connector *connector) 
	drm_set_preferred_mode(connector, 1024, 768);



out:

	kfree(edid);

	drm_edid_free(drm_edid);



	return count;

}