lkml.org 
[lkml]   [2019]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH v7 2/9] drm/i915/intel_hdmi: use cec_notifier_conn_(un)register
    From
    Date
    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 <darekm@google.com>
    > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    > Tested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    > ---
    > 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");
    > }
    >

    \
     
     \ /
      Last update: 2019-08-22 10:05    [W:4.413 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site