Merge branch 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux into...
authorDave Airlie <airlied@redhat.com>
Mon, 22 Dec 2014 22:21:54 +0000 (08:21 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 22 Dec 2014 22:21:54 +0000 (08:21 +1000)
A few msm fixes for 3.19:
 * hdmi regulators fix
 * hdmi fix for spurious HPD interrupts
 * fix for sync atomic update after async update (which could show
   up with a setcrtc following a pageflip)
 * couple little Coccinelle cleanups

* 'msm-fixes-3.19' of git://people.freedesktop.org/~robclark/linux:
  drm/msm/hdmi: rework HDMI IRQ handler
  drm/msm/hdmi: enable regulators before clocks to avoid warnings
  drm/msm/mdp5: update irqs on crtc<->encoder link change
  drm/msm: block incoming update on pending updates
  drm/msm: Deletion of unnecessary checks before the function call "release_firmware"
  drm/msm: Deletion of unnecessary checks before two function calls

1  2 
drivers/gpu/drm/msm/msm_drv.c

index c795217e1bfcc6051b72afd05cb09cfbbff34c2c,7e1c71e51cb44734f6fa77acb9f36137451a6ce5..9a61546a0b05276cd313b0877306b02930fa2fa5
@@@ -193,6 -193,7 +193,7 @@@ static int msm_load(struct drm_device *
  
        priv->wq = alloc_ordered_workqueue("msm", 0);
        init_waitqueue_head(&priv->fence_event);
+       init_waitqueue_head(&priv->pending_crtcs_event);
  
        INIT_LIST_HEAD(&priv->inactive_list);
        INIT_LIST_HEAD(&priv->fence_cbs);
@@@ -1012,6 -1013,7 +1013,6 @@@ static struct platform_driver msm_platf
        .probe      = msm_pdev_probe,
        .remove     = msm_pdev_remove,
        .driver     = {
 -              .owner  = THIS_MODULE,
                .name   = "msm",
                .of_match_table = dt_match,
                .pm     = &msm_pm_ops,