drm/i915: Drop unused position fields (v2)

The userspace-requested plane coordinates are now always available via
plane->state.base (and the i915-adjusted values are stored in
plane->state), so we no longer use the coordinate fields in intel_plane
and can drop them.

Also, note that the error case for pageflip calls update_plane() to
program the values from plane->state; it's simpler to just call
intel_plane_restore() which does the same thing.

v2: Replace manual update_plane() with intel_plane_restore() in pageflip
    error handler.

Reviewed-by(v1): Bob Paauwe <bob.j.paauwe@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 73f9a755cc91abb9e3fa7d028b5d84dec50e4f75..78a199e5b54266ea385d9cc31691965917775263 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9616,7 +9616,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
        struct drm_i915_gem_object *obj = intel_fb_obj(fb);
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
        struct drm_plane *primary = crtc->primary;
-       struct intel_plane *intel_plane = to_intel_plane(primary);
        enum pipe pipe = intel_crtc->pipe;
        struct intel_unpin_work *work;
        struct intel_engine_cs *ring;
@@ -9775,15 +9774,7 @@ free_work:
 
        if (ret == -EIO) {
 out_hang:
-               ret = primary->funcs->update_plane(primary, crtc, fb,
-                                                  intel_plane->crtc_x,
-                                                  intel_plane->crtc_y,
-                                                  intel_plane->crtc_h,
-                                                  intel_plane->crtc_w,
-                                                  intel_plane->src_x,
-                                                  intel_plane->src_y,
-                                                  intel_plane->src_h,
-                                                  intel_plane->src_w);
+               ret = intel_plane_restore(primary);
                if (ret == 0 && event) {
                        spin_lock_irq(&dev->event_lock);
                        drm_send_vblank_event(dev, pipe, event);
@@ -11823,14 +11814,6 @@ intel_commit_primary_plane(struct drm_plane *plane,
        crtc->x = src->x1 >> 16;
        crtc->y = src->y1 >> 16;
 
-       intel_plane->crtc_x = state->base.crtc_x;
-       intel_plane->crtc_y = state->base.crtc_y;
-       intel_plane->crtc_w = state->base.crtc_w;
-       intel_plane->crtc_h = state->base.crtc_h;
-       intel_plane->src_x = state->base.src_x;
-       intel_plane->src_y = state->base.src_y;
-       intel_plane->src_w = state->base.src_w;
-       intel_plane->src_h = state->base.src_h;
        intel_plane->obj = obj;
 
        if (intel_crtc->active) {
@@ -12111,14 +12094,6 @@ intel_commit_cursor_plane(struct drm_plane *plane,
        crtc->cursor_x = state->base.crtc_x;
        crtc->cursor_y = state->base.crtc_y;
 
-       intel_plane->crtc_x = state->base.crtc_x;
-       intel_plane->crtc_y = state->base.crtc_y;
-       intel_plane->crtc_w = state->base.crtc_w;
-       intel_plane->crtc_h = state->base.crtc_h;
-       intel_plane->src_x = state->base.src_x;
-       intel_plane->src_y = state->base.src_y;
-       intel_plane->src_w = state->base.src_w;
-       intel_plane->src_h = state->base.src_h;
        intel_plane->obj = obj;
 
        if (intel_crtc->cursor_bo == obj)

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index be85ae98811ee816338619ecb94704da993918a3..eca2395e13c855130d36c4d757e6a36d36f2b3ca 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -517,10 +517,6 @@ struct intel_plane {
        struct drm_i915_gem_object *obj;
        bool can_scale;
        int max_downscale;
-       int crtc_x, crtc_y;
-       unsigned int crtc_w, crtc_h;
-       uint32_t src_x, src_y;
-       uint32_t src_w, src_h;
        unsigned int rotation;
 
        /* Since we need to change the watermarks before/after

diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
index c7e70511d25e3b99e82e53086f316caae965f6ba..dca3f70ef1ba02aebd587f7e8163f108a1daedb7 100644 (file)
--- a/drivers/gpu/drm/i915/intel_sprite.c
+++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -1277,15 +1277,6 @@ intel_commit_sprite_plane(struct drm_plane *plane,
        unsigned int crtc_w, crtc_h;
        uint32_t src_x, src_y, src_w, src_h;
 
-       intel_plane->crtc_x = state->base.crtc_x;
-       intel_plane->crtc_y = state->base.crtc_y;
-       intel_plane->crtc_w = state->base.crtc_w;
-       intel_plane->crtc_h = state->base.crtc_h;
-       intel_plane->src_x = state->base.src_x;
-       intel_plane->src_y = state->base.src_y;
-       intel_plane->src_w = state->base.src_w;
-       intel_plane->src_h = state->base.src_h;
-
        crtc = crtc ? crtc : plane->crtc;
        intel_crtc = to_intel_crtc(crtc);
 
@@ -1400,16 +1391,14 @@ int intel_plane_set_property(struct drm_plane *plane,
 
 int intel_plane_restore(struct drm_plane *plane)
 {
-       struct intel_plane *intel_plane = to_intel_plane(plane);
-
        if (!plane->crtc || !plane->fb)
                return 0;
 
        return plane->funcs->update_plane(plane, plane->crtc, plane->fb,
-                                 intel_plane->crtc_x, intel_plane->crtc_y,
-                                 intel_plane->crtc_w, intel_plane->crtc_h,
-                                 intel_plane->src_x, intel_plane->src_y,
-                                 intel_plane->src_w, intel_plane->src_h);
+                                 plane->state->crtc_x, plane->state->crtc_y,
+                                 plane->state->crtc_w, plane->state->crtc_h,
+                                 plane->state->src_x, plane->state->src_y,
+                                 plane->state->src_w, plane->state->src_h);
 }
 
 static const struct drm_plane_funcs intel_sprite_plane_funcs = {