mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
linux: update to linux-4.0-rc7
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
7af5fff73b
commit
102ff3e416
@ -31,7 +31,7 @@ case "$LINUX" in
|
|||||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="4.0-rc6"
|
PKG_VERSION="4.0-rc7"
|
||||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/testing/$PKG_NAME-$PKG_VERSION.tar.xz"
|
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/testing/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -1,51 +0,0 @@
|
|||||||
From 0c60dddcf8a3439f498a2ededbee66005e4ead58 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jani Nikula <jani.nikula@intel.com>
|
|
||||||
Date: Thu, 26 Mar 2015 10:42:00 +0200
|
|
||||||
Subject: [PATCH] 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
|
|
||||||
Reported-by: Emil <emilsvennesson@gmail.com>
|
|
||||||
Reported-by: Rob Engle <grenoble@gmail.com>
|
|
||||||
Tested-by: Jolan Luff <jolan@gormsby.com>
|
|
||||||
Cc: stable@vger.kernel.org
|
|
||||||
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/drm_edid_load.c | 1 +
|
|
||||||
drivers/gpu/drm/drm_probe_helper.c | 1 +
|
|
||||||
2 files changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
|
|
||||||
index 732cb6f..4c0aa97 100644
|
|
||||||
--- 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_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;
|
|
||||||
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
|
|
||||||
index 7483a47..9bca854 100644
|
|
||||||
--- 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_connector_modes_merge_bits(struct drm_connect
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user