<html>
    <head>
      <base href="https://bugs.freedesktop.org/">
    </head>
    <body><span class="vcard"><a class="email" href="mailto:imre.deak@intel.com" title="Imre Deak <imre.deak@intel.com>"> <span class="fn">Imre Deak</span></a>
</span> changed
          <a class="bz_bug_link 
          bz_status_NEEDINFO "
   title="NEEDINFO - [APL] too many voltage retries / CPU pipe X FIFO underrun / audio errors when suspending to ram"
   href="https://bugs.freedesktop.org/show_bug.cgi?id=96915">bug 96915</a>
          <br>
             <table border="1" cellspacing="0" cellpadding="8">
          <tr>
            <th>What</th>
            <th>Removed</th>
            <th>Added</th>
          </tr>

         <tr>
           <td style="text-align:right;">Status</td>
           <td>NEW
           </td>
           <td>NEEDINFO
           </td>
         </tr>

         <tr>
           <td style="text-align:right;">Assignee</td>
           <td>intel-gfx-bugs@lists.freedesktop.org
           </td>
           <td>imre.deak@intel.com
           </td>
         </tr></table>
      <p>
        <div>
            <b><a class="bz_bug_link 
          bz_status_NEEDINFO "
   title="NEEDINFO - [APL] too many voltage retries / CPU pipe X FIFO underrun / audio errors when suspending to ram"
   href="https://bugs.freedesktop.org/show_bug.cgi?id=96915#c3">Comment # 3</a>
              on <a class="bz_bug_link 
          bz_status_NEEDINFO "
   title="NEEDINFO - [APL] too many voltage retries / CPU pipe X FIFO underrun / audio errors when suspending to ram"
   href="https://bugs.freedesktop.org/show_bug.cgi?id=96915">bug 96915</a>
              from <span class="vcard"><a class="email" href="mailto:imre.deak@intel.com" title="Imre Deak <imre.deak@intel.com>"> <span class="fn">Imre Deak</span></a>
</span></b>
        <pre>Could you try the following:

diff --git a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index 78beb7e..3c0c2d6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -13682,12 +13682,14 @@ static void intel_atomic_commit_tail(struct
drm_atomic_state *state)
                         */
                        intel_check_cpu_fifo_underruns(dev_priv);
                        intel_check_pch_fifo_underruns(dev_priv);
-
-                       if (!crtc->state->active)
-                               intel_update_watermarks(crtc);
                }
        }

+       for_each_crtc_in_state(state, crtc, old_crtc_state, i) {
+               if (needs_modeset(crtc->state) && !crtc->state->active)
+                       intel_update_watermarks(crtc);
+       }
+
        /* Only after disabling all output pipelines that will be changed can
we
         * update the the output configuration. */
        intel_modeset_update_crtc_state(state);</pre>
        </div>
      </p>


      <hr>
      <span>You are receiving this mail because:</span>

      <ul>
          <li>You are the QA Contact for the bug.</li>
          <li>You are the assignee for the bug.</li>
          <li>You are on the CC list for the bug.</li>
      </ul>
    </body>
</html>