Hi Dave,
I have accumulated some patches as we went through some internal testing for mali-dp and I was waiting for the YUV2RGB patches to land in your tree, so I would like to get them into drm-next at your earliest convenient time.
Please note that after you pull Dan Carpenter's patch f2f2c85c6620 ("drm: mali-dp: Uninitialized variable in malidp_se_check_scaling()")
you will get a conflict with Ville's commit 81af63a4af82 ("drm: Don't pass clip to drm_atomic_helper_check_plane_state()") in drm-misc-next. The way it was fixed in linux-next was:
diff --cc drivers/gpu/drm/arm/malidp_planes.c index ee32361c87ac,b2d11df6b5e1..000000000000 --- a/drivers/gpu/drm/arm/malidp_planes.c +++ b/drivers/gpu/drm/arm/malidp_planes.c @@@ -147,7 -147,13 +146,9 @@@ static int malidp_se_check_scaling(stru if (!crtc_state) return -EINVAL;
- if (crtc_state->enable) - drm_mode_get_hv_timing(&crtc_state->mode, - &clip.x2, &clip.y2); - + mc = to_malidp_crtc_state(crtc_state); + - ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip, + ret = drm_atomic_helper_check_plane_state(state, crtc_state, 0, INT_MAX, true, true); if (ret) return ret;
Please pull.
Best regards, Liviu
The following changes since commit 963976cfe9c54d4d9e725e61c90c47a4af6b5ea2:
Merge tag 'drm-intel-next-2018-03-08' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2018-03-14 14:53:01 +1000)
are available in the Git repository at:
git://linux-arm.org/linux-ld.git for-upstream/mali-dp
for you to fetch changes up to 6e810eb508f4b937bc2a718bd4e5cd74cca55500:
drm: mali-dp: Add YUV->RGB conversion support for video layers (2018-03-14 11:41:01 +0000)
---------------------------------------------------------------- Ayan Halder (2): drm: mali-dp: Fix bug on scaling with rotation drm/arm/malidp: Disable pixel alpha blending for colors that do not have alpha
Dan Carpenter (1): drm: mali-dp: Uninitialized variable in malidp_se_check_scaling()
Laurent Pinchart (2): drm: arm: malidp: Don't destroy planes manually in error handlers drm: arm: malidp: Use drm_atomic_helper_shutdown() to disable planes on removal
Liviu Dudau (5): drm/mali-dp: Rotated planes need a larger pitch size. drm/mali-dp: Align pitch size to be multiple of bus burst read size. drm/mali-dp: Don't enable scaling engine for planes that only rotate. drm/mali-dp: Fix malidp_atomic_commit_hw_done() for event sending. drm: mali-dp: Turn off CRTC vblank when removing module.
Mihail Atanassov (1): drm: mali-dp: Add YUV->RGB conversion support for video layers
drivers/gpu/drm/arm/malidp_crtc.c | 20 ++--- drivers/gpu/drm/arm/malidp_drv.c | 51 ++++++++----- drivers/gpu/drm/arm/malidp_drv.h | 2 +- drivers/gpu/drm/arm/malidp_hw.c | 26 ++++--- drivers/gpu/drm/arm/malidp_hw.h | 15 +++- drivers/gpu/drm/arm/malidp_planes.c | 141 +++++++++++++++++++++++++++++------- drivers/gpu/drm/arm/malidp_regs.h | 11 +-- 7 files changed, 189 insertions(+), 77 deletions(-)