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-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.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-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.patch | 14 |
1 files changed, 7 insertions, 7 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 3eb7205cee..abb90c862e 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 @@ -201,7 +201,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -5638,17 +5638,19 @@ static void dm_update_crtc_active_planes +@@ -5640,17 +5640,19 @@ static void dm_update_crtc_active_planes } static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc, @@ -225,7 +225,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max WARN_ON(1); return ret; } -@@ -5659,8 +5661,8 @@ static int dm_crtc_helper_atomic_check(s +@@ -5661,8 +5663,8 @@ static int dm_crtc_helper_atomic_check(s * planes are disabled, which is not supported by the hardware. And there is legacy * userspace which stops using the HW cursor altogether in response to the resulting EINVAL. */ @@ -503,7 +503,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c -@@ -815,10 +815,12 @@ struct plane_state { +@@ -818,10 +818,12 @@ struct plane_state { }; static int dpu_crtc_atomic_check(struct drm_crtc *crtc, @@ -518,9 +518,9 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max struct plane_state *pstates; const struct drm_plane_state *pstate; -@@ -835,32 +837,33 @@ static int dpu_crtc_atomic_check(struct - - pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL); +@@ -840,32 +842,33 @@ static int dpu_crtc_atomic_check(struct + if (!pstates) + return -ENOMEM; - if (!state->enable || !state->active) { + if (!crtc_state->enable || !crtc_state->active) { @@ -559,7 +559,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max struct drm_rect dst, clip = crtc_rect; if (IS_ERR_OR_NULL(pstate)) { -@@ -966,7 +969,7 @@ static int dpu_crtc_atomic_check(struct +@@ -971,7 +974,7 @@ static int dpu_crtc_atomic_check(struct atomic_inc(&_dpu_crtc_get_kms(crtc)->bandwidth_ref); |