drm/i915/intel_hdmi: use cec_notifier_conn_(un)register (5558f3d5) · Commits · 戴 / test

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

+9 −4

Original line number	Diff line number	Diff line
		@@ -2752,8 +2752,9 @@ intel_hdmi_connector_register(struct drm_connector *connector)

		static void intel_hdmi_destroy(struct drm_connector *connector)
		{
		if (intel_attached_hdmi(connector)->cec_notifier)
		cec_notifier_put(intel_attached_hdmi(connector)->cec_notifier);
		struct cec_notifier *n = intel_attached_hdmi(connector)->cec_notifier;

		cec_notifier_conn_unregister(n);

		intel_connector_destroy(connector);
		}
		@@ -3085,6 +3086,7 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
		struct drm_device *dev = intel_encoder->base.dev;
		struct drm_i915_private *dev_priv = to_i915(dev);
		enum port port = intel_encoder->port;
		struct cec_connector_info conn_info;

		DRM_DEBUG_KMS("Adding HDMI connector on port %c\n",
		port_name(port));
		@@ -3137,8 +3139,11 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port,
		I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) \| 0xd);
		}

		intel_hdmi->cec_notifier = cec_notifier_get_conn(dev->dev,
		port_identifier(port));
		cec_fill_conn_info_from_drm(&conn_info, connector);

		intel_hdmi->cec_notifier =
		cec_notifier_conn_register(dev->dev, port_identifier(port),
		&conn_info);
		if (!intel_hdmi->cec_notifier)
		DRM_DEBUG_KMS("CEC notifier get failed\n");
		}