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

* 'msm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/omap: Don't dereference list head when the connectors list is empty
  drm/msm/mdp: add timeout for irq wait
  drm/msm: validate flags, etc
  drm/msm: use componentised device support
  drm/msm: add chip-id param
  drm/msm: crank down gpu when inactive
  drm/msm: spin helper
  drm/msm: add hang_debug module param
  drm/msm: hdmi audio support

diff --combined drivers/gpu/drm/omapdrm/omap_fb.c
index 0d5e9b7,19a9b86..d2b8c49
--- 1/drivers/gpu/drm/omapdrm/omap_fb.c
--- 2/drivers/gpu/drm/omapdrm/omap_fb.c
+++ b/drivers/gpu/drm/omapdrm/omap_fb.c
@@@ -306,13 -306,14 +306,14 @@@ struct drm_connector *omap_framebuffer_
        struct drm_connector *connector = from;
  
        if (!from)
-               return list_first_entry(connector_list, typeof(*from), head);
+               return list_first_entry_or_null(connector_list, typeof(*from),
+                                               head);
  
        list_for_each_entry_from(connector, connector_list, head) {
                if (connector != from) {
                        struct drm_encoder *encoder = connector->encoder;
                        struct drm_crtc *crtc = encoder ? encoder->crtc : NULL;
 -                      if (crtc && crtc->fb == fb)
 +                      if (crtc && crtc->primary->fb == fb)
                                return connector;
  
                }