From: Lyude <cpaul@redhat.com> To: intel-gfx@lists.freedesktop.org, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Matt Roper" <matthew.d.roper@intel.com> Cc: Lyude <cpaul@redhat.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: [PATCH v11 5/7] drm/i915/skl: Ensure pipes with changed wms get added to the state Date: Thu, 11 Aug 2016 15:54:34 -0400 [thread overview] Message-ID: <1470945277-7973-6-git-send-email-cpaul@redhat.com> (raw) In-Reply-To: <1470945277-7973-1-git-send-email-cpaul@redhat.com> If we're enabling a pipe, we'll need to modify the watermarks on all active planes. Since those planes won't be added to the state on their own, we need to add them ourselves. Signed-off-by: Lyude <cpaul@redhat.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.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> --- 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 e8653d8..f2e0071 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4058,6 +4058,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
WARNING: multiple messages have this Message-ID (diff)
From: Lyude <cpaul@redhat.com> To: intel-gfx@lists.freedesktop.org, "Ville Syrjälä" <ville.syrjala@linux.intel.com>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "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>, Lyude <cpaul@redhat.com> Subject: [PATCH v11 5/7] drm/i915/skl: Ensure pipes with changed wms get added to the state Date: Thu, 11 Aug 2016 15:54:34 -0400 [thread overview] Message-ID: <1470945277-7973-6-git-send-email-cpaul@redhat.com> (raw) In-Reply-To: <1470945277-7973-1-git-send-email-cpaul@redhat.com> If we're enabling a pipe, we'll need to modify the watermarks on all active planes. Since those planes won't be added to the state on their own, we need to add them ourselves. Signed-off-by: Lyude <cpaul@redhat.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.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> --- 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 e8653d8..f2e0071 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4058,6 +4058,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 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-08-11 19:54 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-11 19:54 [PATCH v11 0/7] Finally fix watermarks Lyude 2016-08-11 19:54 ` Lyude 2016-08-11 19:54 ` [PATCH v11 1/7] drm/i915/gen6+: Return -EINVAL on invalid pcode commands Lyude 2016-08-11 19:54 ` Lyude 2016-08-12 11:23 ` Ville Syrjälä 2016-08-12 11:23 ` Ville Syrjälä 2016-08-12 11:23 ` Ville Syrjälä 2016-08-11 19:54 ` [PATCH v11 2/7] drm/i915/skl: Add support for the SAGV, fix underrun hangs Lyude 2016-08-11 19:54 ` Lyude 2016-08-12 12:04 ` Ville Syrjälä 2016-08-12 12:04 ` Ville Syrjälä 2016-08-12 12:04 ` Ville Syrjälä 2016-08-11 19:54 ` [PATCH v11 3/7] drm/i915/gen9: Only copy WM results for changed pipes to skl_hw Lyude 2016-08-11 19:54 ` Lyude 2016-08-11 19:54 ` [PATCH v11 4/7] drm/i915/skl: Update plane watermarks atomically during plane updates Lyude 2016-08-11 19:54 ` Lyude 2016-08-12 12:42 ` Ville Syrjälä 2016-08-12 12:42 ` Ville Syrjälä 2016-08-12 12:42 ` Ville Syrjälä 2016-08-11 19:54 ` Lyude [this message] 2016-08-11 19:54 ` [PATCH v11 5/7] drm/i915/skl: Ensure pipes with changed wms get added to the state Lyude 2016-08-11 19:54 ` [PATCH v11 6/7] drm/i915: Move CRTC updating in atomic_commit into it's own hook Lyude 2016-08-11 19:54 ` Lyude 2016-08-11 19:54 ` [PATCH v11 7/7] drm/i915/skl: Update DDB values atomically with wms/plane attrs Lyude 2016-08-11 19:54 ` Lyude 2016-08-12 13:30 ` Ville Syrjälä 2016-08-12 13:30 ` Ville Syrjälä 2016-08-12 5:21 ` ✗ Ro.CI.BAT: failure for Finally fix watermarks (rev9) 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=1470945277-7973-6-git-send-email-cpaul@redhat.com \ --to=cpaul@redhat.com \ --cc=airlied@linux.ie \ --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=maarten.lankhorst@linux.intel.com \ --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: linkBe 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.