drm/edid: set ELD for firmware and debugfs override EDIDs
Subsystems (2)
PATCH 1/1 drm/edid: set ELD for firmware and debugfs override EDIDs
If the user supplies EDID through firmware or debugfs override, the driver callbacks are bypassed and the connector ELD does not get updated, and audio fails. Set ELD for firmware and debugfs EDIDs too.
There should be no harm in gratuitously doing this for non HDMI/DP connectors, as it's still up to the driver to use the ELD, if any.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82349
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=80691
--- drivers/gpu/drm/drm_edid_load.c | 1 + drivers/gpu/drm/drm_probe_helper.c | 1 + 2 files changed, 2 insertions(+)
drivers/gpu/drm/drm_edid_load.c +1 -0
@@ -287,6 +287,7 @@ int drm_load_edid_firmware(struct drm_connector *connector)drm_mode_connector_update_edid_property (connector, edid); ret =drm_add_edid_modes (connector, edid); +drm_edid_to_eld (connector, edid);kfree (edid);return ret;
drivers/gpu/drm/drm_probe_helper.c +1 -0
@@ -174,6 +174,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connectstruct edid *edid = (struct edid *) connector->edid_blob_ptr->data; count =drm_add_edid_modes (connector, edid); +drm_edid_to_eld (connector, edid); }else count = (*connector_funcs->get_modes)(connector); }
Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Jani Nikula
If the user supplies EDID through firmware or debugfs override, the driver callbacks are bypassed and the connector ELD does not get updated, and audio fails. Set ELD for firmware and debugfs EDIDs too.
There should be no harm in gratuitously doing this for non HDMI/DP connectors, as it's still up to the driver to use the ELD, if any.
Quoted 7 lines
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82349
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=80691Reported-by Emil <[email protected]>Reported-by Rob Engle <[email protected]>Tested-by Jolan Luff <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Since it's harmless I wonder whether we shouldn't just do this in drm_add_edid_modes unconditionally. But this looks like the right minimal patch for -fixes, so Reviewed-by: Daniel Vetter <[email protected]>
Cheers, Daniel
Quoted 36 lines
--- drivers/gpu/drm/drm_edid_load.c | 1 + drivers/gpu/drm/drm_probe_helper.c | 1 + 2 files changed, 2 insertions(+)drivers/gpu/drm/drm_edid_load.c +1
-0@@ -287,6 +287,7 @@ int drm_load_edid_firmware(struct drm_connector *connector)drm_mode_connector_update_edid_property (connector, edid); ret =drm_add_edid_modes (connector, edid); +drm_edid_to_eld (connector, edid);kfree (edid);return ret;drivers/gpu/drm/drm_probe_helper.c +1
-0@@ -174,6 +174,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connectstruct edid *edid = (struct edid *) connector->edid_blob_ptr->data; count =drm_add_edid_modes (connector, edid); +drm_edid_to_eld (connector, edid); }else count = (*connector_funcs->get_modes)(connector); }Signature · 6 lines
2.1.4 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 16 lines · Daniel Vetter
Quoted 7 lines · Jani Nikula
If the user supplies EDID through firmware or debugfs override, the driver callbacks are bypassed and the connector ELD does not get updated, and audio fails. Set ELD for firmware and debugfs EDIDs too.
There should be no harm in gratuitously doing this for non HDMI/DP connectors, as it's still up to the driver to use the ELD, if any.
Quoted 7 lines
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82349
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=80691Reported-by Emil <[email protected]>Reported-by Rob Engle <[email protected]>Tested-by Jolan Luff <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 3 lines
Since it's harmless I wonder whether we shouldn't just do this in
drm_add_edid_modesunconditionally. But this looks like the right minimal patch for -fixes, so Reviewed-by: Daniel Vetter <[email protected]>
While I was hoping to gather review from outside of drm/i915 folks, I picked this up and pushed to our new topic/drm-fixes branch of [1].
I intend to keep picking up (occasional, non-controversial) drm core fixes aimed at the current development (-rc) kernels, to ensure they're not dropped, and sending pull requests to Dave as needed. He'll have the final call whether to pull or not, of course. This is similar to what Daniel does with the topic/drm-misc branch for drm-next.
Please let me know if you have any feedback on this.
Thanks,
Jani.
[1] http://cgit.freedesktop.org/drm-intel
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 24 lines · Jani Nikula
Quoted 16 lines · Daniel Vetter
Quoted 7 lines · Jani Nikula
If the user supplies EDID through firmware or debugfs override, the driver callbacks are bypassed and the connector ELD does not get updated, and audio fails. Set ELD for firmware and debugfs EDIDs too.
There should be no harm in gratuitously doing this for non HDMI/DP connectors, as it's still up to the driver to use the ELD, if any.
Quoted 7 lines
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82349
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=80691Reported-by Emil <[email protected]>Reported-by Rob Engle <[email protected]>Tested-by Jolan Luff <[email protected]>Signed-off-by Jani Nikula <[email protected]>Quoted 3 lines
Since it's harmless I wonder whether we shouldn't just do this in
drm_add_edid_modesunconditionally. But this looks like the right minimal patch for -fixes, so Reviewed-by: Daniel Vetter <[email protected]>While I was hoping to gather review from outside of drm/i915 folks, I picked this up and pushed to our new topic/drm-fixes branch of [1].
Quoted 7 lines
I intend to keep picking up (occasional, non-controversial) drm core fixes aimed at the current development (-rc) kernels, to ensure they're not dropped, and sending pull requests to Dave as needed. He'll have the final call whether to pull or not, of course. This is similar to what Daniel does with the topic/drm-misc branch for drm-next.
Please let me know if you have any feedback on this.
The patch seems fine to me. However, if we are always going to set the ELD for the override cases, why don't we also always set it for the non-override cases rather than making each driver do it.
Alex
Quoted 9 lines
Thanks,
Jani.[1] http://cgit.freedesktop.org/drm-intel
--
Jani Nikula, Intel Open Source Technology Center
Quoted 31 lines · Alex Deucher
Quoted 30 lines · Jani Nikula
Quoted 16 lines · Daniel Vetter
Quoted 7 lines · Jani Nikula
If the user supplies EDID through firmware or debugfs override, the driver callbacks are bypassed and the connector ELD does not get updated, and audio fails. Set ELD for firmware and debugfs EDIDs too.
There should be no harm in gratuitously doing this for non HDMI/DP connectors, as it's still up to the driver to use the ELD, if any.
Quoted 7 lines
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82349
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=80691Reported-by Emil <[email protected]>Reported-by Rob Engle <[email protected]>Tested-by Jolan Luff <[email protected]>Signed-off-by Jani Nikula <[email protected]>Quoted 3 lines
Since it's harmless I wonder whether we shouldn't just do this in
drm_add_edid_modesunconditionally. But this looks like the right minimal patch for -fixes, so Reviewed-by: Daniel Vetter <[email protected]>While I was hoping to gather review from outside of drm/i915 folks, I picked this up and pushed to our new topic/drm-fixes branch of [1].
I intend to keep picking up (occasional, non-controversial) drm core fixes aimed at the current development (-rc) kernels, to ensure they're not dropped, and sending pull requests to Dave as needed. He'll have the final call whether to pull or not, of course. This is similar to what Daniel does with the topic/drm-misc branch for drm-next.
Quoted 6 lines
Quoted 1 line
Please let me know if you have any feedback on this.
The patch seems fine to me. However, if we are always going to set the ELD for the override cases, why don't we also always set it for the non-override cases rather than making each driver do it.
So I think this is a good minimal patch for fixes/stable as a first step.
But I agree, we should think about the follow-up. I already had a glance before, and doing so really begs the question why we wouldn't add a helper to handle all of drm_add_edid_modes, drm_edid_to_eld, and drm_mode_connector_update_edid_property properly? Similar to intel_connector_update_modes in i915/intel_modes.c. All drivers do this stuff, although with subtle differences especially wrt error handling.
BR,
Jani.
Quoted 12 lines
Alex
Quoted 9 lines
Thanks,
Jani.[1] http://cgit.freedesktop.org/drm-intel
--
Jani Nikula, Intel Open Source Technology Center
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 42 lines · Jani Nikula
Quoted 31 lines · Alex Deucher
Quoted 30 lines · Jani Nikula
Quoted 16 lines · Daniel Vetter
Quoted 7 lines · Jani Nikula
If the user supplies EDID through firmware or debugfs override, the driver callbacks are bypassed and the connector ELD does not get updated, and audio fails. Set ELD for firmware and debugfs EDIDs too.
There should be no harm in gratuitously doing this for non HDMI/DP connectors, as it's still up to the driver to use the ELD, if any.
Quoted 7 lines
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82349
Reference: https://bugs.freedesktop.org/show_bug.cgi?id=80691Reported-by Emil <[email protected]>Reported-by Rob Engle <[email protected]>Tested-by Jolan Luff <[email protected]>Signed-off-by Jani Nikula <[email protected]>Quoted 3 lines
Since it's harmless I wonder whether we shouldn't just do this in
drm_add_edid_modesunconditionally. But this looks like the right minimal patch for -fixes, so Reviewed-by: Daniel Vetter <[email protected]>While I was hoping to gather review from outside of drm/i915 folks, I picked this up and pushed to our new topic/drm-fixes branch of [1].
I intend to keep picking up (occasional, non-controversial) drm core fixes aimed at the current development (-rc) kernels, to ensure they're not dropped, and sending pull requests to Dave as needed. He'll have the final call whether to pull or not, of course. This is similar to what Daniel does with the topic/drm-misc branch for drm-next.
Quoted 6 lines
Quoted 1 line
Please let me know if you have any feedback on this.
The patch seems fine to me. However, if we are always going to set the ELD for the override cases, why don't we also always set it for the non-override cases rather than making each driver do it.
So I think this is a good minimal patch for fixes/stable as a first step.
Quoted 7 lines
But I agree, we should think about the follow-up. I already had a glance before, and doing so really begs the question why we wouldn't add a helper to handle all of
drm_add_edid_modes,drm_edid_to_eld, anddrm_mode_connector_update_edid_propertyproperly? Similar tointel_connector_update_modesini915/intel_modes.c. All drivers do this stuff, although with subtle differences especially wrt error handling.
Agreed.
Alex
Quoted 12 lines
BR,
Jani.Quoted 8 lines
Alex
Quoted 5 lines
Thanks,
Jani.
Quoted 7 lines
Quoted 4 lines
Quoted 4 lines
[1] http://cgit.freedesktop.org/drm-intel
--
Jani Nikula, Intel Open Source Technology Center--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Task id: 6058 -------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV 276/276 276/276 ILK 303/303 303/303 SNB -2 304/304 302/304 IVB 339/339 339/339 BYT 287/287 287/287 HSW 362/362 362/362 BDW 310/310 310/310
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
*SNB igt@pm_rpm@drm-resources-equal PASS(2) DMESG_FAIL(1)PASS(1)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*failed_to_enable_link_training@failed to enable link training drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_start_channel_equalization@failed to start channel equalization
*SNB igt@pm_rpm@modeset-non-lpsp-stress-no-wait PASS(2) DMESG_WARN(1)PASS(1)
(dmesg patch applied)drm:intel_dp_start_link_train[i915]]*ERROR*too_many_voltage_retries,give_up@too many voltage .* give up drm:intel_dp_complete_link_train[i915]]*ERROR*failed_to_train_DP,aborting@failed to train .* aborting
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx