mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 05:06:43 +00:00
linux (Rockchip): rebase patches for 6.6-rc2
This commit is contained in:
parent
080c1181ca
commit
12d69e3b51
@ -1871,7 +1871,7 @@ index a2d101ebf7a7..7f6ffbc3e7b2 100644
|
|||||||
u32 *output_fmts;
|
u32 *output_fmts;
|
||||||
unsigned int i = 0;
|
unsigned int i = 0;
|
||||||
|
|
||||||
@@ -2701,29 +2709,33 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
|
@@ -2701,25 +2709,28 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
|
||||||
* If the current mode enforces 4:2:0, force the output but format
|
* If the current mode enforces 4:2:0, force the output but format
|
||||||
* to 4:2:0 and do not add the YUV422/444/RGB formats
|
* to 4:2:0 and do not add the YUV422/444/RGB formats
|
||||||
*/
|
*/
|
||||||
@ -1905,14 +1905,8 @@ index a2d101ebf7a7..7f6ffbc3e7b2 100644
|
|||||||
+ if (is_tmds_allowed(info, mode, MEDIA_BUS_FMT_UYYVYY8_0_5X24))
|
+ if (is_tmds_allowed(info, mode, MEDIA_BUS_FMT_UYYVYY8_0_5X24))
|
||||||
+ output_fmts[i++] = MEDIA_BUS_FMT_UYYVYY8_0_5X24;
|
+ output_fmts[i++] = MEDIA_BUS_FMT_UYYVYY8_0_5X24;
|
||||||
|
|
||||||
*num_output_fmts = i;
|
if (drm_mode_is_420_only(info, mode))
|
||||||
|
*num_output_fmts = i;
|
||||||
- return output_fmts;
|
|
||||||
+ if (drm_mode_is_420_only(info, mode))
|
|
||||||
+ return output_fmts;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
@@ -2732,40 +2744,51 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
|
@@ -2732,40 +2744,51 @@ static u32 *dw_hdmi_bridge_atomic_get_output_bus_fmts(struct drm_bridge *bridge,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -40,16 +40,16 @@ Signed-off-by: Caesar Wang <wxt@rock-chips.com>
|
|||||||
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
|
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
|
||||||
Signed-off-by: Randy Li <ayaka@soulik.info>
|
Signed-off-by: Randy Li <ayaka@soulik.info>
|
||||||
---
|
---
|
||||||
drivers/soc/rockchip/pm_domains.c | 23 +++++++++++++++++++++++
|
drivers/pmdomain/rockchip/pm-domains.c | 23 +++++++++++++++++++++++
|
||||||
include/linux/rockchip_pmu.h | 15 +++++++++++++++
|
include/linux/rockchip_pmu.h | 15 +++++++++++++++
|
||||||
include/soc/rockchip/pm_domains.h | 6 ++++++
|
include/soc/rockchip/pm_domains.h | 6 ++++++
|
||||||
3 files changed, 44 insertions(+)
|
3 files changed, 44 insertions(+)
|
||||||
create mode 100644 include/linux/rockchip_pmu.h
|
create mode 100644 include/linux/rockchip_pmu.h
|
||||||
|
|
||||||
diff --git a/drivers/soc/rockchip/pm_domains.c b/drivers/soc/rockchip/pm_domains.c
|
diff --git a/drivers/pmdomain/rockchip/pm-domains.c b/drivers/pmdomain/rockchip/pm-domains.c
|
||||||
index 89795abac951..ffb5d62c9d52 100644
|
index 89795abac951..ffb5d62c9d52 100644
|
||||||
--- a/drivers/soc/rockchip/pm_domains.c
|
--- a/drivers/pmdomain/rockchip/pm-domains.c
|
||||||
+++ b/drivers/soc/rockchip/pm_domains.c
|
+++ b/drivers/pmdomain/rockchip/pm-domains.c
|
||||||
@@ -309,6 +309,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
|
@@ -309,6 +309,29 @@ static int rockchip_pmu_set_idle_request(struct rockchip_pm_domain *pd,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user