drm: Use atomic state for FB in legacy ioctls

If atomic state is available, use this to read the current plane in
GetCrtc/GetPlane, rather than the legacy points.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161213181912.92904-1-daniels@collabora.com

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index e75f62cd8a65f96afbd3d06d27deeb72c495e465..14c58072651b9da7c5d8af094a0d2a3b9acef80c 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -357,7 +357,10 @@ int drm_mode_getcrtc(struct drm_device *dev,
 
        drm_modeset_lock_crtc(crtc, crtc->primary);
        crtc_resp->gamma_size = crtc->gamma_size;
-       if (crtc->primary->fb)
+
+       if (crtc->primary->state && crtc->primary->state->fb)
+               crtc_resp->fb_id = crtc->primary->state->fb->base.id;
+       else if (!crtc->primary->state && crtc->primary->fb)
                crtc_resp->fb_id = crtc->primary->fb->base.id;
        else
                crtc_resp->fb_id = 0;

diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index 9147aab182c4eab18bfe26ccf1a578a969028634..4bfdada23196e31e912884da67b9651892fcb9e8 100644 (file)
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -392,12 +392,16 @@ int drm_mode_getplane(struct drm_device *dev, void *data,
                return -ENOENT;
 
        drm_modeset_lock(&plane->mutex, NULL);
-       if (plane->crtc)
+       if (plane->state && plane->state->crtc)
+               plane_resp->crtc_id = plane->state->crtc->base.id;
+       else if (!plane->state && plane->crtc)
                plane_resp->crtc_id = plane->crtc->base.id;
        else
                plane_resp->crtc_id = 0;
 
-       if (plane->fb)
+       if (plane->state && plane->state->fb)
+               plane_resp->fb_id = plane->state->fb->base.id;
+       else if (!plane->state && plane->fb)
                plane_resp->fb_id = plane->fb->base.id;
        else
                plane_resp->fb_id = 0;