From: Dave Airlie Date: Fri, 28 Apr 2017 19:48:45 +0000 (+1000) Subject: Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=97643d75b053cd2aa7b23a93a474ed3690e34384;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next Latest updates on Mali DP, adding support for colour management, plane scaling and power management. (these have been in -next for a while). * 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld: drm: mali-dp: use div_u64 for expensive 64-bit divisions drm: mali-dp: Check the mclk rate and allow up/down scaling drm: mali-dp: Enable image enhancement when scaling drm: mali-dp: Add plane upscaling support drm/mali-dp: Add core_id file to the sysfs interface drm: mali-dp: Add CTM support drm: mali-dp: enable gamma support drm: mali-dp: add malidp_crtc_state struct drm: mali-dp: add custom reset hook for planes drm: mali-dp: remove unused variable drm: mali-dp: add atomic_print_state for planes drm: mali-dp: Enable power management for the device. drm: mali-dp: Update the state of all planes before re-enabling active CRTCs. --- 97643d75b053cd2aa7b23a93a474ed3690e34384