| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <3049784b-9422-3608-fba2-86b6c9ad1fbe@baylibre.com>
Date: Thu, 31 May 2018 15:21:42 +0200
From: Neil Armstrong <narmstrong@...libre.com>
To: Rodrigo Vivi <rodrigo.vivi@...el.com>,
Ville Syrjälä <ville.syrjala@...ux.intel.com>
Cc: felixe@...gle.com, seanpaul@...gle.com, airlied@...ux.ie,
sadolfsson@...gle.com, intel-gfx@...ts.freedesktop.org,
linux-kernel@...r.kernel.org, dri-devel@...ts.freedesktop.org,
fparent@...libre.com, hans.verkuil@...co.com, bleung@...gle.com,
darekm@...gle.com, lee.jones@...aro.org,
linux-media@...r.kernel.org
Subject: Re: [Intel-gfx] [PATCH v6 2/6] drm/i915: hdmi: add CEC notifier to
intel_hdmi
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 <narmstrong@...libre.com>
>>> Reviewed-by: Hans Verkuil <hans.verkuil@...co.com>
>>> ---
>>> 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 "<invalid>";
>>> + }
>>> +}
>>
>> 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 <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;
>>
>> "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ä <ville.syrjala@...ux.intel.com>
>
> It seems that you will need to push this to other trees right?
> Feel free to use:
>
> Acked-by: Rodrigo Vivi <rodrigo.vivi@...el.com>
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@...ts.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>
>> --
>> Ville Syrjälä
>> Intel
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@...ts.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Powered by blists - more mailing lists