Patch "drm/edid: set ELD for firmware and debugfs override EDIDs" has been added to the 3.19-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    drm/edid: set ELD for firmware and debugfs override EDIDs

to the 3.19-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-edid-set-eld-for-firmware-and-debugfs-override-edids.patch
and it can be found in the queue-3.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From ad692b46dbf122ef90aadce3b389ef64c90e861d Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani.nikula@xxxxxxxxx>
Date: Thu, 26 Mar 2015 10:42:00 +0200
Subject: drm/edid: set ELD for firmware and debugfs override EDIDs

From: Jani Nikula <jani.nikula@xxxxxxxxx>

commit ad692b46dbf122ef90aadce3b389ef64c90e861d upstream.

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
Reported-by: Emil <emilsvennesson@xxxxxxxxx>
Reported-by: Rob Engle <grenoble@xxxxxxxxx>
Tested-by: Jolan Luff <jolan@xxxxxxxxxxx>
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
 drivers/gpu/drm/drm_edid_load.c    |    1 +
 drivers/gpu/drm/drm_probe_helper.c |    1 +
 2 files changed, 2 insertions(+)

--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c
@@ -287,6 +287,7 @@ int drm_load_edid_firmware(struct drm_co
 
 	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;
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -152,6 +152,7 @@ static int drm_helper_probe_single_conne
 			struct 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);
 	}


Patches currently in stable-queue which might be from jani.nikula@xxxxxxxxx are

queue-3.19/drm-i915-align-initial-plane-backing-objects-correctly.patch
queue-3.19/drm-i915-chv-remove-wait-for-a-previous-gfx-force-off.patch
queue-3.19/drm-edid-set-eld-for-firmware-and-debugfs-override-edids.patch
queue-3.19/drm-i915-vlv-remove-wait-for-previous-gfx-clk-disable-request.patch
queue-3.19/drm-i915-vlv-save-restore-the-power-context-base-reg.patch
queue-3.19/drm-i915-reject-the-colorkey-ioctls-for-primary-and-cursor-planes.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]