|
@@ -228,8 +228,6 @@ struct nv50_wndw_atom {
|
|
|
struct drm_plane_state state;
|
|
|
u8 interval;
|
|
|
|
|
|
- struct drm_rect clip;
|
|
|
-
|
|
|
struct {
|
|
|
u32 handle;
|
|
|
u16 offset:12;
|
|
@@ -840,10 +838,6 @@ nv50_wndw_atomic_check_acquire(struct nv50_wndw *wndw,
|
|
|
int ret;
|
|
|
|
|
|
NV_ATOMIC(drm, "%s acquire\n", wndw->plane.name);
|
|
|
- asyw->clip.x1 = 0;
|
|
|
- asyw->clip.y1 = 0;
|
|
|
- asyw->clip.x2 = asyh->state.mode.hdisplay;
|
|
|
- asyw->clip.y2 = asyh->state.mode.vdisplay;
|
|
|
|
|
|
asyw->image.w = fb->base.width;
|
|
|
asyw->image.h = fb->base.height;
|
|
@@ -1141,10 +1135,15 @@ static int
|
|
|
nv50_curs_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
|
|
|
struct nv50_head_atom *asyh)
|
|
|
{
|
|
|
+ struct drm_rect clip = {};
|
|
|
int ret;
|
|
|
|
|
|
+ if (asyh->state.enable)
|
|
|
+ drm_mode_get_hv_timing(&asyh->state.mode,
|
|
|
+ &clip.x2, &clip.y2);
|
|
|
+
|
|
|
ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
|
|
|
- &asyw->clip,
|
|
|
+ &clip,
|
|
|
DRM_PLANE_HELPER_NO_SCALING,
|
|
|
DRM_PLANE_HELPER_NO_SCALING,
|
|
|
true, true);
|
|
@@ -1428,13 +1427,18 @@ nv50_base_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
|
|
|
struct nv50_head_atom *asyh)
|
|
|
{
|
|
|
const struct drm_framebuffer *fb = asyw->state.fb;
|
|
|
+ struct drm_rect clip = {};
|
|
|
int ret;
|
|
|
|
|
|
if (!fb->format->depth)
|
|
|
return -EINVAL;
|
|
|
|
|
|
+ if (asyh->state.enable)
|
|
|
+ drm_mode_get_hv_timing(&asyh->state.mode,
|
|
|
+ &clip.x2, &clip.y2);
|
|
|
+
|
|
|
ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
|
|
|
- &asyw->clip,
|
|
|
+ &clip,
|
|
|
DRM_PLANE_HELPER_NO_SCALING,
|
|
|
DRM_PLANE_HELPER_NO_SCALING,
|
|
|
false, true);
|