aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-07-03 15:26:59 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-03 18:54:04 +0200
commitee67afeda9eb2f4b0b779e2969421ce96c27e720 (patch)
treea6ffd2a06628fc452148fba044acc2c0f780fa4d /target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
parent32e90956623f736e992dfa4fdefd9657f0cd4f4a (diff)
downloadupstream-ee67afeda9eb2f4b0b779e2969421ce96c27e720.tar.gz
upstream-ee67afeda9eb2f4b0b779e2969421ce96c27e720.tar.bz2
upstream-ee67afeda9eb2f4b0b779e2969421ce96c27e720.zip
kernel: Refresh patches for all targets
This refreshes the patches on top of kernel 5.4.127. Deleted (upstreamed): bcm27xx/patches-5.10/950-0005-Revert-mailbox-avoid-timer-start-from-callback.patch [0] bcm27xx/patches-5.10/950-0678-bcm2711_thermal-Don-t-clamp-temperature-at-zero.patch [1] Needed manual modifications: bcm27xx/patches-5.10/950-0410-drm-atomic-Pass-the-full-state-to-CRTC-atomic-begin-.patch [0]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.127&id=bb2220e0672b7433a9a42618599cd261b2629240 [1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.127&id=83603802954068ccd1b8a3f2ccbbaf5e0862acb0 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch b/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
index a110b7a605..27bbf9ad67 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
@@ -468,7 +468,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
return 0;
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
-@@ -195,22 +195,27 @@ static void ingenic_drm_crtc_update_timi
+@@ -234,22 +234,27 @@ static void ingenic_drm_crtc_update_timi
}
static int ingenic_drm_crtc_atomic_check(struct drm_crtc *crtc,
@@ -589,7 +589,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
#include <drm/drm_mode.h>
#include <drm/drm_crtc.h>
#include <drm/drm_flip_work.h>
-@@ -682,15 +683,17 @@ static enum mdp_mixer_stage_id get_start
+@@ -688,15 +689,17 @@ static enum mdp_mixer_stage_id get_start
}
static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,
@@ -609,7 +609,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
bool cursor_plane = false;
bool need_right_mixer = false;
int cnt = 0, i;
-@@ -699,7 +702,7 @@ static int mdp5_crtc_atomic_check(struct
+@@ -705,7 +708,7 @@ static int mdp5_crtc_atomic_check(struct
DBG("%s: check", crtc->name);
@@ -618,7 +618,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
if (!pstate->visible)
continue;
-@@ -731,7 +734,7 @@ static int mdp5_crtc_atomic_check(struct
+@@ -737,7 +740,7 @@ static int mdp5_crtc_atomic_check(struct
if (mode->hdisplay > hw_cfg->lm.max_width)
need_right_mixer = true;
@@ -627,7 +627,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
if (ret) {
DRM_DEV_ERROR(dev->dev, "couldn't assign mixers %d\n", ret);
return ret;
-@@ -744,7 +747,7 @@ static int mdp5_crtc_atomic_check(struct
+@@ -750,7 +753,7 @@ static int mdp5_crtc_atomic_check(struct
WARN_ON(cursor_plane &&
(pstates[cnt - 1].plane->type != DRM_PLANE_TYPE_CURSOR));
@@ -886,7 +886,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
--- a/drivers/gpu/drm/vc4/vc4_txp.c
+++ b/drivers/gpu/drm/vc4/vc4_txp.c
-@@ -386,16 +386,18 @@ static const struct drm_crtc_funcs vc4_t
+@@ -392,16 +392,18 @@ static const struct drm_crtc_funcs vc4_t
};
static int vc4_txp_atomic_check(struct drm_crtc *crtc,