Re: [PATCH v7 2/9] drm/i915/intel_hdmi: use cec_notifier_conn_(un)register
On Wed, Aug 14, 2019 at 12:45:00PM +0200, Dariusz Marcinkiewicz wrote: > Use the new cec_notifier_conn_(un)register() functions to > (un)register the notifier for the HDMI connector, and fill in > the cec_connector_info. > > Signed-off-by: Dariusz Marcinkiewicz > Signed-off-by: Hans Verkuil > Tested-by: Hans Verkuil Reviewed-by: Ville Syrjälä > --- > drivers/gpu/drm/i915/display/intel_hdmi.c | 13 + > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > b/drivers/gpu/drm/i915/display/intel_hdmi.c > index b1ca8e5bdb56d..9fcf2c58c29c5 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -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); > } > @@ -3068,6 +3069,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)); > @@ -3120,8 +3122,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"); > } > -- > 2.23.0.rc1.153.gdeed80330f-goog -- Ville Syrjälä Intel ___ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v7 2/9] drm/i915/intel_hdmi: use cec_notifier_conn_(un)register
On 8/22/19 10:03 AM, Hans Verkuil wrote: > Ville or Rodrigo, > > Can one of you either merge this patch or Ack it so that I can merge this? Ping! Regards, Hans > > Thank you! > > Regards, > > Hans > > On 8/14/19 12:45 PM, Dariusz Marcinkiewicz wrote: >> Use the new cec_notifier_conn_(un)register() functions to >> (un)register the notifier for the HDMI connector, and fill in >> the cec_connector_info. >> >> Signed-off-by: Dariusz Marcinkiewicz >> Signed-off-by: Hans Verkuil >> Tested-by: Hans Verkuil >> --- >> drivers/gpu/drm/i915/display/intel_hdmi.c | 13 + >> 1 file changed, 9 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c >> b/drivers/gpu/drm/i915/display/intel_hdmi.c >> index b1ca8e5bdb56d..9fcf2c58c29c5 100644 >> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c >> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c >> @@ -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); >> } >> @@ -3068,6 +3069,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)); >> @@ -3120,8 +3122,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"); >> } >> > > ___ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel >
Re: [PATCH v7 2/9] drm/i915/intel_hdmi: use cec_notifier_conn_(un)register
Ville or Rodrigo, Can one of you either merge this patch or Ack it so that I can merge this? Thank you! Regards, Hans On 8/14/19 12:45 PM, Dariusz Marcinkiewicz wrote: > Use the new cec_notifier_conn_(un)register() functions to > (un)register the notifier for the HDMI connector, and fill in > the cec_connector_info. > > Signed-off-by: Dariusz Marcinkiewicz > Signed-off-by: Hans Verkuil > Tested-by: Hans Verkuil > --- > drivers/gpu/drm/i915/display/intel_hdmi.c | 13 + > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c > b/drivers/gpu/drm/i915/display/intel_hdmi.c > index b1ca8e5bdb56d..9fcf2c58c29c5 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdmi.c > +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c > @@ -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); > } > @@ -3068,6 +3069,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)); > @@ -3120,8 +3122,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"); > } >
[PATCH v7 2/9] drm/i915/intel_hdmi: use cec_notifier_conn_(un)register
Use the new cec_notifier_conn_(un)register() functions to (un)register the notifier for the HDMI connector, and fill in the cec_connector_info. Signed-off-by: Dariusz Marcinkiewicz Signed-off-by: Hans Verkuil Tested-by: Hans Verkuil --- drivers/gpu/drm/i915/display/intel_hdmi.c | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index b1ca8e5bdb56d..9fcf2c58c29c5 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -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); } @@ -3068,6 +3069,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)); @@ -3120,8 +3122,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"); } -- 2.23.0.rc1.153.gdeed80330f-goog