| 50,6 → 50,7 |
|---|
| u32 sprctl, sprscale = 0; |
| unsigned long sprsurf_offset, linear_offset; |
| int pixel_size = drm_format_plane_cpp(fb->pixel_format, 0); |
| bool scaling_was_enabled = dev_priv->sprite_scaling_enabled; |
| |
| sprctl = I915_READ(SPRCTL(pipe)); |
| |
| 89,6 → 90,9 |
|---|
| sprctl |= SPRITE_TRICKLE_FEED_DISABLE; |
| sprctl |= SPRITE_ENABLE; |
| |
| if (IS_HASWELL(dev)) |
| sprctl |= SPRITE_PIPE_CSC_ENABLE; |
| |
| /* Sizes are 0 based */ |
| src_w--; |
| src_h--; |
| 103,19 → 107,15 |
|---|
| * when scaling is disabled. |
| */ |
| if (crtc_w != src_w || crtc_h != src_h) { |
| if (!dev_priv->sprite_scaling_enabled) { |
| dev_priv->sprite_scaling_enabled = true; |
| dev_priv->sprite_scaling_enabled |= 1 << pipe; |
| |
| if (!scaling_was_enabled) { |
| intel_update_watermarks(dev); |
| intel_wait_for_vblank(dev, pipe); |
| } |
| sprscale = SPRITE_SCALE_ENABLE | (src_w << 16) | src_h; |
| } else { |
| if (dev_priv->sprite_scaling_enabled) { |
| dev_priv->sprite_scaling_enabled = false; |
| /* potentially re-enable LP watermarks */ |
| intel_update_watermarks(dev); |
| } |
| } |
| } else |
| dev_priv->sprite_scaling_enabled &= ~(1 << pipe); |
| |
| I915_WRITE(SPRSTRIDE(pipe), fb->pitches[0]); |
| I915_WRITE(SPRPOS(pipe), (crtc_y << 16) | crtc_x); |
| 122,7 → 122,7 |
|---|
| |
| linear_offset = y * fb->pitches[0] + x * pixel_size; |
| sprsurf_offset = |
| intel_gen4_compute_offset_xtiled(&x, &y, |
| intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode, |
| pixel_size, fb->pitches[0]); |
| linear_offset -= sprsurf_offset; |
| |
| 141,6 → 141,10 |
|---|
| I915_WRITE(SPRCTL(pipe), sprctl); |
| I915_MODIFY_DISPBASE(SPRSURF(pipe), obj->gtt_offset + sprsurf_offset); |
| POSTING_READ(SPRSURF(pipe)); |
| |
| /* potentially re-enable LP watermarks */ |
| if (scaling_was_enabled && !dev_priv->sprite_scaling_enabled) |
| intel_update_watermarks(dev); |
| } |
| |
| static void |
| 150,6 → 154,7 |
|---|
| struct drm_i915_private *dev_priv = dev->dev_private; |
| struct intel_plane *intel_plane = to_intel_plane(plane); |
| int pipe = intel_plane->pipe; |
| bool scaling_was_enabled = dev_priv->sprite_scaling_enabled; |
| |
| I915_WRITE(SPRCTL(pipe), I915_READ(SPRCTL(pipe)) & ~SPRITE_ENABLE); |
| /* Can't leave the scaler enabled... */ |
| 159,7 → 164,10 |
|---|
| I915_MODIFY_DISPBASE(SPRSURF(pipe), 0); |
| POSTING_READ(SPRSURF(pipe)); |
| |
| dev_priv->sprite_scaling_enabled = false; |
| dev_priv->sprite_scaling_enabled &= ~(1 << pipe); |
| |
| /* potentially re-enable LP watermarks */ |
| if (scaling_was_enabled && !dev_priv->sprite_scaling_enabled) |
| intel_update_watermarks(dev); |
| } |
| |
| 287,7 → 295,7 |
|---|
| |
| linear_offset = y * fb->pitches[0] + x * pixel_size; |
| dvssurf_offset = |
| intel_gen4_compute_offset_xtiled(&x, &y, |
| intel_gen4_compute_page_offset(&x, &y, obj->tiling_mode, |
| pixel_size, fb->pitches[0]); |
| linear_offset -= dvssurf_offset; |
| |
| 591,7 → 599,7 |
|---|
| if ((set->flags & (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) == (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) |
| return -EINVAL; |
| |
| mutex_lock(&dev->mode_config.mutex); |
| drm_modeset_lock_all(dev); |
| |
| obj = drm_mode_object_find(dev, set->plane_id, DRM_MODE_OBJECT_PLANE); |
| if (!obj) { |
| 604,7 → 612,7 |
|---|
| ret = intel_plane->update_colorkey(plane, set); |
| |
| out_unlock: |
| mutex_unlock(&dev->mode_config.mutex); |
| drm_modeset_unlock_all(dev); |
| return ret; |
| } |
| |
| 618,7 → 626,7 |
|---|
| int ret = 0; |
| |
| |
| mutex_lock(&dev->mode_config.mutex); |
| drm_modeset_lock_all(dev); |
| |
| obj = drm_mode_object_find(dev, get->plane_id, DRM_MODE_OBJECT_PLANE); |
| if (!obj) { |
| 631,7 → 639,7 |
|---|
| intel_plane->get_colorkey(plane, get); |
| |
| out_unlock: |
| mutex_unlock(&dev->mode_config.mutex); |
| drm_modeset_unlock_all(dev); |
| return ret; |
| } |
| |