Merge branch 'msm-next' of git://people.freedesktop.org/~robclark/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 11 Feb 2014 02:56:17 +0000 (12:56 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 11 Feb 2014 02:56:17 +0000 (12:56 +1000)
commit7431105b143098c3fc0ced8f9974b792f76198d7
treea5782ccb2e10a2b4d01cfa8f6e0dab5a34e15ce7
parent9b5a3c0af996c3a3795ba7b32e861824158b0820
parentc2703b13a63da335053a2f3cb560bb806bdda0ae
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