drm/edid: move drm_connector_update_edid_property() to drm_edid.c (02b16fbc) · Commits · jan.koester / Linux

drivers/gpu/drm/drm_connector.c

+0 −74

Original line number	Original line	Diff line number	Diff line
	@@ -2077,80 +2077,6 @@ int drm_connector_set_tile_property(struct drm_connector *connector)
	}		}
	EXPORT_SYMBOL(drm_connector_set_tile_property);		EXPORT_SYMBOL(drm_connector_set_tile_property);

	/**
	* drm_connector_update_edid_property - update the edid property of a connector
	* @connector: drm connector
	* @edid: new value of the edid property
	*
	* This function creates a new blob modeset object and assigns its id to the
	* connector's edid property.
	* Since we also parse tile information from EDID's displayID block, we also
	* set the connector's tile property here. See drm_connector_set_tile_property()
	* for more details.
	*
	* Returns:
	* Zero on success, negative errno on failure.
	*/
	int drm_connector_update_edid_property(struct drm_connector *connector,
	const struct edid *edid)
	{
	struct drm_device *dev = connector->dev;
	size_t size = 0;
	int ret;
	const struct edid *old_edid;

	/* ignore requests to set edid when overridden */
	if (connector->override_edid)
	return 0;

	if (edid)
	size = EDID_LENGTH * (1 + edid->extensions);

	/* Set the display info, using edid if available, otherwise
	* resetting the values to defaults. This duplicates the work
	* done in drm_add_edid_modes, but that function is not
	* consistently called before this one in all drivers and the
	* computation is cheap enough that it seems better to
	* duplicate it rather than attempt to ensure some arbitrary
	* ordering of calls.
	*/
	if (edid)
	drm_add_display_info(connector, edid);
	else
	drm_reset_display_info(connector);

	drm_update_tile_info(connector, edid);

	if (connector->edid_blob_ptr) {
	old_edid = (const struct edid *)connector->edid_blob_ptr->data;
	if (old_edid) {
	if (!drm_edid_are_equal(edid, old_edid)) {
	DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Edid was changed.\n",
	connector->base.id, connector->name);

	connector->epoch_counter += 1;
	DRM_DEBUG_KMS("Updating change counter to %llu\n",
	connector->epoch_counter);
	}
	}
	}

	drm_object_property_set_value(&connector->base,
	dev->mode_config.non_desktop_property,
	connector->display_info.non_desktop);

	ret = drm_property_replace_global_blob(dev,
	&connector->edid_blob_ptr,
	size,
	edid,
	&connector->base,
	dev->mode_config.edid_property);
	if (ret)
	return ret;
	return drm_connector_set_tile_property(connector);
	}
	EXPORT_SYMBOL(drm_connector_update_edid_property);

	/**		/**
	* drm_connector_set_link_status_property - Set link status property of a connector		* drm_connector_set_link_status_property - Set link status property of a connector
	* @connector: drm connector		* @connector: drm connector

drivers/gpu/drm/drm_crtc_internal.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -286,6 +286,3 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,

	/* drm_edid.c */		/* drm_edid.c */
	void drm_mode_fixup_1366x768(struct drm_display_mode *mode);		void drm_mode_fixup_1366x768(struct drm_display_mode *mode);
	void drm_reset_display_info(struct drm_connector *connector);
	u32 drm_add_display_info(struct drm_connector connector, const struct edid edid);
	void drm_update_tile_info(struct drm_connector connector, const struct edid edid);

drivers/gpu/drm/drm_edid.c

+81 −5

Original line number	Original line	Diff line number	Diff line
	@@ -5928,8 +5928,7 @@ static void drm_update_mso(struct drm_connector *connector,
	/* A connector has no EDID information, so we've got no EDID to compute quirks from. Reset		/* A connector has no EDID information, so we've got no EDID to compute quirks from. Reset
	* all of the values which would have been set from EDID		* all of the values which would have been set from EDID
	*/		*/
	void		static void drm_reset_display_info(struct drm_connector *connector)
	drm_reset_display_info(struct drm_connector *connector)
	{		{
	struct drm_display_info *info = &connector->display_info;		struct drm_display_info *info = &connector->display_info;

	@@ -6043,7 +6042,7 @@ static u32 update_display_info(struct drm_connector *connector,
	return quirks;		return quirks;
	}		}

	u32 drm_add_display_info(struct drm_connector connector, const struct edid edid)		static u32 drm_add_display_info(struct drm_connector connector, const struct edid edid)
	{		{
	struct drm_edid drm_edid;		struct drm_edid drm_edid;

	@@ -6207,6 +6206,83 @@ static int drm_edid_connector_update(struct drm_connector *connector,
	return num_modes;		return num_modes;
	}		}

			static void drm_update_tile_info(struct drm_connector *connector,
			const struct edid *edid);

			/**
			* drm_connector_update_edid_property - update the edid property of a connector
			* @connector: drm connector
			* @edid: new value of the edid property
			*
			* This function creates a new blob modeset object and assigns its id to the
			* connector's edid property.
			* Since we also parse tile information from EDID's displayID block, we also
			* set the connector's tile property here. See drm_connector_set_tile_property()
			* for more details.
			*
			* Returns:
			* Zero on success, negative errno on failure.
			*/
			int drm_connector_update_edid_property(struct drm_connector *connector,
			const struct edid *edid)
			{
			struct drm_device *dev = connector->dev;
			size_t size = 0;
			int ret;
			const struct edid *old_edid;

			/* ignore requests to set edid when overridden */
			if (connector->override_edid)
			return 0;

			if (edid)
			size = EDID_LENGTH * (1 + edid->extensions);

			/*
			* Set the display info, using edid if available, otherwise resetting
			* the values to defaults. This duplicates the work done in
			* drm_add_edid_modes, but that function is not consistently called
			* before this one in all drivers and the computation is cheap enough
			* that it seems better to duplicate it rather than attempt to ensure
			* some arbitrary ordering of calls.
			*/
			if (edid)
			drm_add_display_info(connector, edid);
			else
			drm_reset_display_info(connector);

			drm_update_tile_info(connector, edid);

			if (connector->edid_blob_ptr) {
			old_edid = (const struct edid *)connector->edid_blob_ptr->data;
			if (old_edid) {
			if (!drm_edid_are_equal(edid, old_edid)) {
			DRM_DEBUG_KMS("[CONNECTOR:%d:%s] Edid was changed.\n",
			connector->base.id, connector->name);

			connector->epoch_counter += 1;
			DRM_DEBUG_KMS("Updating change counter to %llu\n",
			connector->epoch_counter);
			}
			}
			}

			drm_object_property_set_value(&connector->base,
			dev->mode_config.non_desktop_property,
			connector->display_info.non_desktop);

			ret = drm_property_replace_global_blob(dev,
			&connector->edid_blob_ptr,
			size,
			edid,
			&connector->base,
			dev->mode_config.edid_property);
			if (ret)
			return ret;
			return drm_connector_set_tile_property(connector);
			}
			EXPORT_SYMBOL(drm_connector_update_edid_property);

	/**		/**
	* drm_add_edid_modes - add modes from EDID data, if available		* drm_add_edid_modes - add modes from EDID data, if available
	* @connector: connector we're probing		* @connector: connector we're probing
	@@ -6645,7 +6721,7 @@ static void _drm_update_tile_info(struct drm_connector *connector,
	}		}
	}		}

	void drm_update_tile_info(struct drm_connector *connector,		static void drm_update_tile_info(struct drm_connector *connector,
	const struct edid *edid)		const struct edid *edid)
	{		{
	struct drm_edid drm_edid;		struct drm_edid drm_edid;