drm/i915: Pass in plane state instead of plane to intel_plane_obj_offset
Subsystems (2)
RFC 1/3 drm/i915: Pass in plane state instead of plane to intel_plane_obj_offset
From: Tvrtko Ursulin <[email protected]>
We don't need the plane but just it's state and so it will be more handy to pass it in directly.
Signed-off-by Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 13 +++++++------ drivers/gpu/drm/i915/intel_drv.h | 6 ++++-- drivers/gpu/drm/i915/intel_sprite.c | 3 ++- 3 files changed, 13 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_display.c +7 -6
@@ -2897,12 +2897,13 @@ u32 intel_fb_stride_alignment(struct drm_device *dev, uint64_t fb_modifier, } } -unsigned long intel_plane_obj_offset (struct intel_plane *intel_plane, -struct drm_i915_gem_object *obj) +unsigned long +intel_plane_obj_offset (struct intel_plane_state *intel_plane_state, +struct drm_i915_gem_object *obj) {const struct i915_ggtt_view *view = &i915_ggtt_view_normal; -if (intel_rotation_90_or_270 (intel_plane->base.state->rotation)) +if (intel_rotation_90_or_270 (intel_plane_state->base.rotation)) view = &i915_ggtt_view_rotated;return i915_gem_obj_ggtt_offset_view (obj, view);
@@ -3063,7 +3064,7 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, obj =intel_fb_obj (fb); stride_div =intel_fb_stride_alignment (dev, fb->modifier[0 ], fb->pixel_format); - surf_addr =intel_plane_obj_offset (to_intel_plane (plane), obj); + surf_addr =intel_plane_obj_offset (plane_state, obj);/* * FIXME: intel_plane_state->src, dst aren't set when transitional
@@ -11557,8 +11558,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,if (ret) goto cleanup_pending; - work->gtt_offset =intel_plane_obj_offset (to_intel_plane (primary), obj) - + intel_crtc->dspaddr_offset; + work->gtt_offset =intel_plane_obj_offset (to_intel_plane_state (primary->state), + obj) + intel_crtc->dspaddr_offset;if (mmio_flip) { ret = intel_queue_mmio_flip(dev, crtc, fb, obj, ring,
drivers/gpu/drm/i915/intel_drv.h +4 -2
@@ -1153,8 +1153,10 @@ int skl_update_scaler_users(struct intel_crtc *intel_crtc, struct intel_plane_state *plane_state, int force_detach);int skl_max_scale (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state); -unsigned long intel_plane_obj_offset (struct intel_plane *intel_plane, -struct drm_i915_gem_object *obj); +unsigned long +intel_plane_obj_offset (struct intel_plane_state *intel_plane_state, +struct drm_i915_gem_object *obj); +u32 skl_plane_ctl_format (uint32_t pixel_format);u32 skl_plane_ctl_tiling (uint64_t fb_modifier);u32 skl_plane_ctl_rotation (unsigned int rotation);
drivers/gpu/drm/i915/intel_sprite.c +2 -1
@@ -225,7 +225,8 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,else if (key->flags &I915_SET_COLORKEY_SOURCE ) plane_ctl |=PLANE_CTL_KEY_ENABLE_SOURCE ; - surf_addr =intel_plane_obj_offset (intel_plane, obj); + surf_addr =intel_plane_obj_offset (to_intel_plane_state (drm_plane->state), + obj);if (intel_rotation_90_or_270 (rotation)) {/* stride: Surface height in tiles */
Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 2/3 drm/i915: Cache display address in plane state
From: Tvrtko Ursulin <[email protected]>
There is no need to "recompute" it every time since it is guaranteed to be static for the lifetime of a frame buffer being assigned to a plane for display purposes.
Signed-off-by Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 17 +++++++++++------ drivers/gpu/drm/i915/intel_drv.h | 6 ++++++ drivers/gpu/drm/i915/intel_sprite.c | 8 ++------ 3 files changed, 19 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_display.c +11 -6
@@ -2334,6 +2334,7 @@ intel_pin_and_fence_fb_obj(struct drm_plane *plane,struct drm_device *dev = fb->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct drm_i915_gem_object *obj =intel_fb_obj (fb); +struct intel_plane_state *intel_plane_state;struct i915_ggtt_view view;u32 alignment;int ret;
@@ -2398,6 +2399,12 @@ intel_pin_and_fence_fb_obj(struct drm_plane *plane,if (ret) goto err_interruptible; +if (plane_state) { + intel_plane_state =to_intel_plane_state (plane_state); + intel_plane_state->disp_addr = +intel_plane_obj_offset (intel_plane_state, obj); + } +/* Install a fence for tiled scan-out. Pre-i965 always needs a * fence, whereas 965+ only requires a fence if using * framebuffer compression. For simplicity, we always install
@@ -3034,7 +3041,6 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,u32 tile_height, plane_offset, plane_size;unsigned int rotation;int x_offset, y_offset; -unsigned long surf_addr;struct intel_crtc_state *crtc_state = intel_crtc->config;struct intel_plane_state *plane_state;int src_x =0 , src_y =0 , src_w =0 , src_h =0 ;
@@ -3064,7 +3070,6 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc, obj =intel_fb_obj (fb); stride_div =intel_fb_stride_alignment (dev, fb->modifier[0 ], fb->pixel_format); - surf_addr =intel_plane_obj_offset (plane_state, obj);/* * FIXME: intel_plane_state->src, dst aren't set when transitional
@@ -3124,7 +3129,7 @@ static void skylake_update_primary_plane(struct drm_crtc *crtc,I915_WRITE (PLANE_POS (pipe,0 ), (dst_y <<16 ) | dst_x); } -I915_WRITE (PLANE_SURF (pipe,0 ), surf_addr); +I915_WRITE (PLANE_SURF (pipe,0 ), plane_state->disp_addr);POSTING_READ (PLANE_SURF (pipe,0 )); }
@@ -11558,8 +11563,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,if (ret) goto cleanup_pending; - work->gtt_offset =intel_plane_obj_offset (to_intel_plane_state (primary->state), - obj) + intel_crtc->dspaddr_offset; + work->gtt_offset =to_intel_plane_state (primary->state)->disp_addr + + intel_crtc->dspaddr_offset;if (mmio_flip) { ret = intel_queue_mmio_flip(dev, crtc, fb, obj, ring,
@@ -13990,7 +13995,7 @@ intel_commit_cursor_plane(struct drm_plane *plane,if (!obj) addr =0 ;else if (!INTEL_INFO (dev)->cursor_needs_physical) - addr =i915_gem_obj_ggtt_offset (obj); + addr = state->disp_addr;else addr = obj->phys_handle->busaddr;
drivers/gpu/drm/i915/intel_drv.h +6 -0
@@ -274,6 +274,12 @@ struct intel_plane_state {* update_scaler_users. */ int scaler_id; + +/* +* Cached display address at the time framebuffer is prepared for use +* on a plane. +*/ +unsigned long disp_addr; };struct intel_initial_plane_config {
drivers/gpu/drm/i915/intel_sprite.c +2 -6
@@ -177,13 +177,11 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,struct drm_device *dev = drm_plane->dev;struct drm_i915_private *dev_priv = dev->dev_private;struct intel_plane *intel_plane =to_intel_plane (drm_plane); -struct drm_i915_gem_object *obj =intel_fb_obj (fb);const int pipe = intel_plane->pipe;const int plane = intel_plane->plane +1 ;u32 plane_ctl, stride_div, stride;int pixel_size =drm_format_plane_cpp (fb->pixel_format,0 );const struct drm_intel_sprite_colorkey *key = &intel_plane->ckey; -unsigned long surf_addr;u32 tile_height, plane_offset, plane_size;unsigned int rotation;int x_offset, y_offset;
@@ -225,9 +223,6 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc,else if (key->flags &I915_SET_COLORKEY_SOURCE ) plane_ctl |=PLANE_CTL_KEY_ENABLE_SOURCE ; - surf_addr =intel_plane_obj_offset (to_intel_plane_state (drm_plane->state), - obj); -if (intel_rotation_90_or_270 (rotation)) {/* stride: Surface height in tiles */ tile_height = intel_tile_height(dev, fb->pixel_format,
@@ -268,7 +263,8 @@ skl_update_plane(struct drm_plane *drm_plane, struct drm_crtc *crtc, }I915_WRITE (PLANE_CTL (pipe, plane), plane_ctl); -I915_WRITE (PLANE_SURF (pipe, plane), surf_addr); +I915_WRITE (PLANE_SURF (pipe, plane), +to_intel_plane_state (drm_plane->state)->disp_addr);POSTING_READ (PLANE_SURF (pipe, plane)); }
Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC 3/3 drm/i915: Use intel_plane_obj_offset from more places
In reply to Tvrtko UrsulinFrom: Tvrtko Ursulin <[email protected]>
These are the display call sites so should use the proper helper.
Also requires intel_plane_obj_offset to assume normal view when plane pointer is not available.
Signed-off-by Tvrtko Ursulin <[email protected]>
--- drivers/gpu/drm/i915/intel_display.c | 6 ++++-- drivers/gpu/drm/i915/intel_fbdev.c | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_display.c +4 -2
@@ -2624,7 +2624,8 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,continue ; obj =intel_fb_obj (fb); -if (i915_gem_obj_ggtt_offset (obj) == plane_config->base) { +if (intel_plane_obj_offset (to_intel_plane_state (c->primary->state), + obj) == plane_config->base) {drm_framebuffer_reference (fb); goto valid_fb; }
@@ -2910,7 +2911,8 @@ intel_plane_obj_offset(struct intel_plane_state *intel_plane_state, {const struct i915_ggtt_view *view = &i915_ggtt_view_normal; -if (intel_rotation_90_or_270 (intel_plane_state->base.rotation)) +if (intel_plane_state && +intel_rotation_90_or_270 (intel_plane_state->base.rotation)) view = &i915_ggtt_view_rotated;return i915_gem_obj_ggtt_offset_view (obj, view);
drivers/gpu/drm/i915/intel_fbdev.c +5 -4
@@ -206,6 +206,7 @@ static int intelfb_create(struct drm_fb_helper *helper,struct fb_info *info;struct drm_framebuffer *fb;struct drm_i915_gem_object *obj; +unsigned long disp_addr;int size, ret;bool prealloc = false;
@@ -269,12 +270,12 @@ static int intelfb_create(struct drm_fb_helper *helper, info->apertures->ranges[0 ].base = dev->mode_config.fb_base; info->apertures->ranges[0 ].size = dev_priv->gtt.mappable_end; - info->fix.smem_start = dev->mode_config.fb_base +i915_gem_obj_ggtt_offset (obj); + disp_addr =intel_plane_obj_offset (NULL , obj); + info->fix.smem_start = dev->mode_config.fb_base + disp_addr; info->fix.smem_len = size; info->screen_base = -ioremap_wc (dev_priv->gtt.mappable_base +i915_gem_obj_ggtt_offset (obj), - size); +ioremap_wc (dev_priv->gtt.mappable_base + disp_addr, size);if (!info->screen_base) { ret = -ENOSPC ; goto out_unpin;
@@ -298,7 +299,7 @@ static int intelfb_create(struct drm_fb_helper *helper,DRM_DEBUG_KMS ("allocated %dx%d fb: 0x%08lx, bo %p\n" , fb->width, fb->height, -i915_gem_obj_ggtt_offset (obj), obj); + disp_addr, obj);mutex_unlock (&dev->struct_mutex);vga_switcheroo_client_fb_set (dev->pdev, info);
Signature · 6 lines
2.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx