<html>
    <head>
      <base href="https://bugs.freedesktop.org/">
    </head>
    <body>
      <p>
        <div>
            <b><a class="bz_bug_link 
          bz_status_NEEDINFO "
   title="NEEDINFO - intel_fbdev_restore_mode derefence null pointer"
   href="https://bugs.freedesktop.org/show_bug.cgi?id=93580#c7">Comment # 7</a>
              on <a class="bz_bug_link 
          bz_status_NEEDINFO "
   title="NEEDINFO - intel_fbdev_restore_mode derefence null pointer"
   href="https://bugs.freedesktop.org/show_bug.cgi?id=93580">bug 93580</a>
              from <span class="vcard"><a class="email" href="mailto:dxtr@emacs.church" title="Kim Lidström <dxtr@emacs.church>"> <span class="fn">Kim Lidström</span></a>
</span></b>
        <pre>Is it possible to get patch <a href="https://patchwork.freedesktop.org/patch/93560/">https://patchwork.freedesktop.org/patch/93560/</a> and
<a href="https://patchwork.freedesktop.org/patch/93561/">https://patchwork.freedesktop.org/patch/93561/</a> that you gavae me in #96554 for
4.7-rc4?

They don't apply cleanly there.

This is the rejected hunk:

--- drivers/gpu/drm/i915/intel_fbdev.c
+++ drivers/gpu/drm/i915/intel_fbdev.c
@@ -551,12 +550,14 @@ static void intel_fbdev_destroy(struct drm_device *dev,
        drm_fb_helper_fini(&ifbdev->helper);

        if (ifbdev->fb) {
-               mutex_lock(&dev->struct_mutex);
+               mutex_lock(&ifbdev->helper.dev->struct_mutex);
                intel_unpin_fb_obj(&ifbdev->fb->base, BIT(DRM_ROTATE_0));
-               mutex_unlock(&dev->struct_mutex);
+               mutex_unlock(&ifbdev->helper.dev->struct_mutex);

                drm_framebuffer_remove(&ifbdev->fb->base);
        }
+
+       kfree(ifbdev);
 }

 /</pre>
        </div>
      </p>


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

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