From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Lyude <cpaul@redhat.com>,
intel-gfx@lists.freedesktop.org,
Matt Roper <matthew.d.roper@intel.com>
Cc: stable@vger.kernel.org,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Daniel Vetter" <daniel.vetter@intel.com>,
"Radhakrishna Sripada" <radhakrishna.sripada@intel.com>,
"Hans de Goede" <hdegoede@redhat.com>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"David Airlie" <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/4] drm/i915/gen9: Only copy WM results for changed pipes to skl_hw
Date: Tue, 26 Jul 2016 16:21:20 +0200 [thread overview]
Message-ID: <d5bd1d1b-3d7b-7027-ea10-5b9313a3cf6a@linux.intel.com> (raw)
In-Reply-To: <1469129020-2680-2-git-send-email-cpaul@redhat.com>
Op 21-07-16 om 21:23 schreef Lyude:
> From: Matt Roper <matthew.d.roper@intel.com>
>
> When we write watermark values to the hardware, those values are stored
> in dev_priv->wm.skl_hw. However with recent watermark changes, the
> results structure we're copying from only contains valid watermark and
> DDB values for the pipes that are actually changing; the values for
> other pipes remain 0. Thus a blind copy of the entire skl_wm_values
> structure will clobber the values for unchanged pipes...we need to be
> more selective and only copy over the values for the changing pipes.
>
> This mistake was hidden until recently due to another bug that caused us
> to erroneously re-calculate watermarks for all active pipes rather than
> changing pipes. Only when that bug was fixed was the impact of this bug
> discovered (e.g., modesets failing with "Requested display configuration
> exceeds system watermark limitations" messages and leaving watermarks
> non-functional, even ones initiated by intel_fbdev_restore_mode).
>
> Changes since v1:
> - Add a function for copying a pipe's wm values
> (skl_copy_wm_for_pipe()) so we can reuse this later
>
> Fixes: 734fa01f3a17 ("drm/i915/gen9: Calculate watermarks during atomic 'check' (v2)")
> Fixes: 9b6130227495 ("drm/i915/gen9: Re-allocate DDB only for changed pipes")
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Lyude <cpaul@redhat.com>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> Cc: stable@vger.kernel.org
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
Testcase: kms_cursor_legacy.2x-flip-vs-cursor-legacy
For patch 2/4 too probably.
WARNING: multiple messages have this Message-ID (diff)
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: Lyude <cpaul@redhat.com>,
intel-gfx@lists.freedesktop.org,
Matt Roper <matthew.d.roper@intel.com>
Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Hans de Goede <hdegoede@redhat.com>,
stable@vger.kernel.org, Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH v2 1/4] drm/i915/gen9: Only copy WM results for changed pipes to skl_hw
Date: Tue, 26 Jul 2016 16:21:20 +0200 [thread overview]
Message-ID: <d5bd1d1b-3d7b-7027-ea10-5b9313a3cf6a@linux.intel.com> (raw)
In-Reply-To: <1469129020-2680-2-git-send-email-cpaul@redhat.com>
Op 21-07-16 om 21:23 schreef Lyude:
> From: Matt Roper <matthew.d.roper@intel.com>
>
> When we write watermark values to the hardware, those values are stored
> in dev_priv->wm.skl_hw. However with recent watermark changes, the
> results structure we're copying from only contains valid watermark and
> DDB values for the pipes that are actually changing; the values for
> other pipes remain 0. Thus a blind copy of the entire skl_wm_values
> structure will clobber the values for unchanged pipes...we need to be
> more selective and only copy over the values for the changing pipes.
>
> This mistake was hidden until recently due to another bug that caused us
> to erroneously re-calculate watermarks for all active pipes rather than
> changing pipes. Only when that bug was fixed was the impact of this bug
> discovered (e.g., modesets failing with "Requested display configuration
> exceeds system watermark limitations" messages and leaving watermarks
> non-functional, even ones initiated by intel_fbdev_restore_mode).
>
> Changes since v1:
> - Add a function for copying a pipe's wm values
> (skl_copy_wm_for_pipe()) so we can reuse this later
>
> Fixes: 734fa01f3a17 ("drm/i915/gen9: Calculate watermarks during atomic 'check' (v2)")
> Fixes: 9b6130227495 ("drm/i915/gen9: Re-allocate DDB only for changed pipes")
> Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Lyude <cpaul@redhat.com>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> Cc: stable@vger.kernel.org
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
Testcase: kms_cursor_legacy.2x-flip-vs-cursor-legacy
For patch 2/4 too probably.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-07-26 14:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-21 19:23 [PATCH v2 0/4] drm/i915/skl: Finally fix watermarks Lyude
2016-07-21 19:23 ` [PATCH v2 1/4] drm/i915/gen9: Only copy WM results for changed pipes to skl_hw Lyude
2016-07-21 19:23 ` Lyude
2016-07-25 13:01 ` Maarten Lankhorst
2016-07-26 14:21 ` Maarten Lankhorst [this message]
2016-07-26 14:21 ` Maarten Lankhorst
2016-07-21 19:23 ` [PATCH v2 2/4] drm/i915/skl: Only flush pipes when we change the ddb allocation Lyude
2016-07-21 19:23 ` Lyude
2016-07-21 20:48 ` Matt Roper
2016-07-21 20:48 ` Matt Roper
2016-07-25 7:34 ` [Intel-gfx] " Maarten Lankhorst
2016-07-21 19:23 ` [PATCH v2 3/4] drm/i915/skl: Fix extra whitespace in skl_flush_wm_values() Lyude
2016-07-21 19:23 ` Lyude
2016-07-21 19:23 ` [PATCH v2 4/4] drm/i915/skl: Update plane watermarks atomically during plane updates Lyude
2016-07-21 19:23 ` Lyude
2016-07-21 20:57 ` Matt Roper
2016-07-21 20:57 ` Matt Roper
2016-07-21 20:57 ` Matt Roper
2016-07-22 7:09 ` ✓ Ro.CI.BAT: success for drm/i915/skl: Finally fix watermarks (rev2) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d5bd1d1b-3d7b-7027-ea10-5b9313a3cf6a@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=airlied@linux.ie \
--cc=cpaul@redhat.com \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.d.roper@intel.com \
--cc=radhakrishna.sripada@intel.com \
--cc=stable@vger.kernel.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.