drm_dp_cec: add connector info support. (ae85b0df) · Commits · 戴 / test

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -416,7 +416,7 @@ void amdgpu_dm_initialize_dp_connector(struct amdgpu_display_manager *dm,

		drm_dp_aux_register(&aconnector->dm_dp_aux.aux);
		drm_dp_cec_register_connector(&aconnector->dm_dp_aux.aux,
		aconnector->base.name, dm->adev->dev);
		&aconnector->base);
		aconnector->mst_mgr.cbs = &dm_mst_cbs;
		drm_dp_mst_topology_mgr_init(
		&aconnector->mst_mgr,

drivers/gpu/drm/drm_dp_cec.c

+16 −9

Original line number	Diff line number	Diff line
		@@ -8,7 +8,9 @@
		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <linux/slab.h>
		#include <drm/drm_connector.h>
		#include <drm/drm_dp_helper.h>
		#include <drm/drmP.h>
		#include <media/cec.h>

		/*
		@@ -295,7 +297,10 @@ static void drm_dp_cec_unregister_work(struct work_struct *work)
		*/
		void drm_dp_cec_set_edid(struct drm_dp_aux aux, const struct edid edid)
		{
		u32 cec_caps = CEC_CAP_DEFAULTS \| CEC_CAP_NEEDS_HPD;
		struct drm_connector *connector = aux->cec.connector;
		u32 cec_caps = CEC_CAP_DEFAULTS \| CEC_CAP_NEEDS_HPD \|
		CEC_CAP_CONNECTOR_INFO;
		struct cec_connector_info conn_info;
		unsigned int num_las = 1;
		u8 cap;

		@@ -344,13 +349,17 @@ void drm_dp_cec_set_edid(struct drm_dp_aux aux, const struct edid edid)

		/* Create a new adapter */
		aux->cec.adap = cec_allocate_adapter(&drm_dp_cec_adap_ops,
		aux, aux->cec.name, cec_caps,
		aux, connector->name, cec_caps,
		num_las);
		if (IS_ERR(aux->cec.adap)) {
		aux->cec.adap = NULL;
		goto unlock;
		}
		if (cec_register_adapter(aux->cec.adap, aux->cec.parent)) {

		cec_fill_conn_info_from_drm(&conn_info, connector);
		cec_s_conn_info(aux->cec.adap, &conn_info);

		if (cec_register_adapter(aux->cec.adap, connector->dev->dev)) {
		cec_delete_adapter(aux->cec.adap);
		aux->cec.adap = NULL;
		} else {
		@@ -406,22 +415,20 @@ EXPORT_SYMBOL(drm_dp_cec_unset_edid);
		/**
		* drm_dp_cec_register_connector() - register a new connector
		* @aux: DisplayPort AUX channel
		* @name: name of the CEC device
		* @parent: parent device
		* @connector: drm connector
		*
		* A new connector was registered with associated CEC adapter name and
		* CEC adapter parent device. After registering the name and parent
		* drm_dp_cec_set_edid() is called to check if the connector supports
		* CEC and to register a CEC adapter if that is the case.
		*/
		void drm_dp_cec_register_connector(struct drm_dp_aux aux, const char name,
		struct device *parent)
		void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
		struct drm_connector *connector)
		{
		WARN_ON(aux->cec.adap);
		if (WARN_ON(!aux->transfer))
		return;
		aux->cec.name = name;
		aux->cec.parent = parent;
		aux->cec.connector = connector;
		INIT_DELAYED_WORK(&aux->cec.unregister_work,
		drm_dp_cec_unregister_work);
		}

drivers/gpu/drm/i915/display/intel_dp.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -5693,7 +5693,6 @@ static int
		intel_dp_connector_register(struct drm_connector *connector)
		{
		struct intel_dp *intel_dp = intel_attached_dp(connector);
		struct drm_device *dev = connector->dev;
		int ret;

		ret = intel_connector_register(connector);
		@@ -5708,8 +5707,7 @@ intel_dp_connector_register(struct drm_connector *connector)
		intel_dp->aux.dev = connector->kdev;
		ret = drm_dp_aux_register(&intel_dp->aux);
		if (!ret)
		drm_dp_cec_register_connector(&intel_dp->aux,
		connector->name, dev->dev);
		drm_dp_cec_register_connector(&intel_dp->aux, connector);
		return ret;
		}

drivers/gpu/drm/nouveau/nouveau_connector.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1416,8 +1416,7 @@ nouveau_connector_create(struct drm_device *dev,
		switch (type) {
		case DRM_MODE_CONNECTOR_DisplayPort:
		case DRM_MODE_CONNECTOR_eDP:
		drm_dp_cec_register_connector(&nv_connector->aux,
		connector->name, dev->dev);
		drm_dp_cec_register_connector(&nv_connector->aux, connector);
		break;
		}

include/drm/drm_dp_helper.h

+8 −9

Original line number	Diff line number	Diff line
		@@ -1230,20 +1230,19 @@ struct drm_dp_aux_msg {

		struct cec_adapter;
		struct edid;
		struct drm_connector;

		/**
		* struct drm_dp_aux_cec - DisplayPort CEC-Tunneling-over-AUX
		* @lock: mutex protecting this struct
		* @adap: the CEC adapter for CEC-Tunneling-over-AUX support.
		* @name: name of the CEC adapter
		* @parent: parent device of the CEC adapter
		* @connector: the connector this CEC adapter is associated with
		* @unregister_work: unregister the CEC adapter
		*/
		struct drm_dp_aux_cec {
		struct mutex lock;
		struct cec_adapter *adap;
		const char *name;
		struct device *parent;
		struct drm_connector *connector;
		struct delayed_work unregister_work;
		};

		@@ -1451,8 +1450,8 @@ drm_dp_has_quirk(const struct drm_dp_desc *desc, enum drm_dp_quirk quirk)

		#ifdef CONFIG_DRM_DP_CEC
		void drm_dp_cec_irq(struct drm_dp_aux *aux);
		void drm_dp_cec_register_connector(struct drm_dp_aux aux, const char name,
		struct device *parent);
		void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
		struct drm_connector *connector);
		void drm_dp_cec_unregister_connector(struct drm_dp_aux *aux);
		void drm_dp_cec_set_edid(struct drm_dp_aux aux, const struct edid edid);
		void drm_dp_cec_unset_edid(struct drm_dp_aux *aux);
		@@ -1461,9 +1460,9 @@ static inline void drm_dp_cec_irq(struct drm_dp_aux *aux)
		{
		}

		static inline void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
		const char *name,
		struct device *parent)
		static inline void
		drm_dp_cec_register_connector(struct drm_dp_aux *aux,
		struct drm_connector *connector)
		{
		}

Admin message