From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Jun 2017 01:17:30 +0000 (+1000)
Subject: Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next
X-Git-Tag: v4.13~331^2~12
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3aaf4d95b07333af27c050511898d74a299fc743;p=mirror_ubuntu-artful-kernel.git

Merge branch 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld into drm-next

Here are the Mali DP driver changes. They include the mali-dp specific
changes from Jose Abreu on crtc->mode_valid() as well as a couple of
patches for fixing the sharing of IRQ lines and use of DRM CMA helper
for framebuffer physical address calculation. Please pull!

* 'for-upstream/mali-dp' of git://linux-arm.org/linux-ld:
  drm/arm: mali-dp: Use CMA helper for plane buffer address calculation
  drm/mali-dp: Check PM status when sharing interrupt lines
  drm/arm: malidp: Use crtc->mode_valid() callback
---

3aaf4d95b07333af27c050511898d74a299fc743