From: Dave Airlie Date: Mon, 8 Oct 2018 06:38:48 +0000 (+1000) Subject: Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6952e3a1dffcb931cf8625aa01642b9afac2af61;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next I've realised that the commit 3dae1c0919d8 ("drm/arm/malidp: Implemented the size validation for AFBC framebuffers") got bungled up in the upstreaming process and it was missing an important line from the function that calculates the size of the AFBC framebuffer Signed-off-by: Dave Airlie From: Liviu Dudau Link: https://patchwork.freedesktop.org/patch/msgid/20181005152423.GF1156@e110455-lin.cambridge.arm.com --- 6952e3a1dffcb931cf8625aa01642b9afac2af61