drm/i915: intel_crtc_page_flip: Add intel_state local variable
Subsystems (2)
PATCH v2 1/2 drm/i915: intel_crtc_page_flip: Add intel_state local variable
Add intel_state local variable to avoid recalling to_intel_plane_state all the time.
--- drivers/gpu/drm/i915/intel_display.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/intel_display.c +6 -5
@@ -12146,6 +12146,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,struct drm_framebuffer *old_fb = crtc->primary->fb;struct drm_i915_gem_object *obj =intel_fb_obj (fb);struct intel_crtc *intel_crtc =to_intel_crtc (crtc); +struct intel_plane_state *intel_state = +to_intel_plane_state (crtc->primary->state);struct drm_plane *primary = crtc->primary;enum pipe pipe = intel_crtc->pipe;struct intel_flip_work *work;
@@ -12262,8 +12264,8 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, goto cleanup_pending; } - work->old_vma =to_intel_plane_state (primary->state)->vma; -to_intel_plane_state (primary->state)->vma = vma; + work->old_vma = intel_state->vma; + intel_state->vma = vma; work->gtt_offset =i915_ggtt_offset (vma) + intel_crtc->dspaddr_offset; work->rotation = crtc->primary->state->rotation;
@@ -12276,8 +12278,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,* be on the safe side and do this immediately before scheduling the * flip. */ -intel_fbc_pre_update (intel_crtc, intel_crtc->config, -to_intel_plane_state (primary->state)); +intel_fbc_pre_update (intel_crtc, intel_crtc->config, intel_state);if (mmio_flip) {INIT_WORK (&work->mmio_work, intel_mmio_flip_work_func);
@@ -12320,7 +12321,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, cleanup_request:i915_add_request_no_flush (request); cleanup_unpin: -to_intel_plane_state (primary->state)->vma = work->old_vma; + intel_state->vma = work->old_vma;intel_unpin_fb_vma (vma); cleanup_pending:atomic_dec (&intel_crtc->unpin_work_count);
Signature · 6 lines
2.12.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/2 drm/i915: Deal with upside-down mounted LCD panels
On some (Bay Trail) devices the LCD panel is mounted upside-down.
This commit uses the code to read back the initial rotation of the primary plane in get_initial_plane_config from Ville Syrjala's "drm/fb-helper: Inherit rotation wip" patch and when re-using the initial fb it stores that in intel_crtc.initial_rotation.
It adds an intel_plane_get_rotation helper which combines this initial_rotation with any rotation requested by userspace and uses this in all places which look at a planes rotation, thus transparently dealing with upside-down LCD panels without requiring any user-space or fbcon changes.
This fixes the kernel boot messages switching from being shown the right way up in efifb to being shown upside down as soon as a native kms driver loads, as well as any graphics displayed by userspace being upside-down.
Note this only deals with upside-down LCD panels / 180 degrees rotation as the hardware in question only supports 180 degrees rotation in hardware. The one model known which has a panel mounted with 90/270 degrees rotation will need to be fully dealt with in userspace, even the firmware boot screen / menus are rotated 90 degrees on this one and there simply is nothing the kernel can do about this.
---
Changes in v2:
-Fix brown paperbag bug s/val & mask/val & ~mask/ to clear old rotation bits
--- drivers/gpu/drm/i915/intel_atomic_plane.c | 7 +-- drivers/gpu/drm/i915/intel_display.c | 80 +++++++++++++++++++++++-------- drivers/gpu/drm/i915/intel_drv.h | 32 +++++++++++++ drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 16 ++++--- drivers/gpu/drm/i915/intel_sprite.c | 14 +++--- 6 files changed, 113 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/intel_atomic_plane.c +4 -3
@@ -130,6 +130,7 @@ int intel_plane_atomic_check_with_state(struct intel_crtc_state *crtc_state,struct drm_i915_private *dev_priv =to_i915 (plane->dev);struct drm_plane_state *state = &intel_state->base;struct intel_plane *intel_plane =to_intel_plane (plane); +unsigned int rotation =intel_plane_get_rotation (intel_state);int ret;/*
@@ -149,7 +150,7 @@ int intel_plane_atomic_check_with_state(struct intel_crtc_state *crtc_state, intel_state->clip.y2 = crtc_state->base.enable ? crtc_state->pipe_src_h :0 ; -if (state->fb &&drm_rotation_90_or_270 (state->rotation)) { +if (state->fb &&drm_rotation_90_or_270 (rotation)) {struct drm_format_name_buf format_name; if (state->fb->modifier != I915_FORMAT_MOD_Y_TILED &&
@@ -178,8 +179,8 @@ int intel_plane_atomic_check_with_state(struct intel_crtc_state *crtc_state,/* CHV ignores the mirror bit when the rotate bit is set :( */ if (IS_CHERRYVIEW (dev_priv) && - state->rotation &DRM_ROTATE_180 && - state->rotation &DRM_REFLECT_X ) { + rotation &DRM_ROTATE_180 && + rotation &DRM_REFLECT_X ) {DRM_DEBUG_KMS ("Cannot rotate and reflect at the same time\n" );return -EINVAL ; }
drivers/gpu/drm/i915/intel_display.c +59 -21
234 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +32 -0
@@ -418,6 +418,7 @@ struct intel_initial_plane_config {unsigned int tiling;int size;u32 base; +uint8_t rotation;/* DRM_ROTATE_* */ };#define SKL_MIN_SRC_W 8
@@ -704,6 +705,12 @@ struct intel_crtc {atomic_t unpin_work_count; +/* +* Initial DRM_ROTATE_* as read back from the hardware at init, this +* is used to compensate for e.g. upside-down mounted lcd-panels. +*/ +uint8_t initial_rotation; +/* Display surface base address adjustement for pageflips. Note that on * gen4+ this only adjusts up to a tile, offsets within a tile are * handled in the hw itself (with the TILEOFF register). */
@@ -1403,6 +1410,31 @@ static inline u32 intel_plane_ggtt_offset(const struct intel_plane_state *state)return i915_ggtt_offset (state->vma); } +static inline unsigned int +intel_plane_get_rotation (const struct intel_plane_state *plane_state) +{ +unsigned int rotation = plane_state->base.rotation; +unsigned int new_rotation =DRM_ROTATE_0 ; +struct intel_crtc *intel_crtc; + +if (!plane_state->base.crtc) +return rotation; + +/* We only support an initial rotation of DRM_ROTATE_180 for now */ + intel_crtc =to_intel_crtc (plane_state->base.crtc); +if (intel_crtc->initial_rotation !=DRM_ROTATE_180 ) +return rotation; + +switch (rotation &DRM_ROTATE_MASK ) { +case DRM_ROTATE_0 : new_rotation =DRM_ROTATE_180 ;break ; +case DRM_ROTATE_90 : new_rotation =DRM_ROTATE_270 ;break ; +case DRM_ROTATE_180 : new_rotation =DRM_ROTATE_0 ;break ; +case DRM_ROTATE_270 : new_rotation =DRM_ROTATE_90 ;break ; + } + +return (rotation & ~DRM_ROTATE_MASK ) | new_rotation; +} +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_fbc.c +1 -1
@@ -746,7 +746,7 @@ static void intel_fbc_update_state_cache(struct intel_crtc *crtc, cache->crtc.hsw_bdw_pixel_rate =ilk_pipe_pixel_rate (crtc_state); - cache->plane.rotation = plane_state->base.rotation; + cache->plane.rotation =intel_plane_get_rotation (plane_state); cache->plane.src_w =drm_rect_width (&plane_state->base.src) >>16 ; cache->plane.src_h =drm_rect_height (&plane_state->base.src) >>16 ; cache->plane.visible = plane_state->base.visible;
drivers/gpu/drm/i915/intel_pm.c +10 -6
@@ -3186,6 +3186,7 @@ void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv,static uint32_t skl_plane_downscale_amount (const struct intel_plane_state *pstate) { +unsigned int rotation =intel_plane_get_rotation (pstate);uint32_t downscale_h, downscale_w;uint32_t src_w, src_h, dst_w, dst_h;
@@ -3197,7 +3198,7 @@ skl_plane_downscale_amount(const struct intel_plane_state *pstate) src_h =drm_rect_height (&pstate->base.src); dst_w =drm_rect_width (&pstate->base.dst); dst_h =drm_rect_height (&pstate->base.dst); -if (drm_rotation_90_or_270 (pstate->base.rotation)) +if (drm_rotation_90_or_270 (rotation))swap (dst_w, dst_h); downscale_h =max (src_h / dst_h, (uint32_t )DRM_PLANE_HELPER_NO_SCALING );
@@ -3213,6 +3214,7 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate, int y) {struct intel_plane_state *intel_pstate =to_intel_plane_state (pstate); +unsigned int rotation =intel_plane_get_rotation (intel_pstate);uint32_t down_scale_amount, data_rate;uint32_t width =0 , height =0 ;struct drm_framebuffer *fb;
@@ -3232,7 +3234,7 @@ skl_plane_relative_data_rate(const struct intel_crtc_state *cstate, width =drm_rect_width (&intel_pstate->base.src) >>16 ; height =drm_rect_height (&intel_pstate->base.src) >>16 ; -if (drm_rotation_90_or_270 (pstate->rotation)) +if (drm_rotation_90_or_270 (rotation))swap (width, height);/* for planar format */
@@ -3301,6 +3303,7 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate, {struct drm_framebuffer *fb = pstate->fb;struct intel_plane_state *intel_pstate =to_intel_plane_state (pstate); +unsigned int rotation =intel_plane_get_rotation (intel_pstate);uint32_t src_w, src_h;uint32_t min_scanlines =8 ;uint8_t plane_bpp;
@@ -3320,7 +3323,7 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate, src_w =drm_rect_width (&intel_pstate->base.src) >>16 ; src_h =drm_rect_height (&intel_pstate->base.src) >>16 ; -if (drm_rotation_90_or_270 (pstate->rotation)) +if (drm_rotation_90_or_270 (rotation))swap (src_w, src_h);/* Halve UV plane width and height for NV12 */
@@ -3334,7 +3337,7 @@ skl_ddb_min_alloc(const struct drm_plane_state *pstate,else plane_bpp = fb->format->cpp[0 ]; -if (drm_rotation_90_or_270 (pstate->rotation)) { +if (drm_rotation_90_or_270 (rotation)) {switch (plane_bpp) {case 1 : min_scanlines =32 ;
@@ -3568,6 +3571,7 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,struct drm_plane_state *pstate = &intel_pstate->base;struct drm_framebuffer *fb = pstate->fb;uint32_t latency = dev_priv->wm.skl_latency[level]; +unsigned int rotation =intel_plane_get_rotation (intel_pstate);uint_fixed_16_16_t method1, method2;uint_fixed_16_16_t plane_blocks_per_line;uint_fixed_16_16_t selected_result;
@@ -3603,13 +3607,13 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, width =drm_rect_width (&intel_pstate->base.src) >>16 ; height =drm_rect_height (&intel_pstate->base.src) >>16 ; -if (drm_rotation_90_or_270 (pstate->rotation)) +if (drm_rotation_90_or_270 (rotation))swap (width, height); cpp = fb->format->cpp[0 ]; plane_pixel_rate =skl_adjusted_plane_pixel_rate (cstate, intel_pstate); -if (drm_rotation_90_or_270 (pstate->rotation)) { +if (drm_rotation_90_or_270 (rotation)) {int cpp = (fb->format->format ==DRM_FORMAT_NV12 ) ? fb->format->cpp[1 ] : fb->format->cpp[0 ];
drivers/gpu/drm/i915/intel_sprite.c +7 -7
@@ -208,7 +208,7 @@ skl_update_plane(struct drm_plane *drm_plane,u32 plane_ctl;const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;u32 surf_addr = plane_state->main.offset; -unsigned int rotation = plane_state->base.rotation; +unsigned int rotation =intel_plane_get_rotation (plane_state);u32 stride =skl_plane_stride (fb,0 , rotation);int crtc_x = plane_state->base.dst.x1;int crtc_y = plane_state->base.dst.y1;
@@ -341,7 +341,7 @@ vlv_update_plane(struct drm_plane *dplane,enum plane_id plane_id = intel_plane->id;u32 sprctl;u32 sprsurf_offset, linear_offset; -unsigned int rotation = plane_state->base.rotation; +unsigned int rotation =intel_plane_get_rotation (plane_state);const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;int crtc_x = plane_state->base.dst.x1;int crtc_y = plane_state->base.dst.y1;
@@ -486,7 +486,7 @@ ivb_update_plane(struct drm_plane *plane,enum pipe pipe = intel_plane->pipe;u32 sprctl, sprscale =0 ;u32 sprsurf_offset, linear_offset; -unsigned int rotation = plane_state->base.rotation; +unsigned int rotation =intel_plane_get_rotation (plane_state);const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;int crtc_x = plane_state->base.dst.x1;int crtc_y = plane_state->base.dst.y1;
@@ -624,7 +624,7 @@ ilk_update_plane(struct drm_plane *plane,int pipe = intel_plane->pipe;u32 dvscntr, dvsscale;u32 dvssurf_offset, linear_offset; -unsigned int rotation = plane_state->base.rotation; +unsigned int rotation =intel_plane_get_rotation (plane_state);const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;int crtc_x = plane_state->base.dst.x1;int crtc_y = plane_state->base.dst.y1;
@@ -748,6 +748,7 @@ intel_check_sprite_plane(struct drm_plane *plane,struct intel_crtc *intel_crtc =to_intel_crtc (crtc);struct intel_plane *intel_plane =to_intel_plane (plane);struct drm_framebuffer *fb = state->base.fb; +unsigned int rotation =intel_plane_get_rotation (state);int crtc_x, crtc_y;unsigned int crtc_w, crtc_h;uint32_t src_x, src_y, src_w, src_h;
@@ -802,8 +803,7 @@ intel_check_sprite_plane(struct drm_plane *plane,* coordinates and sizes. We probably need some way to decide whether * more strict checking should be done instead. */ -drm_rect_rotate (src, fb->width <<16 , fb->height <<16 , - state->base.rotation); +drm_rect_rotate (src, fb->width <<16 , fb->height <<16 , rotation); hscale =drm_rect_calc_hscale_relaxed (src, dst, min_scale, max_scale);BUG_ON (hscale <0 );
@@ -844,7 +844,7 @@ intel_check_sprite_plane(struct drm_plane *plane, drm_rect_height(dst) * vscale - drm_rect_height(src));drm_rect_rotate_inv (src, fb->width <<16 , fb->height <<16 , - state->base.rotation); + rotation);/* sanity check to make sure the src viewport wasn't enlarged */ WARN_ON(src->x1 < (int) state->base.src_x ||
Signature · 6 lines
2.12.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel