Skip to content

Commit

Permalink
drm/i915: Remove cursor use of properties for coordinates
Browse files Browse the repository at this point in the history 
We have a src and dect rectangle, use it instead of relying on
the core drm properties.

Because the core by default clips the src/dst properties, after
the drm_atomic_helper_check_plane_state() we manually set the
unclipped src/dst rectangles. We still need the call for
visibility checks, but this way we are able to use the src/dst
rects in the check/commit code.

This removes the special case in the watermark code for cursor w/h.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004113514.17064-5-maarten.lankhorst@linux.intel.com
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[mlankhorst: Clarify commit message to state we use unclipped src/dst
  • Loading branch information
Maarten Lankhorst committed Oct 10, 2019
1 parent d8bd3e1 commit 3a61276
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 62 deletions.
57 changes: 33 additions & 24 deletions drivers/gpu/drm/i915/display/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10538,16 +10538,16 @@ static u32 intel_cursor_base(const struct intel_plane_state *plane_state)
/* ILK+ do this automagically */
if (HAS_GMCH(dev_priv) &&
plane_state->base.rotation & DRM_MODE_ROTATE_180)
base += (plane_state->base.crtc_h *
plane_state->base.crtc_w - 1) * fb->format->cpp[0];
base += (drm_rect_height(&plane_state->base.dst) *
drm_rect_width(&plane_state->base.dst) - 1) * fb->format->cpp[0];

return base;
}

static u32 intel_cursor_position(const struct intel_plane_state *plane_state)
{
int x = plane_state->base.crtc_x;
int y = plane_state->base.crtc_y;
int x = plane_state->base.dst.x1;
int y = plane_state->base.dst.y1;
u32 pos = 0;

if (x < 0) {
Expand All @@ -10569,8 +10569,8 @@ static bool intel_cursor_size_ok(const struct intel_plane_state *plane_state)
{
const struct drm_mode_config *config =
&plane_state->base.plane->dev->mode_config;
int width = plane_state->base.crtc_w;
int height = plane_state->base.crtc_h;
int width = drm_rect_width(&plane_state->base.dst);
int height = drm_rect_height(&plane_state->base.dst);

return width > 0 && width <= config->cursor_width &&
height > 0 && height <= config->cursor_height;
Expand All @@ -10589,8 +10589,8 @@ static int intel_cursor_check_surface(struct intel_plane_state *plane_state)
if (!plane_state->base.visible)
return 0;

src_x = plane_state->base.src_x >> 16;
src_y = plane_state->base.src_y >> 16;
src_x = plane_state->base.src.x1 >> 16;
src_y = plane_state->base.src.y1 >> 16;

intel_add_fb_offsets(&src_x, &src_y, plane_state, 0);
offset = intel_plane_compute_aligned_offset(&src_x, &src_y,
Expand Down Expand Up @@ -10625,6 +10625,10 @@ static int intel_check_cursor(struct intel_crtc_state *crtc_state,
if (ret)
return ret;

/* Use the unclipped src/dst rectangles, which we program to hw */
plane_state->base.src = drm_plane_state_src(&plane_state->base);
plane_state->base.dst = drm_plane_state_dest(&plane_state->base);

ret = intel_cursor_check_surface(plane_state);
if (ret)
return ret;
Expand Down Expand Up @@ -10667,7 +10671,7 @@ static u32 i845_cursor_ctl(const struct intel_crtc_state *crtc_state,

static bool i845_cursor_size_ok(const struct intel_plane_state *plane_state)
{
int width = plane_state->base.crtc_w;
int width = drm_rect_width(&plane_state->base.dst);

/*
* 845g/865g are only limited by the width of their cursors,
Expand All @@ -10693,8 +10697,8 @@ static int i845_check_cursor(struct intel_crtc_state *crtc_state,
/* Check for which cursor types we support */
if (!i845_cursor_size_ok(plane_state)) {
DRM_DEBUG("Cursor dimension %dx%d not supported\n",
plane_state->base.crtc_w,
plane_state->base.crtc_h);
drm_rect_width(&plane_state->base.dst),
drm_rect_height(&plane_state->base.dst));
return -EINVAL;
}

Expand Down Expand Up @@ -10727,8 +10731,8 @@ static void i845_update_cursor(struct intel_plane *plane,
unsigned long irqflags;

if (plane_state && plane_state->base.visible) {
unsigned int width = plane_state->base.crtc_w;
unsigned int height = plane_state->base.crtc_h;
unsigned int width = drm_rect_width(&plane_state->base.src);
unsigned int height = drm_rect_height(&plane_state->base.dst);

cntl = plane_state->ctl |
i845_cursor_ctl_crtc(crtc_state);
Expand Down Expand Up @@ -10830,7 +10834,7 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state,
if (IS_GEN(dev_priv, 6) || IS_IVYBRIDGE(dev_priv))
cntl |= MCURSOR_TRICKLE_FEED_DISABLE;

switch (plane_state->base.crtc_w) {
switch (drm_rect_width(&plane_state->base.dst)) {
case 64:
cntl |= MCURSOR_MODE_64_ARGB_AX;
break;
Expand All @@ -10841,7 +10845,7 @@ static u32 i9xx_cursor_ctl(const struct intel_crtc_state *crtc_state,
cntl |= MCURSOR_MODE_256_ARGB_AX;
break;
default:
MISSING_CASE(plane_state->base.crtc_w);
MISSING_CASE(drm_rect_width(&plane_state->base.dst));
return 0;
}

Expand All @@ -10855,8 +10859,8 @@ static bool i9xx_cursor_size_ok(const struct intel_plane_state *plane_state)
{
struct drm_i915_private *dev_priv =
to_i915(plane_state->base.plane->dev);
int width = plane_state->base.crtc_w;
int height = plane_state->base.crtc_h;
int width = drm_rect_width(&plane_state->base.dst);
int height = drm_rect_height(&plane_state->base.dst);

if (!intel_cursor_size_ok(plane_state))
return false;
Expand Down Expand Up @@ -10909,17 +10913,19 @@ static int i9xx_check_cursor(struct intel_crtc_state *crtc_state,
/* Check for which cursor types we support */
if (!i9xx_cursor_size_ok(plane_state)) {
DRM_DEBUG("Cursor dimension %dx%d not supported\n",
plane_state->base.crtc_w,
plane_state->base.crtc_h);
drm_rect_width(&plane_state->base.dst),
drm_rect_height(&plane_state->base.dst));
return -EINVAL;
}

WARN_ON(plane_state->base.visible &&
plane_state->color_plane[0].stride != fb->pitches[0]);

if (fb->pitches[0] != plane_state->base.crtc_w * fb->format->cpp[0]) {
if (fb->pitches[0] !=
drm_rect_width(&plane_state->base.dst) * fb->format->cpp[0]) {
DRM_DEBUG_KMS("Invalid cursor stride (%u) (cursor width %d)\n",
fb->pitches[0], plane_state->base.crtc_w);
fb->pitches[0],
drm_rect_width(&plane_state->base.dst));
return -EINVAL;
}

Expand All @@ -10934,7 +10940,7 @@ static int i9xx_check_cursor(struct intel_crtc_state *crtc_state,
* Refuse the put the cursor into that compromised position.
*/
if (IS_CHERRYVIEW(dev_priv) && pipe == PIPE_C &&
plane_state->base.visible && plane_state->base.crtc_x < 0) {
plane_state->base.visible && plane_state->base.dst.x1 < 0) {
DRM_DEBUG_KMS("CHV cursor C not allowed to straddle the left screen edge\n");
return -EINVAL;
}
Expand All @@ -10954,11 +10960,14 @@ static void i9xx_update_cursor(struct intel_plane *plane,
unsigned long irqflags;

if (plane_state && plane_state->base.visible) {
unsigned width = drm_rect_width(&plane_state->base.dst);
unsigned height = drm_rect_height(&plane_state->base.dst);

cntl = plane_state->ctl |
i9xx_cursor_ctl_crtc(crtc_state);

if (plane_state->base.crtc_h != plane_state->base.crtc_w)
fbc_ctl = CUR_FBC_CTL_EN | (plane_state->base.crtc_h - 1);
if (width != height)
fbc_ctl = CUR_FBC_CTL_EN | (height - 1);

base = intel_cursor_base(plane_state);
pos = intel_cursor_position(plane_state);
Expand Down
58 changes: 20 additions & 38 deletions drivers/gpu/drm/i915/intel_pm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1117,10 +1117,7 @@ static u16 g4x_compute_wm(const struct intel_crtc_state *crtc_state,
clock = adjusted_mode->crtc_clock;
htotal = adjusted_mode->crtc_htotal;

if (plane->id == PLANE_CURSOR)
width = plane_state->base.crtc_w;
else
width = drm_rect_width(&plane_state->base.dst);
width = drm_rect_width(&plane_state->base.dst);

if (plane->id == PLANE_CURSOR) {
wm = intel_wm_method2(clock, htotal, width, cpp, latency);
Expand Down Expand Up @@ -2549,7 +2546,8 @@ static u32 ilk_compute_cur_wm(const struct intel_crtc_state *crtc_state,

return ilk_wm_method2(crtc_state->pixel_rate,
crtc_state->base.adjusted_mode.crtc_htotal,
plane_state->base.crtc_w, cpp, mem_value);
drm_rect_width(&plane_state->base.dst),
cpp, mem_value);
}

/* Only for WM_LP. */
Expand Down Expand Up @@ -4046,35 +4044,24 @@ static uint_fixed_16_16_t
skl_plane_downscale_amount(const struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state)
{
struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
u32 src_w, src_h, dst_w, dst_h;
uint_fixed_16_16_t fp_w_ratio, fp_h_ratio;
uint_fixed_16_16_t downscale_h, downscale_w;

if (WARN_ON(!intel_wm_plane_visible(crtc_state, plane_state)))
return u32_to_fixed16(0);

/* n.b., src is 16.16 fixed point, dst is whole integer */
if (plane->id == PLANE_CURSOR) {
/*
* Cursors only support 0/180 degree rotation,
* hence no need to account for rotation here.
*/
src_w = plane_state->base.src_w >> 16;
src_h = plane_state->base.src_h >> 16;
dst_w = plane_state->base.crtc_w;
dst_h = plane_state->base.crtc_h;
} else {
/*
* Src coordinates are already rotated by 270 degrees for
* the 90/270 degree plane rotation cases (to match the
* GTT mapping), hence no need to account for rotation here.
*/
src_w = drm_rect_width(&plane_state->base.src) >> 16;
src_h = drm_rect_height(&plane_state->base.src) >> 16;
dst_w = drm_rect_width(&plane_state->base.dst);
dst_h = drm_rect_height(&plane_state->base.dst);
}
/*
* Src coordinates are already rotated by 270 degrees for
* the 90/270 degree plane rotation cases (to match the
* GTT mapping), hence no need to account for rotation here.
*
* n.b., src is 16.16 fixed point, dst is whole integer.
*/
src_w = drm_rect_width(&plane_state->base.src) >> 16;
src_h = drm_rect_height(&plane_state->base.src) >> 16;
dst_w = drm_rect_width(&plane_state->base.dst);
dst_h = drm_rect_height(&plane_state->base.dst);

fp_w_ratio = div_fixed16(src_w, dst_w);
fp_h_ratio = div_fixed16(src_h, dst_h);
Expand Down Expand Up @@ -4698,20 +4685,15 @@ skl_compute_plane_wm_params(const struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state,
struct skl_wm_params *wp, int color_plane)
{
struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
const struct drm_framebuffer *fb = plane_state->base.fb;
int width;

if (plane->id == PLANE_CURSOR) {
width = plane_state->base.crtc_w;
} else {
/*
* Src coordinates are already rotated by 270 degrees for
* the 90/270 degree plane rotation cases (to match the
* GTT mapping), hence no need to account for rotation here.
*/
width = drm_rect_width(&plane_state->base.src) >> 16;
}
/*
* Src coordinates are already rotated by 270 degrees for
* the 90/270 degree plane rotation cases (to match the
* GTT mapping), hence no need to account for rotation here.
*/
width = drm_rect_width(&plane_state->base.src) >> 16;

return skl_compute_wm_params(crtc_state, width,
fb->format, fb->modifier,
Expand Down

0 comments on commit 3a61276

Please sign in to comment.