mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
linux (RPi): update to 5.15.48-b34bf32
Drop linux-010-pr5052.patch, this is now in rpi kernel tree Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
parent
9f8dd8a5ed
commit
2c1fdb3834
@ -22,8 +22,8 @@ case "${LINUX}" in
|
||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||
;;
|
||||
raspberrypi)
|
||||
PKG_VERSION="6b945e6f05d5cb0a299dbbb9bdd285aff330a204" # 5.15.45
|
||||
PKG_SHA256="84ef98930fbfc7843dfb8715609b948a599746d015c5a42bf0c95a0c531a6909"
|
||||
PKG_VERSION="b34bf3273cfe492daa04fc57eb88782df1714a66" # 5.15.48
|
||||
PKG_SHA256="93452accd2199069ca568925a14475e0f8b7ade4fab82b21703cf35c2ea5ec4c"
|
||||
PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz"
|
||||
;;
|
||||
|
@ -1,60 +0,0 @@
|
||||
From 00c2be0300d88d8c095921018306817650fe271b Mon Sep 17 00:00:00 2001
|
||||
From: Dom Cobley <popcornmix@gmail.com>
|
||||
Date: Wed, 1 Jun 2022 15:43:51 +0100
|
||||
Subject: [PATCH] drm/vc4_hdmi: Allow hotplug detect to be forced
|
||||
|
||||
See: https://forum.libreelec.tv/thread/24783-tv-avr-turns-back-on-right-after-turning-them-off
|
||||
|
||||
While the kernel provides a :D flag for assuming device is connected,
|
||||
it doesn't stop this function from being called and generating a cec_phys_addr_invalidate
|
||||
message when hotplug is deasserted.
|
||||
|
||||
That message provokes a flurry of CEC messages which for many users results in the TV
|
||||
switching back on again and it's very hard to get it to stay switched off.
|
||||
|
||||
It seems to only occur with an AVR and TV connected but has been observed across a
|
||||
number of manufacturers.
|
||||
|
||||
The issue started with https://github.com/raspberrypi/linux/pull/4371
|
||||
and this provides an optional way of getting back the old behaviour
|
||||
|
||||
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
||||
---
|
||||
drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
||||
index 5d37cd0741b6f..793dc56746ee6 100644
|
||||
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
||||
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
||||
@@ -40,6 +40,8 @@
|
||||
#include <linux/component.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/i2c.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/moduleparam.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_gpio.h>
|
||||
#include <linux/of_platform.h>
|
||||
@@ -113,6 +115,10 @@
|
||||
|
||||
#define HDMI_14_MAX_TMDS_CLK (340 * 1000 * 1000)
|
||||
|
||||
+/* bit field to force hotplug detection. bit0 = HDMI0 */
|
||||
+static int force_hotplug = 0;
|
||||
+module_param(force_hotplug, int, 0644);
|
||||
+
|
||||
static const char * const output_format_str[] = {
|
||||
[VC4_HDMI_OUTPUT_RGB] = "RGB",
|
||||
[VC4_HDMI_OUTPUT_YUV420] = "YUV 4:2:0",
|
||||
@@ -248,7 +254,9 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
|
||||
|
||||
WARN_ON(pm_runtime_resume_and_get(&vc4_hdmi->pdev->dev));
|
||||
|
||||
- if (vc4_hdmi->hpd_gpio) {
|
||||
+ if (force_hotplug & BIT(vc4_hdmi->encoder.base.type - VC4_ENCODER_TYPE_HDMI0))
|
||||
+ connected = true;
|
||||
+ else if (vc4_hdmi->hpd_gpio) {
|
||||
if (gpiod_get_value_cansleep(vc4_hdmi->hpd_gpio))
|
||||
connected = true;
|
||||
} else {
|
Loading…
x
Reference in New Issue
Block a user