| Message ID | 1494400958-32616-1-git-send-email-tjaalton@ubuntu.com |
|---|---|
| State | New |
| Headers | show |
bah, this is for xenial of course.. On 10.05.2017 10:22, Timo Aaltonen wrote: > From: Timo Aaltonen <timo.aaltonen@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1580272 > > This will have to do for v4.4, backporting everything from v4.8.6 is just > not feasible. > > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> > --- > ubuntu/i915/intel_pm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ubuntu/i915/intel_pm.c b/ubuntu/i915/intel_pm.c > index 320d8e6..c813330 100644 > --- a/ubuntu/i915/intel_pm.c > +++ b/ubuntu/i915/intel_pm.c > @@ -3672,7 +3672,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev, > * because it was really needed, so we expect the WM values to > * be different. > */ > - WARN_ON(!wm_changed); > +// WARN_ON(!wm_changed); > > skl_compute_wm_results(dev, &pipe_wm, r, intel_crtc); > r->dirty[intel_crtc->pipe] = true; >
On Wed, May 10, 2017 at 10:22:38AM +0300, Timo Aaltonen wrote: > From: Timo Aaltonen <timo.aaltonen@canonical.com> > > BugLink: http://bugs.launchpad.net/bugs/1580272 > > This will have to do for v4.4, backporting everything from v4.8.6 is just > not feasible. > > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> Acked-by: Seth Forshee <seth.forshee@canonical.com>
Applied to xenial master-next branch. Thanks. Cascardo.
diff --git a/ubuntu/i915/intel_pm.c b/ubuntu/i915/intel_pm.c index 320d8e6..c813330 100644 --- a/ubuntu/i915/intel_pm.c +++ b/ubuntu/i915/intel_pm.c @@ -3672,7 +3672,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev, * because it was really needed, so we expect the WM values to * be different. */ - WARN_ON(!wm_changed); +// WARN_ON(!wm_changed); skl_compute_wm_results(dev, &pipe_wm, r, intel_crtc); r->dirty[intel_crtc->pipe] = true;