From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755238AbeEaNVs (ORCPT ); Thu, 31 May 2018 09:21:48 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33948 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755053AbeEaNVp (ORCPT ); Thu, 31 May 2018 09:21:45 -0400 X-Google-Smtp-Source: ADUXVKKCGuUf159/mR+IlPq2Wa2lXBTU5YbFBew8xw0+bTeJoM2/rLP8AaMMilIHJ5PRlsofxrq8QQ== Subject: Re: [Intel-gfx] [PATCH v6 2/6] drm/i915: hdmi: add CEC notifier to intel_hdmi To: Rodrigo Vivi , =?UTF-8?B?VmlsbGUgU3lyasOkbMOk?= Cc: felixe@google.com, seanpaul@google.com, airlied@linux.ie, sadolfsson@google.com, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, fparent@baylibre.com, hans.verkuil@cisco.com, bleung@google.com, darekm@google.com, lee.jones@linaro.org, linux-media@vger.kernel.org References: <1527155841-28494-1-git-send-email-narmstrong@baylibre.com> <1527155841-28494-3-git-send-email-narmstrong@baylibre.com> <20180530152936.GQ23723@intel.com> <20180530232605.GM2115@intel.com> From: Neil Armstrong Openpgp: preference=signencrypt Autocrypt: addr=narmstrong@baylibre.com; prefer-encrypt=mutual; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKE5laWwgQXJtc3Ryb25nIDxuYXJtc3Ryb25nQGJheWxpYnJlLmNvbT7CwHsEEwEKACUC GyMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJXDO2CAhkBAAoJEBaat7Gkz/iubGIH/iyk RqvgB62oKOFlgOTYCMkYpm2aAOZZLf6VKHKc7DoVwuUkjHfIRXdslbrxi4pk5VKU6ZP9AKsN NtMZntB8WrBTtkAZfZbTF7850uwd3eU5cN/7N1Q6g0JQihE7w4GlIkEpQ8vwSg5W7hkx3yQ6 2YzrUZh/b7QThXbNZ7xOeSEms014QXazx8+txR7jrGF3dYxBsCkotO/8DNtZ1R+aUvRfpKg5 ZgABTC0LmAQnuUUf2PHcKFAHZo5KrdO+tyfL+LgTUXIXkK+tenkLsAJ0cagz1EZ5gntuheLD YJuzS4zN+1Asmb9kVKxhjSQOcIh6g2tw7vaYJgL/OzJtZi6JlIXOwE0ETVkGzwEIALyKDN/O GURaHBVzwjgYq+ZtifvekdrSNl8TIDH8g1xicBYpQTbPn6bbSZbdvfeQPNCcD4/EhXZuhQXM coJsQQQnO4vwVULmPGgtGf8PVc7dxKOeta+qUh6+SRh3vIcAUFHDT3f/Zdspz+e2E0hPV2hi SvICLk11qO6cyJE13zeNFoeY3ggrKY+IzbFomIZY4yG6xI99NIPEVE9lNBXBKIlewIyVlkOa YvJWSV+p5gdJXOvScNN1epm5YHmf9aE2ZjnqZGoMMtsyw18YoX9BqMFInxqYQQ3j/HpVgTSv mo5ea5qQDDUaCsaTf8UeDcwYOtgI8iL4oHcsGtUXoUk33HEAEQEAAcLAXwQYAQIACQUCTVkG zwIbDAAKCRAWmrexpM/4rrXiB/sGbkQ6itMrAIfnM7IbRuiSZS1unlySUVYu3SD6YBYnNi3G 5EpbwfBNuT3H8//rVvtOFK4OD8cRYkxXRQmTvqa33eDIHu/zr1HMKErm+2SD6PO9umRef8V8 2o2oaCLvf4WeIssFjwB0b6a12opuRP7yo3E3gTCSKmbUuLv1CtxKQF+fUV1cVaTPMyT25Od+ RC1K+iOR0F54oUJvJeq7fUzbn/KdlhA8XPGzwGRy4zcsPWvwnXgfe5tk680fEKZVwOZKIEuJ C3v+/yZpQzDvGYJvbyix0lHnrCzq43WefRHI5XTTQbM0WUIBIcGmq38+OgUsMYu4NzLu7uZF Acmp6h8g Organization: Baylibre Message-ID: <3049784b-9422-3608-fba2-86b6c9ad1fbe@baylibre.com> Date: Thu, 31 May 2018 15:21:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <20180530232605.GM2115@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 31/05/2018 01:26, Rodrigo Vivi wrote: > On Wed, May 30, 2018 at 06:29:36PM +0300, Ville Syrjälä wrote: >> On Thu, May 24, 2018 at 11:57:17AM +0200, 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 >>> Reviewed-by: Hans Verkuil >>> --- >>> drivers/gpu/drm/i915/Kconfig | 1 + >>> drivers/gpu/drm/i915/intel_display.h | 20 ++++++++++++++++++++ >>> drivers/gpu/drm/i915/intel_drv.h | 2 ++ >>> drivers/gpu/drm/i915/intel_hdmi.c | 13 +++++++++++++ >>> 4 files changed, 36 insertions(+) >>> >>> diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig >>> index dfd9588..2d65d56 100644 >>> --- a/drivers/gpu/drm/i915/Kconfig >>> +++ b/drivers/gpu/drm/i915/Kconfig >>> @@ -23,6 +23,7 @@ config DRM_I915 >>> select SYNC_FILE >>> select IOSF_MBI >>> select CRC32 >>> + select CEC_CORE if CEC_NOTIFIER >>> help >>> Choose this option if you have a system that has "Intel Graphics >>> Media Accelerator" or "HD Graphics" integrated graphics, >>> diff --git a/drivers/gpu/drm/i915/intel_display.h b/drivers/gpu/drm/i915/intel_display.h >>> index 4e7418b..c68d1c8 100644 >>> --- a/drivers/gpu/drm/i915/intel_display.h >>> +++ b/drivers/gpu/drm/i915/intel_display.h >>> @@ -126,6 +126,26 @@ enum port { >>> >>> #define port_name(p) ((p) + 'A') >>> >>> +static inline const char *port_identifier(enum port port) >>> +{ >>> + switch (port) { >>> + case PORT_A: >>> + return "Port A"; >>> + case PORT_B: >>> + return "Port B"; >>> + case PORT_C: >>> + return "Port C"; >>> + case PORT_D: >>> + return "Port D"; >>> + case PORT_E: >>> + return "Port E"; >>> + case PORT_F: >>> + return "Port F"; >>> + default: >>> + return ""; >>> + } >>> +} >> >> Could use a comment to make it clear that this identifier is >> expected to remain stable since it's referenced from other drivers. >> >>> + >>> enum dpio_channel { >>> DPIO_CH0, >>> DPIO_CH1 >>> 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 >>> #include >>> #include >>> +#include >>> >>> /** >>> * __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; >> >> "notifier" seems a bit too generic a name. "cec_notifier" would be >> better. >> >> Apart from that this seems OK to me >> Reviewed-by: Ville Syrjälä > > It seems that you will need to push this to other trees right? > Feel free to use: > > Acked-by: Rodrigo Vivi You are right, it will useful, thanks ! Neil > >> >>> }; >>> >>> 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..d522b5b 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; >>> } >>> >>> @@ -2031,6 +2037,8 @@ static void chv_hdmi_pre_enable(struct intel_encoder *encoder, >>> >>> static void intel_hdmi_destroy(struct drm_connector *connector) >>> { >>> + if (intel_attached_hdmi(connector)->notifier) >>> + cec_notifier_put(intel_attached_hdmi(connector)->notifier); >>> kfree(to_intel_connector(connector)->detect_edid); >>> drm_connector_cleanup(connector); >>> kfree(connector); >>> @@ -2358,6 +2366,11 @@ 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, >>> + port_identifier(port)); >>> + if (!intel_hdmi->notifier) >>> + DRM_DEBUG_KMS("CEC notifier get failed\n"); >>> } >>> >>> void intel_hdmi_init(struct drm_i915_private *dev_priv, >>> -- >>> 2.7.4 >>> >>> _______________________________________________ >>> Intel-gfx mailing list >>> Intel-gfx@lists.freedesktop.org >>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx >> >> -- >> Ville Syrjälä >> Intel >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel