<html>
    <head>
      <base href="https://bugs.freedesktop.org/" />
    </head>
    <body>
      <p>
        <div>
            <b><a class="bz_bug_link 
          bz_status_NEW "
   title="NEW --- - [snb regression] Suspend fails for i915 with [drm] stuck on render ring"
   href="https://bugs.freedesktop.org/show_bug.cgi?id=74200#c12">Comment # 12</a>
              on <a class="bz_bug_link 
          bz_status_NEW "
   title="NEW --- - [snb regression] Suspend fails for i915 with [drm] stuck on render ring"
   href="https://bugs.freedesktop.org/show_bug.cgi?id=74200">bug 74200</a>
              from <span class="vcard"><a class="email" href="mailto:chris@chris-wilson.co.uk" title="Chris Wilson <chris@chris-wilson.co.uk>"> <span class="fn">Chris Wilson</span></a>
</span></b>
        <pre>All I can think of is that the macros get confused:

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index ab34163..abe91b8 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -251,7 +251,8 @@ i915_gem_dumb_create(struct drm_file *file,
                     struct drm_mode_create_dumb *args)
 {
        /* have to work out size/pitch and return them */
-       args->pitch = ALIGN(args->width * DIV_ROUND_UP(args->bpp, 8), 64);
+       args->pitch = args->width * DIV_ROUND_UP(args->bpp, 8);
+       args->pitch = ALIGN(args->pitch, 64);
        args->size = args->pitch * args->height;
        return i915_gem_create(file, dev, args->size, &args->handle);
 }
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c
b/drivers/gpu/drm/i915/intel_fbdev.c
index d6a8a71..f0ef01a 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -74,8 +74,8 @@ static int intelfb_alloc(struct drm_fb_helper *helper,
        mode_cmd.width = sizes->surface_width;
        mode_cmd.height = sizes->surface_height;

-       mode_cmd.pitches[0] = ALIGN(mode_cmd.width *
-                                   DIV_ROUND_UP(sizes->surface_bpp, 8), 64);
+       mode_cmd.pitches[0] = mode_cmd.with * DIV_ROUND_UP(sizes->surface_bpp,
8);
+       mode_cmd.pitches[0] = ALIGN(mode_cmd.pitches[0], 64);
        mode_cmd.pixel_format = drm_mode_legacy_fb_format(sizes->surface_bpp,
                                                         
sizes->surface_depth);</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 on the CC list for the bug.</li>
      </ul>
    </body>
</html>