OSDN Git Service

drm/vmwgfx: Use drm_mode_get_hv_timing() to populate plane clip rectangle
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 23 Nov 2017 19:05:00 +0000 (21:05 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 23 Jan 2018 15:59:13 +0000 (17:59 +0200)
Use drm_mode_get_hv_timing() to fill out the plane clip rectangle.

Note that this replaces crtc_state->adjusted_mode usage with
crtc_state->mode. The latter is the correct choice since that's the
mode the user provided and it matches the plane crtc coordinates
the user also provided.

Once everyone agrees on this we can move the clip handling into
drm_atomic_helper_check_plane_state().

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171123190502.28449-14-ville.syrjala@linux.intel.com
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

index 87a4430..2fb2125 100644 (file)
@@ -449,10 +449,9 @@ int vmw_du_primary_plane_atomic_check(struct drm_plane *plane,
        if (state->crtc)
                crtc_state = drm_atomic_get_new_crtc_state(state->state, state->crtc);
 
-       if (crtc_state && crtc_state->enable) {
-               clip.x2 = crtc_state->adjusted_mode.hdisplay;
-               clip.y2 = crtc_state->adjusted_mode.vdisplay;
-       }
+       if (crtc_state && crtc_state->enable)
+               drm_mode_get_hv_timing(&crtc_state->mode,
+                                      &clip.x2, &clip.y2);
 
        ret = drm_atomic_helper_check_plane_state(state, crtc_state, &clip,
                                                  DRM_PLANE_HELPER_NO_SCALING,