]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcb2444d60d273cdf2bd48d6132f509d096882878
treef832e76cba93ba41a132cf5fa5ebddb234c3f6c1
parent1314d2c9597f4b48c0217f146767bc550b51d936
parent6edac8884fca0a4f874f619a9693d15ad68e97c7
Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next

I've realised that the commit 0a8ac4d3e9d5 ("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