Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 8 Oct 2018 06:38:48 +0000 (16:38 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 8 Oct 2018 06:45:40 +0000 (16:45 +1000)
commit6952e3a1dffcb931cf8625aa01642b9afac2af61
treef832e76cba93ba41a132cf5fa5ebddb234c3f6c1
parentc530174b90fa3bcaa83d168b001b574bcb2da021
parentfd99bd8b805c7c01af7dd66e22bb31c8cfe64310
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 <airlied@redhat.com>
From: Liviu Dudau <Liviu.Dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181005152423.GF1156@e110455-lin.cambridge.arm.com