kernel: bump 5.10 to 5.10.94

[openwrt/staging/chunkeey.git] / target / linux / bcm27xx / patches-5.10 / 950-0717-drm-vc4-hdmi-Make-sure-the-controller-is-powered-up-.patch

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 fdfc35d0ab5df9744d0a8c4092690833676e13b6..f2424cbfac7a75ed8f6c7cf5bdbe5b19f4a16358 100644 (file)
--- 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,9 +18,9 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2289,6 +2289,18 @@ static int vc4_hdmi_bind(struct device *
-       vc4_hdmi->disable_wifi_frequencies =
-               of_property_read_bool(dev->of_node, "wifi-2.4ghz-coexistence");
+@@ -2304,6 +2304,18 @@ static int vc4_hdmi_bind(struct device *
+       if (ret)
+               goto err_put_ddc;
  
 +      /*
 +       * We need to have the device powered up at this point to call
@@ -37,7 +37,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
        if (vc4_hdmi->variant->reset)
                vc4_hdmi->variant->reset(vc4_hdmi);
  
-@@ -2300,8 +2312,6 @@ static int vc4_hdmi_bind(struct device *
+@@ -2315,8 +2327,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);
  
-@@ -2325,6 +2335,8 @@ static int vc4_hdmi_bind(struct device *
+@@ -2340,6 +2350,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:
-@@ -2335,6 +2347,7 @@ err_destroy_conn:
+@@ -2350,6 +2362,7 @@ err_destroy_conn:
        vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
  err_destroy_encoder:
        drm_encoder_cleanup(encoder);