diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0741-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0741-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0741-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch b/target/linux/bcm27xx/patches-5.15/950-0741-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch index 5fd8ea995a..aa82f3c7e1 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0741-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0741-drm-vc4-hvs-Use-pointer-to-HVS-in-HVS_READ-and-HVS_W.patch @@ -45,7 +45,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> *hpos += mode->crtc_htotal / 2; } -@@ -449,6 +451,7 @@ static void vc4_crtc_config_pv(struct dr +@@ -433,6 +435,7 @@ static void vc4_crtc_config_pv(struct dr static void require_hvs_enabled(struct drm_device *dev) { struct vc4_dev *vc4 = to_vc4_dev(dev); @@ -53,7 +53,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> WARN_ON_ONCE((HVS_READ(SCALER_DISPCTRL) & SCALER_DISPCTRL_ENABLE) != SCALER_DISPCTRL_ENABLE); -@@ -462,6 +465,7 @@ static int vc4_crtc_disable(struct drm_c +@@ -446,6 +449,7 @@ static int vc4_crtc_disable(struct drm_c struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder); struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); struct drm_device *dev = crtc->dev; @@ -61,7 +61,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> int ret; CRTC_WRITE(PV_V_CONTROL, -@@ -491,7 +495,7 @@ static int vc4_crtc_disable(struct drm_c +@@ -475,7 +479,7 @@ static int vc4_crtc_disable(struct drm_c vc4_encoder->post_crtc_disable(encoder, state); vc4_crtc_pixelvalve_reset(crtc); @@ -70,7 +70,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> if (vc4_encoder && vc4_encoder->post_crtc_powerdown) vc4_encoder->post_crtc_powerdown(encoder, state); -@@ -517,6 +521,7 @@ static struct drm_encoder *vc4_crtc_get_ +@@ -501,6 +505,7 @@ static struct drm_encoder *vc4_crtc_get_ int vc4_crtc_disable_at_boot(struct drm_crtc *crtc) { struct drm_device *drm = crtc->dev; @@ -78,7 +78,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); enum vc4_encoder_type encoder_type; const struct vc4_pv_data *pv_data; -@@ -538,7 +543,7 @@ int vc4_crtc_disable_at_boot(struct drm_ +@@ -522,7 +527,7 @@ int vc4_crtc_disable_at_boot(struct drm_ if (!(CRTC_READ(PV_V_CONTROL) & PV_VCONTROL_VIDEN)) return 0; @@ -87,7 +87,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> if (channel < 0) return 0; -@@ -754,6 +759,7 @@ static void vc4_crtc_handle_page_flip(st +@@ -738,6 +743,7 @@ static void vc4_crtc_handle_page_flip(st struct drm_crtc *crtc = &vc4_crtc->base; struct drm_device *dev = crtc->dev; struct vc4_dev *vc4 = to_vc4_dev(dev); @@ -95,7 +95,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> u32 chan = vc4_crtc->current_hvs_channel; unsigned long flags; -@@ -772,7 +778,7 @@ static void vc4_crtc_handle_page_flip(st +@@ -756,7 +762,7 @@ static void vc4_crtc_handle_page_flip(st * the CRTC and encoder already reconfigured, leading to * underruns. This can be seen when reconfiguring the CRTC. */ |