[PATCH 81/86] drm/i915: Move custom restore code into separate callback

[Thomas Zimmermann]

i915's fbdev contains additional code for restoring the client that
cannot be ported to the common fbdev client. Introduce the callback
struct drm_fb_helper.fb_restore and implement it for i915. The fbdev
helpers invoke the callback after restoring the fbdev client.

Signed-off-by: Thomas Zimmermann <tzimmerm...@suse.de>
Cc: Jani Nikula <jani.nik...@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.v...@intel.com>
Cc: Joonas Lahtinen <joonas.lahti...@linux.intel.com>
Cc: Tvrtko Ursulin <tursu...@ursulin.net>
Cc: Lucas De Marchi <lucas.demar...@intel.com>
Cc: "Thomas Hellström" <thomas.hellst...@linux.intel.com>
---
 drivers/gpu/drm/drm_fb_helper.c            |  3 +++
 drivers/gpu/drm/i915/display/intel_fbdev.c | 12 ++++++++++--
 include/drm/drm_fb_helper.h                | 13 +++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 31e255c2b04a..d9e539b0fd1a 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -245,6 +245,9 @@ __drm_fb_helper_restore_fbdev_mode_unlocked(struct 
drm_fb_helper *fb_helper,
        if (do_delayed)
                drm_fb_helper_hotplug_event(fb_helper);
 
+       if (fb_helper->funcs->fb_restore)
+               fb_helper->funcs->fb_restore(fb_helper);
+
        return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c 
b/drivers/gpu/drm/i915/display/intel_fbdev.c
index 9ece62783ce1..c03fb00002a4 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -296,9 +296,19 @@ static int intelfb_dirty(struct drm_fb_helper *helper, 
struct drm_clip_rect *cli
        return 0;
 }
 
+static void intelfb_restore(struct drm_fb_helper *fb_helper)
+{
+       struct drm_device *dev = fb_helper->client.dev;
+       struct drm_i915_private *dev_priv = to_i915(dev);
+       struct intel_fbdev *ifbdev = dev_priv->display.fbdev.fbdev;
+
+       intel_fbdev_invalidate(ifbdev);
+}
+
 static const struct drm_fb_helper_funcs intel_fb_helper_funcs = {
        .fb_probe = intelfb_create,
        .fb_dirty = intelfb_dirty,
+       .fb_restore = intelfb_restore,
 };
 
 /*
@@ -582,8 +592,6 @@ static int intel_fbdev_restore_mode(struct drm_i915_private 
*dev_priv)
        if (ret)
                return ret;
 
-       intel_fbdev_invalidate(ifbdev);
-
        return 0;
 }
 
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 699f2790b9ac..34eb77c18a13 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -99,6 +99,19 @@ struct drm_fb_helper_funcs {
         * 0 on success, or an error code otherwise.
         */
        int (*fb_dirty)(struct drm_fb_helper *helper, struct drm_clip_rect 
*clip);
+
+       /**
+        * @fb_restore:
+        *
+        * Driver callback to restore internal fbdev state. If set, fbdev
+        * emulation will invoke this callback after restoring the display
+        * mode.
+        *
+        * Only for i915. Do not use in new code.
+        *
+        * TODO: Fix i915 to not require this callback.
+        */
+       void (*fb_restore)(struct drm_fb_helper *helper);
 };
 
 /**
-- 
2.46.0