From: Neil Armstrong <narmstrong@baylibre.com> To: Hans Verkuil <hverkuil@xs4all.nl>, airlied@linux.ie, hans.verkuil@cisco.com, lee.jones@linaro.org, olof@lixom.net, seanpaul@google.com Cc: sadolfsson@google.com, felixe@google.com, bleung@google.com, darekm@google.com, marcheu@chromium.org, fparent@baylibre.com, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH 3/5] drm/i915: hdmi: add CEC notifier to intel_hdmi Date: Tue, 15 May 2018 09:30:32 +0200 [thread overview] Message-ID: <85da38a7-f396-882a-723e-437cc53d9c63@baylibre.com> (raw) In-Reply-To: <b38aa2db-903a-c882-69d6-170b3c2aa70c@xs4all.nl> On 15/05/2018 08:29, Hans Verkuil wrote: > On 05/15/2018 12:40 AM, Neil Armstrong wrote: >> This patchs adds the cec_notifier feature to the intel_hdmi part >> of the i915 DRM driver. It uses the HDMI DRM connector name to differentiate >> between each HDMI ports. >> The changes will allow the i915 HDMI code to notify EDID and HPD changes >> to an eventual CEC adapter. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> drivers/gpu/drm/i915/intel_drv.h | 2 ++ >> drivers/gpu/drm/i915/intel_hdmi.c | 10 ++++++++++ >> 2 files changed, 12 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h >> index d436858..b50e51b 100644 >> --- a/drivers/gpu/drm/i915/intel_drv.h >> +++ b/drivers/gpu/drm/i915/intel_drv.h >> @@ -39,6 +39,7 @@ >> #include <drm/drm_dp_mst_helper.h> >> #include <drm/drm_rect.h> >> #include <drm/drm_atomic.h> >> +#include <media/cec-notifier.h> >> >> /** >> * __wait_for - magic wait macro >> @@ -1001,6 +1002,7 @@ struct intel_hdmi { >> bool has_audio; >> bool rgb_quant_range_selectable; >> struct intel_connector *attached_connector; >> + struct cec_notifier *notifier; >> }; >> >> struct intel_dp_mst_encoder; >> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c >> index 1baef4a..9b94d72 100644 >> --- a/drivers/gpu/drm/i915/intel_hdmi.c >> +++ b/drivers/gpu/drm/i915/intel_hdmi.c >> @@ -1868,6 +1868,8 @@ intel_hdmi_set_edid(struct drm_connector *connector) >> connected = true; >> } >> >> + cec_notifier_set_phys_addr_from_edid(intel_hdmi->notifier, edid); >> + >> return connected; >> } >> >> @@ -1876,6 +1878,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) >> { >> enum drm_connector_status status; >> struct drm_i915_private *dev_priv = to_i915(connector->dev); >> + struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); >> >> DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", >> connector->base.id, connector->name); >> @@ -1891,6 +1894,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) >> >> intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS); >> >> + if (status != connector_status_connected) >> + cec_notifier_phys_addr_invalidate(intel_hdmi->notifier); >> + >> return status; >> } >> >> @@ -2358,6 +2364,10 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, >> u32 temp = I915_READ(PEG_BAND_GAP_DATA); >> I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd); >> } >> + >> + intel_hdmi->notifier = cec_notifier_get_conn(dev->dev, connector->name); >> + if (!intel_hdmi->notifier) >> + DRM_DEBUG_KMS("CEC notifier get failed\n"); > > You 'get' the notifier here, but where is the cec_notifier_put when the connector is deleted? Because I failed to find a safe place for this ! I will have a second look... > > Regards, > > Hans > >> } >> >> void intel_hdmi_init(struct drm_i915_private *dev_priv, >> >
WARNING: multiple messages have this Message-ID (diff)
From: Neil Armstrong <narmstrong@baylibre.com> To: Hans Verkuil <hverkuil@xs4all.nl>, airlied@linux.ie, hans.verkuil@cisco.com, lee.jones@linaro.org, olof@lixom.net, seanpaul@google.com Cc: sadolfsson@google.com, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, fparent@baylibre.com, felixe@google.com, bleung@google.com, darekm@google.com, linux-media@vger.kernel.org Subject: Re: [RFC PATCH 3/5] drm/i915: hdmi: add CEC notifier to intel_hdmi Date: Tue, 15 May 2018 09:30:32 +0200 [thread overview] Message-ID: <85da38a7-f396-882a-723e-437cc53d9c63@baylibre.com> (raw) In-Reply-To: <b38aa2db-903a-c882-69d6-170b3c2aa70c@xs4all.nl> On 15/05/2018 08:29, Hans Verkuil wrote: > On 05/15/2018 12:40 AM, Neil Armstrong wrote: >> This patchs adds the cec_notifier feature to the intel_hdmi part >> of the i915 DRM driver. It uses the HDMI DRM connector name to differentiate >> between each HDMI ports. >> The changes will allow the i915 HDMI code to notify EDID and HPD changes >> to an eventual CEC adapter. >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> drivers/gpu/drm/i915/intel_drv.h | 2 ++ >> drivers/gpu/drm/i915/intel_hdmi.c | 10 ++++++++++ >> 2 files changed, 12 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h >> index d436858..b50e51b 100644 >> --- a/drivers/gpu/drm/i915/intel_drv.h >> +++ b/drivers/gpu/drm/i915/intel_drv.h >> @@ -39,6 +39,7 @@ >> #include <drm/drm_dp_mst_helper.h> >> #include <drm/drm_rect.h> >> #include <drm/drm_atomic.h> >> +#include <media/cec-notifier.h> >> >> /** >> * __wait_for - magic wait macro >> @@ -1001,6 +1002,7 @@ struct intel_hdmi { >> bool has_audio; >> bool rgb_quant_range_selectable; >> struct intel_connector *attached_connector; >> + struct cec_notifier *notifier; >> }; >> >> struct intel_dp_mst_encoder; >> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c >> index 1baef4a..9b94d72 100644 >> --- a/drivers/gpu/drm/i915/intel_hdmi.c >> +++ b/drivers/gpu/drm/i915/intel_hdmi.c >> @@ -1868,6 +1868,8 @@ intel_hdmi_set_edid(struct drm_connector *connector) >> connected = true; >> } >> >> + cec_notifier_set_phys_addr_from_edid(intel_hdmi->notifier, edid); >> + >> return connected; >> } >> >> @@ -1876,6 +1878,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) >> { >> enum drm_connector_status status; >> struct drm_i915_private *dev_priv = to_i915(connector->dev); >> + struct intel_hdmi *intel_hdmi = intel_attached_hdmi(connector); >> >> DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", >> connector->base.id, connector->name); >> @@ -1891,6 +1894,9 @@ intel_hdmi_detect(struct drm_connector *connector, bool force) >> >> intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS); >> >> + if (status != connector_status_connected) >> + cec_notifier_phys_addr_invalidate(intel_hdmi->notifier); >> + >> return status; >> } >> >> @@ -2358,6 +2364,10 @@ void intel_hdmi_init_connector(struct intel_digital_port *intel_dig_port, >> u32 temp = I915_READ(PEG_BAND_GAP_DATA); >> I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd); >> } >> + >> + intel_hdmi->notifier = cec_notifier_get_conn(dev->dev, connector->name); >> + if (!intel_hdmi->notifier) >> + DRM_DEBUG_KMS("CEC notifier get failed\n"); > > You 'get' the notifier here, but where is the cec_notifier_put when the connector is deleted? Because I failed to find a safe place for this ! I will have a second look... > > Regards, > > Hans > >> } >> >> void intel_hdmi_init(struct drm_i915_private *dev_priv, >> > _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2018-05-15 7:30 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-14 22:40 [RFC PATCH 0/5] Add ChromeOS EC CEC Support Neil Armstrong 2018-05-14 22:40 ` Neil Armstrong 2018-05-14 22:40 ` [RFC PATCH 1/5] mfd: cros_ec_dev: Add CEC sub-device registration Neil Armstrong 2018-05-14 22:40 ` Neil Armstrong 2018-05-14 22:40 ` [RFC PATCH 2/5] media: cec-notifier: Get notifier by device and connector name Neil Armstrong 2018-05-14 22:40 ` Neil Armstrong 2018-05-15 6:27 ` Hans Verkuil 2018-05-15 7:28 ` Neil Armstrong 2018-05-15 7:28 ` Neil Armstrong 2018-05-14 22:40 ` [RFC PATCH 3/5] drm/i915: hdmi: add CEC notifier to intel_hdmi Neil Armstrong 2018-05-14 22:40 ` Neil Armstrong 2018-05-15 6:29 ` Hans Verkuil 2018-05-15 6:29 ` Hans Verkuil 2018-05-15 7:30 ` Neil Armstrong [this message] 2018-05-15 7:30 ` Neil Armstrong 2018-05-15 6:34 ` Hans Verkuil 2018-05-15 6:34 ` Hans Verkuil 2018-05-15 7:29 ` Neil Armstrong 2018-05-15 7:29 ` Neil Armstrong 2018-05-14 22:40 ` [RFC PATCH 4/5] mfd: cros-ec: Introduce CEC commands and events definitions Neil Armstrong 2018-05-14 22:40 ` Neil Armstrong 2018-05-14 22:40 ` [RFC PATCH 5/5] media: platform: Add Chrome OS EC CEC driver Neil Armstrong 2018-05-14 22:40 ` Neil Armstrong 2018-05-15 6:58 ` Hans Verkuil 2018-05-15 6:58 ` Hans Verkuil 2018-05-15 7:25 ` Neil Armstrong 2018-05-15 7:25 ` Neil Armstrong 2018-05-15 8:10 ` Hans Verkuil 2018-05-15 8:10 ` Hans Verkuil 2018-05-15 8:28 ` Neil Armstrong 2018-05-15 8:28 ` Neil Armstrong 2018-05-15 8:30 ` Hans Verkuil 2018-05-15 8:30 ` Hans Verkuil 2018-05-14 22:59 ` ✗ Fi.CI.CHECKPATCH: warning for Add ChromeOS EC CEC Support Patchwork 2018-05-14 23:18 ` ✓ Fi.CI.BAT: success " Patchwork 2018-05-15 6:22 ` ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=85da38a7-f396-882a-723e-437cc53d9c63@baylibre.com \ --to=narmstrong@baylibre.com \ --cc=airlied@linux.ie \ --cc=bleung@google.com \ --cc=darekm@google.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=felixe@google.com \ --cc=fparent@baylibre.com \ --cc=hans.verkuil@cisco.com \ --cc=hverkuil@xs4all.nl \ --cc=intel-gfx@lists.freedesktop.org \ --cc=lee.jones@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=marcheu@chromium.org \ --cc=olof@lixom.net \ --cc=sadolfsson@google.com \ --cc=seanpaul@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.