Commit 6687c906 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Rewrite fb rotation GTT handling

Redo the fb rotation handling in order to:
- eliminate the NV12 special casing
- handle fb->offsets[] properly
- make the rotation handling easier for the plane code

To achieve these goals we reduce intel_rotation_info to only contain
(for each plane) the rotated view width,height,stride in tile units,
and the page offset into the object where the plane starts. Each plane
is handled exactly the same way, no special casing for NV12 or other
formats. We then store the computed rotation_info under
intel_framebuffer so that we don't have to recompute it again.

To handle fb->offsets[] we treat them as a linear offsets and convert
them to x/y offsets from the start of the relevant GTT mapping (either
normal or rotated). We store the x/y offsets under intel_framebuffer,
and for some extra convenience we also store the rotated pitch (ie.
tile aligned plane height). So for each plane we have the normal
x/y offsets, rotated x/y offsets, and the rotated pitch. The normal
pitch is available already in fb->pitches[].

While we're gathering up all that extra information, we can also easily
compute the storage requirements for the framebuffer, so that we can
check that the object is big enough to hold it.

When it comes time to deal with the plane source coordinates, we first
rotate the clipped src coordinates to match the relevant GTT view
orientation, then add to them the fb x/y offsets. Next we compute
the aligned surface page offset, and as a result we're left with some
residual x/y offsets. Finally, if required by the hardware, we convert
the remaining x/y offsets into a linear offset.

For gen2/3 we simply skip computing the final page offset, and just
convert the src+fb x/y offsets directly into a linear offset since
that's what the hardware wants.

After this all platforms, incluing SKL+, compute these things in exactly
the same way (excluding alignemnt differences).

v2: Use BIT(DRM_ROTATE_270) instead of ROTATE_270 when rotating
    plane src coordinates
    Drop some spurious changes that got left behind during
    development
v3: Split out more changes to prep patches (Daniel)
    s/intel_fb->plane[].foo.bar/intel_fb->foo[].bar/ for brevity
    Rename intel_surf_gtt_offset to intel_fb_gtt_offset
    Kill the pointless 'plane' parameter from intel_fb_gtt_offset()
v4: Fix alignment vs. alignment-1 when calling
    _intel_compute_tile_offset() from intel_fill_fb_info()
    Pass the pitch in tiles in
    stad of pixels to intel_adjust_tile_offset() from intel_fill_fb_info()
    Pass the full width/height of the rotated area to
    drm_rect_rotate() for clarity
    Use u32 for more offsets
v5: Preserve the upper_32_bits()/lower_32_bits() handling for the
    fb ggtt offset (Sivakumar)
v6: Rebase due to drm_plane_state src/dst rects

Cc: Sivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarSivakumar Thulasimani <sivakumar.thulasimani@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470821001-25272-2-git-send-email-ville.syrjala@linux.intel.comAcked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d721b02f
...@@ -3449,18 +3449,16 @@ rotate_pages(const dma_addr_t *in, unsigned int offset, ...@@ -3449,18 +3449,16 @@ rotate_pages(const dma_addr_t *in, unsigned int offset,
} }
static struct sg_table * static struct sg_table *
intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info, intel_rotate_fb_obj_pages(const struct intel_rotation_info *rot_info,
struct drm_i915_gem_object *obj) struct drm_i915_gem_object *obj)
{ {
const size_t n_pages = obj->base.size / PAGE_SIZE; const size_t n_pages = obj->base.size / PAGE_SIZE;
unsigned int size_pages = rot_info->plane[0].width * rot_info->plane[0].height; unsigned int size = intel_rotation_info_size(rot_info);
unsigned int size_pages_uv;
struct sgt_iter sgt_iter; struct sgt_iter sgt_iter;
dma_addr_t dma_addr; dma_addr_t dma_addr;
unsigned long i; unsigned long i;
dma_addr_t *page_addr_list; dma_addr_t *page_addr_list;
struct sg_table *st; struct sg_table *st;
unsigned int uv_start_page;
struct scatterlist *sg; struct scatterlist *sg;
int ret = -ENOMEM; int ret = -ENOMEM;
...@@ -3471,18 +3469,12 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info, ...@@ -3471,18 +3469,12 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info,
if (!page_addr_list) if (!page_addr_list)
return ERR_PTR(ret); return ERR_PTR(ret);
/* Account for UV plane with NV12. */
if (rot_info->pixel_format == DRM_FORMAT_NV12)
size_pages_uv = rot_info->plane[1].width * rot_info->plane[1].height;
else
size_pages_uv = 0;
/* Allocate target SG list. */ /* Allocate target SG list. */
st = kmalloc(sizeof(*st), GFP_KERNEL); st = kmalloc(sizeof(*st), GFP_KERNEL);
if (!st) if (!st)
goto err_st_alloc; goto err_st_alloc;
ret = sg_alloc_table(st, size_pages + size_pages_uv, GFP_KERNEL); ret = sg_alloc_table(st, size, GFP_KERNEL);
if (ret) if (ret)
goto err_sg_alloc; goto err_sg_alloc;
...@@ -3495,32 +3487,14 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info, ...@@ -3495,32 +3487,14 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info,
st->nents = 0; st->nents = 0;
sg = st->sgl; sg = st->sgl;
/* Rotate the pages. */ for (i = 0 ; i < ARRAY_SIZE(rot_info->plane); i++) {
sg = rotate_pages(page_addr_list, 0, sg = rotate_pages(page_addr_list, rot_info->plane[i].offset,
rot_info->plane[0].width, rot_info->plane[0].height, rot_info->plane[i].width, rot_info->plane[i].height,
rot_info->plane[0].width, rot_info->plane[i].stride, st, sg);
st, sg);
/* Append the UV plane if NV12. */
if (rot_info->pixel_format == DRM_FORMAT_NV12) {
uv_start_page = size_pages;
/* Check for tile-row un-alignment. */
if (offset_in_page(rot_info->uv_offset))
uv_start_page--;
rot_info->uv_start_page = uv_start_page;
sg = rotate_pages(page_addr_list, rot_info->uv_start_page,
rot_info->plane[1].width, rot_info->plane[1].height,
rot_info->plane[1].width,
st, sg);
} }
DRM_DEBUG_KMS("Created rotated page mapping for object size %zu (%ux%u tiles, %u pages (%u plane 0)).\n", DRM_DEBUG_KMS("Created rotated page mapping for object size %zu (%ux%u tiles, %u pages)\n",
obj->base.size, rot_info->plane[0].width, obj->base.size, rot_info->plane[0].width, rot_info->plane[0].height, size);
rot_info->plane[0].height, size_pages + size_pages_uv,
size_pages);
drm_free_large(page_addr_list); drm_free_large(page_addr_list);
...@@ -3531,10 +3505,9 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info, ...@@ -3531,10 +3505,9 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info,
err_st_alloc: err_st_alloc:
drm_free_large(page_addr_list); drm_free_large(page_addr_list);
DRM_DEBUG_KMS("Failed to create rotated mapping for object size %zu! (%d) (%ux%u tiles, %u pages (%u plane 0))\n", DRM_DEBUG_KMS("Failed to create rotated mapping for object size %zu! (%ux%u tiles, %u pages)\n",
obj->base.size, ret, rot_info->plane[0].width, obj->base.size, rot_info->plane[0].width, rot_info->plane[0].height, size);
rot_info->plane[0].height, size_pages + size_pages_uv,
size_pages);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
......
...@@ -139,12 +139,9 @@ enum i915_ggtt_view_type { ...@@ -139,12 +139,9 @@ enum i915_ggtt_view_type {
}; };
struct intel_rotation_info { struct intel_rotation_info {
unsigned int uv_offset;
uint32_t pixel_format;
unsigned int uv_start_page;
struct { struct {
/* tiles */ /* tiles */
unsigned int width, height; unsigned int width, height, stride, offset;
} plane[2]; } plane[2];
}; };
......
This diff is collapsed.
...@@ -178,6 +178,16 @@ struct intel_framebuffer { ...@@ -178,6 +178,16 @@ struct intel_framebuffer {
struct drm_framebuffer base; struct drm_framebuffer base;
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
struct intel_rotation_info rot_info; struct intel_rotation_info rot_info;
/* for each plane in the normal GTT view */
struct {
unsigned int x, y;
} normal[2];
/* for each plane in the rotated GTT view */
struct {
unsigned int x, y;
unsigned int pitch; /* pixels */
} rotated[2];
}; };
struct intel_fbdev { struct intel_fbdev {
...@@ -1156,6 +1166,11 @@ int vlv_get_cck_clock(struct drm_i915_private *dev_priv, ...@@ -1156,6 +1166,11 @@ int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
const char *name, u32 reg, int ref_freq); const char *name, u32 reg, int ref_freq);
extern const struct drm_plane_funcs intel_plane_funcs; extern const struct drm_plane_funcs intel_plane_funcs;
void intel_init_display_hooks(struct drm_i915_private *dev_priv); void intel_init_display_hooks(struct drm_i915_private *dev_priv);
unsigned int intel_fb_xy_to_linear(int x, int y,
const struct drm_framebuffer *fb, int plane);
void intel_add_fb_offsets(int *x, int *y,
const struct drm_framebuffer *fb, int plane,
unsigned int rotation);
unsigned int intel_rotation_info_size(const struct intel_rotation_info *rot_info); unsigned int intel_rotation_info_size(const struct intel_rotation_info *rot_info);
bool intel_has_pending_fb_unpin(struct drm_device *dev); bool intel_has_pending_fb_unpin(struct drm_device *dev);
void intel_mark_busy(struct drm_i915_private *dev_priv); void intel_mark_busy(struct drm_i915_private *dev_priv);
...@@ -1326,9 +1341,7 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode, ...@@ -1326,9 +1341,7 @@ void intel_mode_from_pipe_config(struct drm_display_mode *mode,
int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state); int skl_update_scaler_crtc(struct intel_crtc_state *crtc_state);
int skl_max_scale(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state); int skl_max_scale(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state);
u32 intel_plane_obj_offset(struct intel_plane *intel_plane, u32 intel_fb_gtt_offset(struct drm_framebuffer *fb, unsigned int rotation);
struct drm_i915_gem_object *obj,
unsigned int plane);
u32 skl_plane_ctl_format(uint32_t pixel_format); u32 skl_plane_ctl_format(uint32_t pixel_format);
u32 skl_plane_ctl_tiling(uint64_t fb_modifier); u32 skl_plane_ctl_tiling(uint64_t fb_modifier);
......
...@@ -203,15 +203,13 @@ skl_update_plane(struct drm_plane *drm_plane, ...@@ -203,15 +203,13 @@ skl_update_plane(struct drm_plane *drm_plane,
struct drm_i915_private *dev_priv = to_i915(dev); struct drm_i915_private *dev_priv = to_i915(dev);
struct intel_plane *intel_plane = to_intel_plane(drm_plane); struct intel_plane *intel_plane = to_intel_plane(drm_plane);
struct drm_framebuffer *fb = plane_state->base.fb; struct drm_framebuffer *fb = plane_state->base.fb;
struct drm_i915_gem_object *obj = intel_fb_obj(fb); struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
const int pipe = intel_plane->pipe; const int pipe = intel_plane->pipe;
const int plane = intel_plane->plane + 1; const int plane = intel_plane->plane + 1;
u32 plane_ctl, stride_div, stride; u32 plane_ctl, stride_div, stride;
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey; const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
u32 surf_addr; u32 surf_addr;
u32 tile_height, plane_offset, plane_size;
unsigned int rotation = plane_state->base.rotation; unsigned int rotation = plane_state->base.rotation;
int x_offset, y_offset;
int crtc_x = plane_state->dst.x1; int crtc_x = plane_state->dst.x1;
int crtc_y = plane_state->dst.y1; int crtc_y = plane_state->dst.y1;
uint32_t crtc_w = drm_rect_width(&plane_state->dst); uint32_t crtc_w = drm_rect_width(&plane_state->dst);
...@@ -230,15 +228,6 @@ skl_update_plane(struct drm_plane *drm_plane, ...@@ -230,15 +228,6 @@ skl_update_plane(struct drm_plane *drm_plane,
plane_ctl |= skl_plane_ctl_rotation(rotation); plane_ctl |= skl_plane_ctl_rotation(rotation);
stride_div = intel_fb_stride_alignment(dev_priv, fb->modifier[0],
fb->pixel_format);
/* Sizes are 0 based */
src_w--;
src_h--;
crtc_w--;
crtc_h--;
if (key->flags) { if (key->flags) {
I915_WRITE(PLANE_KEYVAL(pipe, plane), key->min_value); I915_WRITE(PLANE_KEYVAL(pipe, plane), key->min_value);
I915_WRITE(PLANE_KEYMAX(pipe, plane), key->max_value); I915_WRITE(PLANE_KEYMAX(pipe, plane), key->max_value);
...@@ -250,28 +239,44 @@ skl_update_plane(struct drm_plane *drm_plane, ...@@ -250,28 +239,44 @@ skl_update_plane(struct drm_plane *drm_plane,
else if (key->flags & I915_SET_COLORKEY_SOURCE) else if (key->flags & I915_SET_COLORKEY_SOURCE)
plane_ctl |= PLANE_CTL_KEY_ENABLE_SOURCE; plane_ctl |= PLANE_CTL_KEY_ENABLE_SOURCE;
surf_addr = intel_plane_obj_offset(intel_plane, obj, 0);
if (intel_rotation_90_or_270(rotation)) { if (intel_rotation_90_or_270(rotation)) {
int cpp = drm_format_plane_cpp(fb->pixel_format, 0); struct drm_rect r = {
.x1 = x,
/* stride: Surface height in tiles */ .x2 = x + src_w,
tile_height = intel_tile_height(dev_priv, fb->modifier[0], cpp); .y1 = y,
stride = DIV_ROUND_UP(fb->height, tile_height); .y2 = y + src_h,
plane_size = (src_w << 16) | src_h; };
x_offset = stride * tile_height - y - (src_h + 1); unsigned int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
y_offset = x;
/* Rotate src coordinates to match rotated GTT view */
drm_rect_rotate(&r, fb->width, fb->height, BIT(DRM_ROTATE_270));
x = r.x1;
y = r.y1;
src_w = drm_rect_width(&r);
src_h = drm_rect_height(&r);
stride_div = intel_tile_height(dev_priv, fb->modifier[0], cpp);
stride = intel_fb->rotated[0].pitch;
} else { } else {
stride = fb->pitches[0] / stride_div; stride_div = intel_fb_stride_alignment(dev_priv, fb->modifier[0],
plane_size = (src_h << 16) | src_w; fb->pixel_format);
x_offset = x; stride = fb->pitches[0];
y_offset = y;
} }
plane_offset = y_offset << 16 | x_offset;
I915_WRITE(PLANE_OFFSET(pipe, plane), plane_offset); intel_add_fb_offsets(&x, &y, fb, 0, rotation);
I915_WRITE(PLANE_STRIDE(pipe, plane), stride); surf_addr = intel_compute_tile_offset(&x, &y, fb, 0,
I915_WRITE(PLANE_SIZE(pipe, plane), plane_size); stride, rotation);
/* Sizes are 0 based */
src_w--;
src_h--;
crtc_w--;
crtc_h--;
I915_WRITE(PLANE_OFFSET(pipe, plane), (y << 16) | x);
I915_WRITE(PLANE_STRIDE(pipe, plane), stride / stride_div);
I915_WRITE(PLANE_SIZE(pipe, plane), (src_h << 16) | src_w);
/* program plane scaler */ /* program plane scaler */
if (plane_state->scaler_id >= 0) { if (plane_state->scaler_id >= 0) {
...@@ -296,7 +301,8 @@ skl_update_plane(struct drm_plane *drm_plane, ...@@ -296,7 +301,8 @@ skl_update_plane(struct drm_plane *drm_plane,
} }
I915_WRITE(PLANE_CTL(pipe, plane), plane_ctl); I915_WRITE(PLANE_CTL(pipe, plane), plane_ctl);
I915_WRITE(PLANE_SURF(pipe, plane), surf_addr); I915_WRITE(PLANE_SURF(pipe, plane),
intel_fb_gtt_offset(fb, rotation) + surf_addr);
POSTING_READ(PLANE_SURF(pipe, plane)); POSTING_READ(PLANE_SURF(pipe, plane));
} }
...@@ -369,7 +375,6 @@ vlv_update_plane(struct drm_plane *dplane, ...@@ -369,7 +375,6 @@ vlv_update_plane(struct drm_plane *dplane,
u32 sprctl; u32 sprctl;
u32 sprsurf_offset, linear_offset; u32 sprsurf_offset, linear_offset;
unsigned int rotation = dplane->state->rotation; unsigned int rotation = dplane->state->rotation;
int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey; const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
int crtc_x = plane_state->dst.x1; int crtc_x = plane_state->dst.x1;
int crtc_y = plane_state->dst.y1; int crtc_y = plane_state->dst.y1;
...@@ -440,19 +445,19 @@ vlv_update_plane(struct drm_plane *dplane, ...@@ -440,19 +445,19 @@ vlv_update_plane(struct drm_plane *dplane,
crtc_w--; crtc_w--;
crtc_h--; crtc_h--;
linear_offset = y * fb->pitches[0] + x * cpp; intel_add_fb_offsets(&x, &y, fb, 0, rotation);
sprsurf_offset = intel_compute_tile_offset(&x, &y, fb, 0, sprsurf_offset = intel_compute_tile_offset(&x, &y, fb, 0,
fb->pitches[0], rotation); fb->pitches[0], rotation);
linear_offset -= sprsurf_offset;
if (rotation == BIT(DRM_ROTATE_180)) { if (rotation == BIT(DRM_ROTATE_180)) {
sprctl |= SP_ROTATE_180; sprctl |= SP_ROTATE_180;
x += src_w; x += src_w;
y += src_h; y += src_h;
linear_offset += src_h * fb->pitches[0] + src_w * cpp;
} }
linear_offset = intel_fb_xy_to_linear(x, y, fb, 0);
if (key->flags) { if (key->flags) {
I915_WRITE(SPKEYMINVAL(pipe, plane), key->min_value); I915_WRITE(SPKEYMINVAL(pipe, plane), key->min_value);
I915_WRITE(SPKEYMAXVAL(pipe, plane), key->max_value); I915_WRITE(SPKEYMAXVAL(pipe, plane), key->max_value);
...@@ -477,8 +482,8 @@ vlv_update_plane(struct drm_plane *dplane, ...@@ -477,8 +482,8 @@ vlv_update_plane(struct drm_plane *dplane,
I915_WRITE(SPSIZE(pipe, plane), (crtc_h << 16) | crtc_w); I915_WRITE(SPSIZE(pipe, plane), (crtc_h << 16) | crtc_w);
I915_WRITE(SPCNTR(pipe, plane), sprctl); I915_WRITE(SPCNTR(pipe, plane), sprctl);
I915_WRITE(SPSURF(pipe, plane), i915_gem_obj_ggtt_offset(obj) + I915_WRITE(SPSURF(pipe, plane),
sprsurf_offset); intel_fb_gtt_offset(fb, rotation) + sprsurf_offset);
POSTING_READ(SPSURF(pipe, plane)); POSTING_READ(SPSURF(pipe, plane));
} }
...@@ -511,7 +516,6 @@ ivb_update_plane(struct drm_plane *plane, ...@@ -511,7 +516,6 @@ ivb_update_plane(struct drm_plane *plane,
u32 sprctl, sprscale = 0; u32 sprctl, sprscale = 0;
u32 sprsurf_offset, linear_offset; u32 sprsurf_offset, linear_offset;
unsigned int rotation = plane_state->base.rotation; unsigned int rotation = plane_state->base.rotation;
int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey; const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
int crtc_x = plane_state->dst.x1; int crtc_x = plane_state->dst.x1;
int crtc_y = plane_state->dst.y1; int crtc_y = plane_state->dst.y1;
...@@ -573,10 +577,9 @@ ivb_update_plane(struct drm_plane *plane, ...@@ -573,10 +577,9 @@ ivb_update_plane(struct drm_plane *plane,
if (crtc_w != src_w || crtc_h != src_h) if (crtc_w != src_w || crtc_h != src_h)
sprscale = SPRITE_SCALE_ENABLE | (src_w << 16) | src_h; sprscale = SPRITE_SCALE_ENABLE | (src_w << 16) | src_h;
linear_offset = y * fb->pitches[0] + x * cpp; intel_add_fb_offsets(&x, &y, fb, 0, rotation);
sprsurf_offset = intel_compute_tile_offset(&x, &y, fb, 0, sprsurf_offset = intel_compute_tile_offset(&x, &y, fb, 0,
fb->pitches[0], rotation); fb->pitches[0], rotation);
linear_offset -= sprsurf_offset;
if (rotation == BIT(DRM_ROTATE_180)) { if (rotation == BIT(DRM_ROTATE_180)) {
sprctl |= SPRITE_ROTATE_180; sprctl |= SPRITE_ROTATE_180;
...@@ -585,10 +588,11 @@ ivb_update_plane(struct drm_plane *plane, ...@@ -585,10 +588,11 @@ ivb_update_plane(struct drm_plane *plane,
if (!IS_HASWELL(dev) && !IS_BROADWELL(dev)) { if (!IS_HASWELL(dev) && !IS_BROADWELL(dev)) {
x += src_w; x += src_w;
y += src_h; y += src_h;
linear_offset += src_h * fb->pitches[0] + src_w * cpp;
} }
} }
linear_offset = intel_fb_xy_to_linear(x, y, fb, 0);
if (key->flags) { if (key->flags) {
I915_WRITE(SPRKEYVAL(pipe), key->min_value); I915_WRITE(SPRKEYVAL(pipe), key->min_value);
I915_WRITE(SPRKEYMAX(pipe), key->max_value); I915_WRITE(SPRKEYMAX(pipe), key->max_value);
...@@ -617,7 +621,7 @@ ivb_update_plane(struct drm_plane *plane, ...@@ -617,7 +621,7 @@ ivb_update_plane(struct drm_plane *plane,
I915_WRITE(SPRSCALE(pipe), sprscale); I915_WRITE(SPRSCALE(pipe), sprscale);
I915_WRITE(SPRCTL(pipe), sprctl); I915_WRITE(SPRCTL(pipe), sprctl);
I915_WRITE(SPRSURF(pipe), I915_WRITE(SPRSURF(pipe),
i915_gem_obj_ggtt_offset(obj) + sprsurf_offset); intel_fb_gtt_offset(fb, rotation) + sprsurf_offset);
POSTING_READ(SPRSURF(pipe)); POSTING_READ(SPRSURF(pipe));
} }
...@@ -652,7 +656,6 @@ ilk_update_plane(struct drm_plane *plane, ...@@ -652,7 +656,6 @@ ilk_update_plane(struct drm_plane *plane,
u32 dvscntr, dvsscale; u32 dvscntr, dvsscale;
u32 dvssurf_offset, linear_offset; u32 dvssurf_offset, linear_offset;
unsigned int rotation = plane_state->base.rotation; unsigned int rotation = plane_state->base.rotation;
int cpp = drm_format_plane_cpp(fb->pixel_format, 0);
const struct drm_intel_sprite_colorkey *key = &plane_state->ckey; const struct drm_intel_sprite_colorkey *key = &plane_state->ckey;
int crtc_x = plane_state->dst.x1; int crtc_x = plane_state->dst.x1;
int crtc_y = plane_state->dst.y1; int crtc_y = plane_state->dst.y1;
...@@ -710,19 +713,19 @@ ilk_update_plane(struct drm_plane *plane, ...@@ -710,19 +713,19 @@ ilk_update_plane(struct drm_plane *plane,
if (crtc_w != src_w || crtc_h != src_h) if (crtc_w != src_w || crtc_h != src_h)
dvsscale = DVS_SCALE_ENABLE | (src_w << 16) | src_h; dvsscale = DVS_SCALE_ENABLE | (src_w << 16) | src_h;
linear_offset = y * fb->pitches[0] + x * cpp; intel_add_fb_offsets(&x, &y, fb, 0, rotation);
dvssurf_offset = intel_compute_tile_offset(&x, &y, fb, 0, dvssurf_offset = intel_compute_tile_offset(&x, &y, fb, 0,
fb->pitches[0], rotation); fb->pitches[0], rotation);
linear_offset -= dvssurf_offset;
if (rotation == BIT(DRM_ROTATE_180)) { if (rotation == BIT(DRM_ROTATE_180)) {
dvscntr |= DVS_ROTATE_180; dvscntr |= DVS_ROTATE_180;
x += src_w; x += src_w;
y += src_h; y += src_h;
linear_offset += src_h * fb->pitches[0] + src_w * cpp;
} }
linear_offset = intel_fb_xy_to_linear(x, y, fb, 0);
if (key->flags) { if (key->flags) {
I915_WRITE(DVSKEYVAL(pipe), key->min_value); I915_WRITE(DVSKEYVAL(pipe), key->min_value);
I915_WRITE(DVSKEYMAX(pipe), key->max_value); I915_WRITE(DVSKEYMAX(pipe), key->max_value);
...@@ -746,7 +749,7 @@ ilk_update_plane(struct drm_plane *plane, ...@@ -746,7 +749,7 @@ ilk_update_plane(struct drm_plane *plane,
I915_WRITE(DVSSCALE(pipe), dvsscale); I915_WRITE(DVSSCALE(pipe), dvsscale);
I915_WRITE(DVSCNTR(pipe), dvscntr); I915_WRITE(DVSCNTR(pipe), dvscntr);
I915_WRITE(DVSSURF(pipe), I915_WRITE(DVSSURF(pipe),
i915_gem_obj_ggtt_offset(obj) + dvssurf_offset); intel_fb_gtt_offset(fb, rotation) + dvssurf_offset);
POSTING_READ(DVSSURF(pipe)); POSTING_READ(DVSSURF(pipe));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment