Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4eab8136 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: extract connector update from intel_ddc_get_modes() for reuse 



Refactor the connector update part of intel_ddc_get_modes() into a separate
intel_connector_update_modes() function for reuse. No functional changes.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=45881


Tested-by: default avatarAlex Ferrando <alferpal@gmail.com>
Cc: stable@vger.kernel.org (for 3.4+3.5)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a843af18

drivers/gpu/drm/i915/intel_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -342,6 +342,8 @@ struct intel_fbc_work { 
	int interval;

};



int intel_connector_update_modes(struct drm_connector *connector,

				struct edid *edid);

int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter);



extern void intel_attach_force_audio_property(struct drm_connector *connector);

drivers/gpu/drm/i915/intel_modes.c

+22 −9
Original line number Diff line number Diff line
@@ -32,6 +32,25 @@ 
#include "intel_drv.h"

#include "i915_drv.h"



/**

 * intel_connector_update_modes - update connector from edid

 * @connector: DRM connector device to use

 * @edid: previously read EDID information

 */

int intel_connector_update_modes(struct drm_connector *connector,

				struct edid *edid)

{

	int ret;



	drm_mode_connector_update_edid_property(connector, edid);

	ret = drm_add_edid_modes(connector, edid);

	drm_edid_to_eld(connector, edid);

	connector->display_info.raw_edid = NULL;

	kfree(edid);



	return ret;

}



/**

 * intel_ddc_get_modes - get modelist from monitor

 * @connector: DRM connector device to use
@@ -43,18 +62,12 @@ int intel_ddc_get_modes(struct drm_connector *connector, 
			struct i2c_adapter *adapter)

{

	struct edid *edid;

	int ret = 0;



	edid = drm_get_edid(connector, adapter);

	if (edid) {

		drm_mode_connector_update_edid_property(connector, edid);

		ret = drm_add_edid_modes(connector, edid);

		drm_edid_to_eld(connector, edid);

		connector->display_info.raw_edid = NULL;

		kfree(edid);

	}

	if (!edid)

		return 0;



	return ret;

	return intel_connector_update_modes(connector, edid);

}



static const struct drm_prop_enum_list force_audio_names[] = {