From: Dave Airlie <airlied@redhat.com>
Date: Tue, 11 Feb 2014 02:56:17 +0000 (+1000)
Subject: Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm... 
X-Git-Tag: firefly_0821_release~176^2~4437^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7431105b143098c3fc0ced8f9974b792f76198d7;p=firefly-linux-kernel-4.4.55.git

Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm-next

Compared to original fixes pull req that I sent yesterday, this adds
one more fix that I found for a synchronization issue which starts to
crop up when we use XA in DDX for 2d accel on 3d core.  In particular,
accelerating presentation blit triggers this problem.

* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: bigger synchronization hammer
  drm/msm: fix deadlock in bo create fail path
  drm/msm/mdp4: cursor fixes
  drm/msm/mdp4: pageflip fixes
  drm/msm/mdp5: fix ref leaks in error paths
  drm/msm: fix inconsequential typo
---

7431105b143098c3fc0ced8f9974b792f76198d7