Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
authorDave Airlie <[email protected]>
Mon, 8 Oct 2018 06:38:48 +0000 (16:38 +1000)
committerDave Airlie <[email protected]>
Mon, 8 Oct 2018 06:45:40 +0000 (16:45 +1000)
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 <[email protected]>
From: Liviu Dudau <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

Trivial merge