diff options
author | John Audia <therealgraysky@proton.me> | 2023-03-12 10:03:16 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-03-27 18:58:34 +0200 |
commit | 24d84a13a41008c1feb906a5ffc0da74e00275f5 (patch) | |
tree | 0f990b18d0a771df05e435330fd6a8b7b5f3bacf /target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch | |
parent | 36bf158b47b6b013fb3f68aa4e2bf2ffc90bb9b0 (diff) | |
download | upstream-24d84a13a41008c1feb906a5ffc0da74e00275f5.tar.gz upstream-24d84a13a41008c1feb906a5ffc0da74e00275f5.tar.bz2 upstream-24d84a13a41008c1feb906a5ffc0da74e00275f5.zip |
kernel: bump 5.10 to 5.10.173
Manually rebased:
ramips/patches-5.10/810-uvc-add-iPassion-iP2970-support.patch
All other patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit d4aad642ff80750ec16a58058eb6da718e2129cd)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch b/target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch index 4489ca2d78..b8d53685b6 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch @@ -18,7 +18,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c -@@ -2296,6 +2296,18 @@ static int vc4_hdmi_bind(struct device * +@@ -2297,6 +2297,18 @@ static int vc4_hdmi_bind(struct device * if (ret) goto err_put_ddc; @@ -37,7 +37,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> if (vc4_hdmi->variant->reset) vc4_hdmi->variant->reset(vc4_hdmi); -@@ -2307,8 +2319,6 @@ static int vc4_hdmi_bind(struct device * +@@ -2308,8 +2320,6 @@ static int vc4_hdmi_bind(struct device * clk_prepare_enable(vc4_hdmi->pixel_bvb_clock); } @@ -46,7 +46,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS); drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs); -@@ -2332,6 +2342,8 @@ static int vc4_hdmi_bind(struct device * +@@ -2333,6 +2343,8 @@ static int vc4_hdmi_bind(struct device * vc4_hdmi_debugfs_regs, vc4_hdmi); @@ -55,7 +55,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> return 0; err_free_cec: -@@ -2342,6 +2354,7 @@ err_destroy_conn: +@@ -2343,6 +2355,7 @@ err_destroy_conn: vc4_hdmi_connector_destroy(&vc4_hdmi->connector); err_destroy_encoder: drm_encoder_cleanup(encoder); |