diff options
| author | Ville Syrjälä <[email protected]> | 2018-11-01 17:05:56 +0200 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2018-11-09 19:11:19 +0200 |
| commit | 07464c7c0cf773b86372d128d17a892529c0775a (patch) | |
| tree | d1535d5d387dfbb8d35c87408509ac6c8e28342c | |
| parent | 7b012bd62db951384a73943311822d1fb447e416 (diff) | |
drm/i915: Clean up skl+ PLANE_POS vs. scaler handling
On skl+ the scaler (when enabled) will take care of the plane output
position. Make the code less ugly by just setting crtc_x/y to 0
when the scaler is enabled.
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Rodrigo Vivi <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 6d9f321cdf7b..facf7ca8f14f 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -492,6 +492,12 @@ skl_program_plane(struct intel_plane *plane, if (alpha < 0xff) keymsk |= PLANE_KEYMSK_ALPHA_ENABLE; + /* The scaler will handle the output position */ + if (plane_state->scaler_id >= 0) { + crtc_x = 0; + crtc_y = 0; + } + spin_lock_irqsave(&dev_priv->uncore.lock, irqflags); if (INTEL_GEN(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) @@ -537,14 +543,10 @@ skl_program_plane(struct intel_plane *plane, I915_WRITE_FW(PLANE_CUS_CTL(pipe, plane_id), cus_ctl); } - if (plane_state->scaler_id >= 0) { - if (!slave) - skl_program_scaler(plane, crtc_state, plane_state); + if (!slave && plane_state->scaler_id >= 0) + skl_program_scaler(plane, crtc_state, plane_state); - I915_WRITE_FW(PLANE_POS(pipe, plane_id), 0); - } else { - I915_WRITE_FW(PLANE_POS(pipe, plane_id), (crtc_y << 16) | crtc_x); - } + I915_WRITE_FW(PLANE_POS(pipe, plane_id), (crtc_y << 16) | crtc_x); I915_WRITE_FW(PLANE_CTL(pipe, plane_id), plane_ctl); I915_WRITE_FW(PLANE_SURF(pipe, plane_id), |