[Intel-gfx] [PATCH] drm/i915: Redo WMs when cursor size changes

[Ausmus, James]

On Thu, Feb 26, 2015 at 2:48 PM, Joe Konno <joe.konno at linux.intel.com>
wrote:
>
> From: Joe Konno <joe.konno at intel.com>
>
> In instances where cursor sizes change, as in Chromium Ozone/Freon,
> watermarks should be recomputed. There should be no hard-coded
> assumptions about cursor widths. This was corrected originally here:
>
>     commit 64f962e3e38bf6f40bbd2462f8380dee0369e1bf
>     Author: Chris Wilson <chris at chris-wilson.co.uk>
>     Date:   Wed Mar 26 12:38:15 2014 +0000
>
>         drm/i915: Recompute WM when the cursor size changes
>
> However, it seems the recompute logic got lost in refactoring.
> Re-introduce the relevant WM re-compute code from the original patch.
>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Matt Roper <matthew.d.roper at intel.com>
> Fixes: 32b7eeec4d1e ("drm/i915: Refactor work that can sleep out of
commit (v7)")
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89346
> Signed-off-by: Joe Konno <joe.konno at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
> index b0f113d9daab..c5cbfea0551e 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12234,6 +12234,7 @@ intel_commit_cursor_plane(struct drm_plane *plane,
>         struct intel_plane *intel_plane = to_intel_plane(plane);
>         struct drm_i915_gem_object *obj = intel_fb_obj(state->base.fb);
>         uint32_t addr;
> +       unsigned old_width;
>
>         crtc = crtc ? crtc : plane->crtc;
>         intel_crtc = to_intel_crtc(crtc);
> @@ -12243,6 +12244,7 @@ intel_commit_cursor_plane(struct drm_plane *plane,
>         crtc->cursor_y = state->base.crtc_y;
>
>         intel_plane->obj = obj;
> +       old_width = intel_crtc->cursor_width;
>
>         if (intel_crtc->cursor_bo == obj)
>                 goto update;
> @@ -12260,8 +12262,11 @@ update:
>         intel_crtc->cursor_width = state->base.crtc_w;
>         intel_crtc->cursor_height = state->base.crtc_h;
>
> -       if (intel_crtc->active)
> +       if (intel_crtc->active) {
> +               if (old_width != intel_crtc->cursor_width)
> +                       intel_update_watermarks(crtc);
>                 intel_crtc_update_cursor(crtc, state->visible);
> +       }
>  }
>
>  static struct drm_plane *intel_cursor_plane_create(struct drm_device
*dev,
> --
> 2.3.0
>

Tested-by: James Ausmus <james.ausmus at intel.com>


> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx




--


James Ausmus
Sr. Software Engineer
SSG-OTC ChromeOS Integration
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20150226/8cdb1520/attachment.html>