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 v12 5/7] drm/i915/skl: Ensure pipes with changed wms get added to the state
Date: Wed, 17 Aug 2016 15:55:57 -0400 [thread overview]
Message-ID: <1471463761-26796-6-git-send-email-cpaul@redhat.com> (raw)
In-Reply-To: <1471463761-26796-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 849f039..a3d24cb 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4117,6 +4117,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
next prev parent reply other threads:[~2016-08-17 19:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-17 19:55 [PATCH v12 0/7] Finally fix watermarks Lyude
2016-08-17 19:55 ` [PATCH v12 1/7] drm/i915/gen6+: Interpret mailbox error flags Lyude
2016-08-17 19:55 ` [PATCH v12 2/7] drm/i915/skl: Add support for the SAGV, fix underrun hangs Lyude
2016-08-18 7:39 ` Maarten Lankhorst
[not found] ` <1471529159.4098.10.camel@redhat.com>
2016-08-22 7:27 ` Maarten Lankhorst
2016-08-17 19:55 ` [PATCH v12 3/7] drm/i915/gen9: Only copy WM results for changed pipes to skl_hw Lyude
2016-08-17 19:55 ` [PATCH v12 4/7] drm/i915/skl: Update plane watermarks atomically during plane updates Lyude
2016-08-22 11:24 ` Maarten Lankhorst
2016-08-22 16:50 ` [PATCH v13 " Lyude
2016-08-23 10:16 ` Maarten Lankhorst
2016-08-23 14:12 ` [RESEND PATCH v13 6/7] drm/i915: Move CRTC updating in atomic_commit into it's own hook Lyude
2016-08-23 14:12 ` [RESEND PATCH v13 7/7] drm/i915/skl: Update DDB values atomically with wms/plane attrs Lyude
2016-08-17 19:55 ` Lyude [this message]
2016-09-20 18:45 ` [PATCH v12 5/7] drm/i915/skl: Ensure pipes with changed wms get added to the state Mike Lothian
2016-09-21 6:56 ` Maarten Lankhorst
2016-09-21 11:34 ` Mike Lothian
2016-09-26 13:57 ` Mike Lothian
2016-08-17 19:55 ` [PATCH v12 6/7] drm/i915: Move CRTC updating in atomic_commit into it's own hook Lyude
2016-08-17 19:55 ` [PATCH v12 7/7] drm/i915/skl: Update DDB values atomically with wms/plane attrs Lyude
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=1471463761-26796-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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).