From: Matt Roper <matthew.d.roper@intel.com>
To: Lyude <cpaul@redhat.com>
Cc: dri-devel@lists.freedesktop.org, David Airlie <airlied@linux.ie>,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>,
Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH v5 4/6] drm/i915/skl: Ensure pipes with changed wms get added to the state
Date: Tue, 2 Aug 2016 14:26:04 -0700 [thread overview]
Message-ID: <20160802212604.GZ32025@intel.com> (raw)
In-Reply-To: <1470163975-30467-5-git-send-email-cpaul@redhat.com>
On Tue, Aug 02, 2016 at 02:52:52PM -0400, Lyude wrote:
> If we're enabling a pipe, we'll need to modify the watermarks on all
> other active pipes. Since those pipes won't be added to the state on
> their own, we need to add them ourselves.
All pipes (crtc's) are already added to the state if we have a change in
active pipes. I think what you meant to write was "...we'll need to
modify the watermarks on all active *planes*. Since those *planes*
won't..."
Aside from the commit message, I believe the logic is correct, so you
can consider this
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
once you reword it.
Matt
>
> Signed-off-by: Lyude <cpaul@redhat.com>
> Cc: stable@vger.kernel.org
> 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>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 53adcbf..6b2452b 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4085,6 +4085,10 @@ skl_compute_ddb(struct drm_atomic_state *state)
> ret = skl_allocate_pipe_ddb(cstate, ddb);
> if (ret)
> return ret;
> +
> + ret = drm_atomic_add_affected_planes(state, &intel_crtc->base);
> + if (ret)
> + return ret;
> }
>
> return 0;
> --
> 2.7.4
>
--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Matt Roper <matthew.d.roper@intel.com>
To: Lyude <cpaul@redhat.com>
Cc: intel-gfx@lists.freedesktop.org,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
stable@vger.kernel.org, "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 v5 4/6] drm/i915/skl: Ensure pipes with changed wms get added to the state
Date: Tue, 2 Aug 2016 14:26:04 -0700 [thread overview]
Message-ID: <20160802212604.GZ32025@intel.com> (raw)
In-Reply-To: <1470163975-30467-5-git-send-email-cpaul@redhat.com>
On Tue, Aug 02, 2016 at 02:52:52PM -0400, Lyude wrote:
> If we're enabling a pipe, we'll need to modify the watermarks on all
> other active pipes. Since those pipes won't be added to the state on
> their own, we need to add them ourselves.
All pipes (crtc's) are already added to the state if we have a change in
active pipes. I think what you meant to write was "...we'll need to
modify the watermarks on all active *planes*. Since those *planes*
won't..."
Aside from the commit message, I believe the logic is correct, so you
can consider this
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
once you reword it.
Matt
>
> Signed-off-by: Lyude <cpaul@redhat.com>
> Cc: stable@vger.kernel.org
> 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>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 53adcbf..6b2452b 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4085,6 +4085,10 @@ skl_compute_ddb(struct drm_atomic_state *state)
> ret = skl_allocate_pipe_ddb(cstate, ddb);
> if (ret)
> return ret;
> +
> + ret = drm_atomic_add_affected_planes(state, &intel_crtc->base);
> + if (ret)
> + return ret;
> }
>
> return 0;
> --
> 2.7.4
>
--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
WARNING: multiple messages have this Message-ID (diff)
From: Matt Roper <matthew.d.roper@intel.com>
To: Lyude <cpaul@redhat.com>
Cc: intel-gfx@lists.freedesktop.org,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
stable@vger.kernel.org, "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 v5 4/6] drm/i915/skl: Ensure pipes with changed wms get added to the state
Date: Tue, 2 Aug 2016 14:26:04 -0700 [thread overview]
Message-ID: <20160802212604.GZ32025@intel.com> (raw)
In-Reply-To: <1470163975-30467-5-git-send-email-cpaul@redhat.com>
On Tue, Aug 02, 2016 at 02:52:52PM -0400, Lyude wrote:
> If we're enabling a pipe, we'll need to modify the watermarks on all
> other active pipes. Since those pipes won't be added to the state on
> their own, we need to add them ourselves.
All pipes (crtc's) are already added to the state if we have a change in
active pipes. I think what you meant to write was "...we'll need to
modify the watermarks on all active *planes*. Since those *planes*
won't..."
Aside from the commit message, I believe the logic is correct, so you
can consider this
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
once you reword it.
Matt
>
> Signed-off-by: Lyude <cpaul@redhat.com>
> Cc: stable@vger.kernel.org
> 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>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index 53adcbf..6b2452b 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -4085,6 +4085,10 @@ skl_compute_ddb(struct drm_atomic_state *state)
> ret = skl_allocate_pipe_ddb(cstate, ddb);
> if (ret)
> return ret;
> +
> + ret = drm_atomic_add_affected_planes(state, &intel_crtc->base);
> + if (ret)
> + return ret;
> }
>
> return 0;
> --
> 2.7.4
>
--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
next prev parent reply other threads:[~2016-08-02 21:26 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-02 18:52 [PATCH v5 0/6] Finally fix watermarks Lyude
2016-08-02 18:52 ` Lyude
2016-08-02 18:52 ` [PATCH v5 1/6] drm/i915/skl: Add support for the SAGV, fix underrun hangs Lyude
2016-08-02 18:52 ` Lyude
2016-08-02 19:50 ` [v5,1/6] " Hans de Goede
2016-08-02 19:50 ` Hans de Goede
2016-08-02 21:05 ` [PATCH v5 1/6] " Matt Roper
2016-08-02 21:05 ` Matt Roper
2016-08-02 21:05 ` Matt Roper
2016-08-02 18:52 ` [PATCH v5 2/6] drm/i915/gen9: Only copy WM results for changed pipes to skl_hw Lyude
2016-08-02 18:52 ` Lyude
2016-08-02 18:52 ` [PATCH v5 3/6] drm/i915/skl: Update plane watermarks atomically during plane updates Lyude
2016-08-02 18:52 ` Lyude
2016-08-02 21:20 ` Matt Roper
2016-08-02 21:20 ` Matt Roper
2016-08-02 21:20 ` Matt Roper
2016-08-03 21:14 ` Matt Roper
2016-08-03 21:14 ` Matt Roper
2016-08-03 21:14 ` Matt Roper
2016-08-03 21:16 ` Matt Roper
2016-08-03 21:16 ` Matt Roper
2016-08-02 18:52 ` [PATCH v5 4/6] drm/i915/skl: Ensure pipes with changed wms get added to the state Lyude
2016-08-02 18:52 ` Lyude
2016-08-02 21:26 ` Matt Roper [this message]
2016-08-02 21:26 ` Matt Roper
2016-08-02 21:26 ` Matt Roper
2016-08-02 18:52 ` [PATCH v5 5/6] drm/i915: Move CRTC updating in atomic_commit into it's own hook Lyude
2016-08-02 18:52 ` Lyude
2016-08-02 22:11 ` Matt Roper
2016-08-02 22:11 ` Matt Roper
2016-08-02 18:52 ` [PATCH v5 6/6] drm/i915/skl: Update DDB values atomically with wms/plane attrs Lyude
2016-08-02 18:52 ` Lyude
2016-08-03 0:11 ` Matt Roper
2016-08-03 0:11 ` Matt Roper
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=20160802212604.GZ32025@intel.com \
--to=matthew.d.roper@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=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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.