[PATCH] drm/bridge: dw-hdmi: fix EDID parsing
Luís Mendes
luis.p.mendes at gmail.com
Thu Nov 9 11:07:44 UTC 2017
Complementing my previous email information with better dmesg output
(I had booted with my TV monitor off in my previous email):
[ 8.687907] [drm] Initialized etnaviv 1.1.0 20151214 for
gpu-subsystem on minor 0
[ 8.689356] [drm] Supports vblank timestamp caching Rev 2 (21.10.2013).
[ 8.689370] [drm] No driver support for vblank timestamp query.
[ 8.690733] imx-drm display-subsystem: bound imx-ipuv3-crtc.2 (ops
ipu_crtc_ops [imxdrm])
[ 8.691023] imx-drm display-subsystem: bound imx-ipuv3-crtc.3 (ops
ipu_crtc_ops [imxdrm])
[ 8.691264] imx-drm display-subsystem: bound imx-ipuv3-crtc.6 (ops
ipu_crtc_ops [imxdrm])
[ 8.691507] imx-drm display-subsystem: bound imx-ipuv3-crtc.7 (ops
ipu_crtc_ops [imxdrm])
[ 8.693485] dwhdmi-imx 120000.hdmi: Detected HDMI TX controller
v1.30a with HDCP (DWC HDMI 3D TX PHY)
[ 8.698677] imx-spdif sound-spdif: snd-soc-dummy-dai <->
2004000.spdif mapping ok
[ 8.705511] hdmi_set_clk_regenerator:521: dwhdmi-imx 120000.hdmi:
hdmi_set_clk_regenerator: fs=48000Hz ftdms=74.250MHz N=6144 cts=74250
[ 8.706051] dw_hdmi_irq:2146: dwhdmi-imx 120000.hdmi: EVENT=plugin
[ 8.707851] imx-drm display-subsystem: bound 120000.hdmi (ops
dw_hdmi_imx_ops [dw_hdmi_imx])
[ 8.713970] dw_hdmi_connector_get_modes:1917: dwhdmi-imx
120000.hdmi: failed to get edid
[ 8.777150] dw_hdmi_setup:1679: dwhdmi-imx 120000.hdmi: Non-CEA
mode used in HDMI
[ 8.777179] hdmi_av_composer:1495: dwhdmi-imx 120000.hdmi: final
pixclk = 173106000
[ 8.777237] dw_hdmi_phy_power_off:1096: dwhdmi-imx 120000.hdmi: PHY
powered down in 0 iterations
[ 8.817180] dw_hdmi_phy_power_on:1133: dwhdmi-imx 120000.hdmi: PHY
PLL locked 1 iterations
[ 8.817214] dw_hdmi_phy_power_off:1096: dwhdmi-imx 120000.hdmi: PHY
powered down in 0 iterations
[ 8.830554] fsl-asoc-card sound: sgtl5000 <-> 2028000.ssi mapping ok
[ 8.846647] dw_hdmi_phy_power_on:1133: dwhdmi-imx 120000.hdmi: PHY
PLL locked 1 iterations
[ 8.846701] dw_hdmi_setup:1744: dwhdmi-imx 120000.hdmi:
dw_hdmi_setup DVI mode
[ 8.872936] Console: switching to colour frame buffer device 240x67
[ 8.959468] imx-drm display-subsystem: fb0: frame buffer device
[ 9.042175] [drm] Initialized imx-drm 1.0.0 20120507 for
display-subsystem on minor 1
[ 10.078736] dw_hdmi_connector_get_modes:1917: dwhdmi-imx
120000.hdmi: failed to get edid
[ 11.603962] fec 2188000.ethernet eth0: Link is Up - 1Gbps/Full -
flow control rx/tx
[ 11.604795] IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready
[ 13.690715] dw_hdmi_connector_get_modes:1917: dwhdmi-imx
120000.hdmi: failed to get edid
[ 13.691803] dw_hdmi_connector_get_modes:1917: dwhdmi-imx
120000.hdmi: failed to get edid
[ 13.728314] dw_hdmi_phy_power_off:1096: dwhdmi-imx 120000.hdmi: PHY
powered down in 0 iterations
[ 13.736954] dw_hdmi_setup:1679: dwhdmi-imx 120000.hdmi: Non-CEA
mode used in HDMI
[ 13.736975] hdmi_av_composer:1495: dwhdmi-imx 120000.hdmi: final
pixclk = 65000000
[ 13.737021] dw_hdmi_phy_power_off:1096: dwhdmi-imx 120000.hdmi: PHY
powered down in 0 iterations
[ 13.748240] dw_hdmi_phy_power_on:1133: dwhdmi-imx 120000.hdmi: PHY
PLL locked 1 iterations
[ 13.748269] dw_hdmi_phy_power_off:1096: dwhdmi-imx 120000.hdmi: PHY
powered down in 0 iterations
[ 13.759760] dw_hdmi_phy_power_on:1133: dwhdmi-imx 120000.hdmi: PHY
PLL locked 1 iterations
[ 13.759841] dw_hdmi_setup:1744: dwhdmi-imx 120000.hdmi:
dw_hdmi_setup DVI mode
On Thu, Nov 9, 2017 at 10:52 AM, Luís Mendes <luis.p.mendes at gmail.com> wrote:
> Hi,
>
> I've just applied the referred individual patch to kernel-4.14-rc5 and
> the EDID isn't loaded. dw-hdmi gets no firmware at all.
>
> #cat /proc/cmdline
> console=ttymxc0,115200 root=/dev/sda2 rw video=HDMI-A-1:1920x1080M at 60
> drm.edid_firmware=edid/ktc_edid.bin dw_hdmi.dyndbg=+pfl cma=128M
>
> #zcat /proc/config.gz | grep EDID
> CONFIG_DRM_LOAD_EDID_FIRMWARE=y
> # CONFIG_FIRMWARE_EDID is not set
>
> #cat /sys/class/drm/card1-HDMI-A-1/edid
> <empty>
>
> #dmesg
> ...
> [ 8.815238] imx-drm display-subsystem: bound imx-ipuv3-crtc.2 (ops
> ipu_crtc_ops [imxdrm])
> [ 8.815555] imx-drm display-subsystem: bound imx-ipuv3-crtc.3 (ops
> ipu_crtc_ops [imxdrm])
> [ 8.815832] imx-drm display-subsystem: bound imx-ipuv3-crtc.6 (ops
> ipu_crtc_ops [imxdrm])
> [ 8.816073] imx-drm display-subsystem: bound imx-ipuv3-crtc.7 (ops
> ipu_crtc_ops [imxdrm])
> [ 8.818243] dwhdmi-imx 120000.hdmi: Detected HDMI TX controller
> v1.30a with HDCP (DWC HDMI 3D TX PHY)
> [ 8.821780] hdmi_set_clk_regenerator:521: dwhdmi-imx 120000.hdmi:
> hdmi_set_clk_regenerator: fs=48000Hz ftdms=74.250MHz N=6144 cts=74250
> [ 8.831034] imx-drm display-subsystem: bound 120000.hdmi (ops
> dw_hdmi_imx_ops [dw_hdmi_imx])
> [ 8.832218] [drm] Cannot find any crtc or sizes
> [ 8.839807] [drm] Initialized imx-drm 1.0.0 20120507 for
> display-subsystem on minor 1
>
> Regards,
> Luís Mendes
>
> On Thu, Nov 9, 2017 at 9:51 AM, Luís Mendes <luis.p.mendes at gmail.com> wrote:
>> Hi everyone,
>>
>> I can try that patch and see if it fixes the problem.
>> Give me a moment so that I can check how it goes.
>>
>> Luís
>>
>>
>>
>> On Thu, Nov 9, 2017 at 9:49 AM, Jani Nikula <jani.nikula at linux.intel.com>
>> wrote:
>>>
>>> On Thu, 09 Nov 2017, Russell King - ARM Linux <linux at armlinux.org.uk>
>>> wrote:
>>> > On Thu, Nov 09, 2017 at 09:23:18AM +0100, Daniel Vetter wrote:
>>> >> On Tue, Nov 07, 2017 at 11:27:21AM +0000, Russell King wrote:
>>> >> > Parsing the EDID for HDMI and audio information in the get_modes()
>>> >> > callback is incorrect - this only parses the EDID read from the
>>> >> > connector, not any override or firmware provided EDID.
>>> >> >
>>> >> > The correct place to parse the EDID for these parameters is the
>>> >> > fill_modes() callback, after we've called the helper. Move the
>>> >> > parsing
>>> >> > there. This caused problems for Luís Mendes.
>>> >> >
>>> >> > Cc: <stable at vger.kernel.org>
>>> >> > Reported-by: Luís Mendes <luis.p.mendes at gmail.com>
>>> >> > Tested-by: Luís Mendes <luis.p.mendes at gmail.com>
>>> >> > Signed-off-by: Russell King <rmk+kernel at armlinux.org.uk>
>>> >> > ---
>>> >> > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 28
>>> >> > ++++++++++++++++++++++++----
>>> >> > 1 file changed, 24 insertions(+), 4 deletions(-)
>>> >> >
>>> >> > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>>> >> > b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>>> >> > index 9fe407f49986..2516a1c18a10 100644
>>> >> > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>>> >> > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
>>> >> > @@ -1905,10 +1905,7 @@ static int dw_hdmi_connector_get_modes(struct
>>> >> > drm_connector *connector)
>>> >> > dev_dbg(hdmi->dev, "got edid: width[%d] x height[%d]\n",
>>> >> > edid->width_cm, edid->height_cm);
>>> >> >
>>> >> > - hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
>>> >> > - hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
>>> >> > drm_mode_connector_update_edid_property(connector, edid);
>>> >> > - cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier,
>>> >> > edid);
>>> >> > ret = drm_add_edid_modes(connector, edid);
>>> >> > /* Store the ELD */
>>> >> > drm_edid_to_eld(connector, edid);
>>> >> > @@ -1920,6 +1917,29 @@ static int dw_hdmi_connector_get_modes(struct
>>> >> > drm_connector *connector)
>>> >> > return ret;
>>> >> > }
>>> >> >
>>> >> > +static int dw_hdmi_connector_fill_modes(struct drm_connector
>>> >> > *connector,
>>> >> > + uint32_t maxX, uint32_t maxY)
>>> >> > +{
>>> >> > + struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi,
>>> >> > + connector);
>>> >> > + int ret;
>>> >> > +
>>> >> > + ret = drm_helper_probe_single_connector_modes(connector, maxX,
>>> >> > maxY);
>>> >> > +
>>> >> > + if (connector->edid_blob_ptr) {
>>> >> > + struct edid *edid = (void
>>> >> > *)connector->edid_blob_ptr->data;
>>> >> > +
>>> >> > + hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
>>> >> > + hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
>>> >> > + cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier,
>>> >> > edid);
>>> >> > + } else {
>>> >> > + hdmi->sink_is_hdmi = false;
>>> >> > + hdmi->sink_has_audio = false;
>>> >> > + }
>>> >> > +
>>> >> > + return ret;
>>> >> > +}
>>> >> > +
>>> >> > static void dw_hdmi_connector_force(struct drm_connector *connector)
>>> >> > {
>>> >> > struct dw_hdmi *hdmi = container_of(connector, struct dw_hdmi,
>>> >> > @@ -1933,7 +1953,7 @@ static void dw_hdmi_connector_force(struct
>>> >> > drm_connector *connector)
>>> >> > }
>>> >> >
>>> >> > static const struct drm_connector_funcs dw_hdmi_connector_funcs = {
>>> >> > - .fill_modes = drm_helper_probe_single_connector_modes,
>>> >> > + .fill_modes = dw_hdmi_connector_fill_modes,
>>> >>
>>> >> Papering over helper functions shouldn't be necessary, except the
>>> >> helper
>>> >> functions not handling the override edid is a known issue. Jani Nikula
>>> >> is
>>> >> working on a proper fix, please coordinate with him.
>>> >
>>> > So, what you're basically saying is that fixing real bugs that affect
>>> > users is not something that DRM people want. That's fine, I'll ignore
>>> > people who come to me for help with DRM bugs in future then because
>>> > it's obviously a dead loss.
>>>
>>> We may already have fixed the bug in drm-next at the proper
>>> layer. Please see my other mail.
>>>
>>> BR,
>>> Jani.
>>>
>>> --
>>> Jani Nikula, Intel Open Source Technology Center
>>
>>
More information about the dri-devel
mailing list