Merge tag 'topic/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel into drm-next

Update pull request with drm core patches. Mostly some polish for the
primary plane stuff and a pile of patches all over from Thierry. Has
survived a few days in drm-intel-nightly without causing ill.

I've frobbed my scripts a bit to also tag my topic branches so that you
have something stable to pull - I've accidentally pushed a bunch more
patches onto this branch before you've taken the old pull request.

* tag 'topic/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel:
  drm: Make drm_crtc_helper_disable() return void
  drm: Fix indentation of closing brace
  drm/dp: Fix typo in comment
  drm: Fixup flip-work kerneldoc
  drm/fb: Fix typos
  drm/edid: Cleanup kerneldoc
  drm/edid: Drop revision argument for drm_mode_std()
  drm: Try to acquire modeset lock on panic or sysrq
  drm: remove unused argument from drm_open_helper
  drm: Handle ->disable_plane failures correctly
  drm: Simplify fb refcounting rules around ->update_plane
  drm/crtc-helper: gc usless connector loop in disable_unused_functions
  drm/plane_helper: don't disable plane in destroy function
  drm/plane-helper: Fix primary plane scaling check
  drm: make mode_valid callback optional
  drm/edid: Fill PAR in AVI infoframe based on CEA mode list

1 files changed, 17 insertions, 10 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index a3fe32439a5b..34f0bf18d80d 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1145,16 +1145,19 @@ EXPORT_SYMBOL(drm_plane_cleanup);
  */
 void drm_plane_force_disable(struct drm_plane *plane)
 {
+        struct drm_framebuffer *old_fb = plane->fb;
         int ret;
 
-        if (!plane->fb)
+        if (!old_fb)
                 return;
 
         ret = plane->funcs->disable_plane(plane);
-        if (ret)
+        if (ret) {
                 DRM_ERROR("failed to disable plane with busy fb\n");
+                return;
+        }
         /* disconnect the plane from the fb and crtc: */
-        __drm_framebuffer_unreference(plane->fb);
+        __drm_framebuffer_unreference(old_fb);
         plane->fb = NULL;
         plane->crtc = NULL;
 }
@@ -2122,9 +2125,13 @@ int drm_mode_setplane(struct drm_device *dev, void *data,
         if (!plane_req->fb_id) {
                 drm_modeset_lock_all(dev);
                 old_fb = plane->fb;
-                plane->funcs->disable_plane(plane);
-                plane->crtc = NULL;
-                plane->fb = NULL;
+                ret = plane->funcs->disable_plane(plane);
+                if (!ret) {
+                        plane->crtc = NULL;
+                        plane->fb = NULL;
+                } else {
+                        old_fb = NULL;
+                }
                 drm_modeset_unlock_all(dev);
                 goto out;
         }
@@ -2193,16 +2200,18 @@ int drm_mode_setplane(struct drm_device *dev, void *data,
         }
 
         drm_modeset_lock_all(dev);
+        old_fb = plane->fb;
         ret = plane->funcs->update_plane(plane, crtc, fb,
                                          plane_req->crtc_x, plane_req->crtc_y,
                                          plane_req->crtc_w, plane_req->crtc_h,
                                          plane_req->src_x, plane_req->src_y,
                                          plane_req->src_w, plane_req->src_h);
         if (!ret) {
-                old_fb = plane->fb;
                 plane->crtc = crtc;
                 plane->fb = fb;
                 fb = NULL;
+        } else {
+                old_fb = NULL;
         }
         drm_modeset_unlock_all(dev);
 
@@ -2245,9 +2254,7 @@ int drm_mode_set_config_internal(struct drm_mode_set *set)
         ret = crtc->funcs->set_config(set);
         if (ret == 0) {
                 crtc->primary->crtc = crtc;
-
-                /* crtc->fb must be updated by ->set_config, enforces this. */
-                WARN_ON(fb != crtc->primary->fb);
+                crtc->primary->fb = fb;
         }
 
         list_for_each_entry(tmp, &crtc->dev->mode_config.crtc_list, head) {