return err;
 }
 
-static void panel_edp_remove(struct device *dev)
+static void panel_edp_shutdown(struct device *dev)
 {
        struct panel_edp *panel = dev_get_drvdata(dev);
 
-       drm_panel_remove(&panel->base);
+       /*
+        * NOTE: the following two calls don't really belong here. It is the
+        * responsibility of a correctly written DRM modeset driver to call
+        * drm_atomic_helper_shutdown() at shutdown time and that should
+        * cause the panel to be disabled / unprepared if needed. For now,
+        * however, we'll keep these calls due to the sheer number of
+        * different DRM modeset drivers used with panel-edp. The fact that
+        * we're calling these and _also_ the drm_atomic_helper_shutdown()
+        * will try to disable/unprepare means that we can get a warning about
+        * trying to disable/unprepare an already disabled/unprepared panel,
+        * but that's something we'll have to live with until we've confirmed
+        * that all DRM modeset drivers are properly calling
+        * drm_atomic_helper_shutdown().
+        */
        drm_panel_disable(&panel->base);
        drm_panel_unprepare(&panel->base);
+}
+
+static void panel_edp_remove(struct device *dev)
+{
+       struct panel_edp *panel = dev_get_drvdata(dev);
+
+       drm_panel_remove(&panel->base);
+       panel_edp_shutdown(dev);
 
        pm_runtime_dont_use_autosuspend(dev);
        pm_runtime_disable(dev);
        panel->drm_edid = NULL;
 }
 
-static void panel_edp_shutdown(struct device *dev)
-{
-       struct panel_edp *panel = dev_get_drvdata(dev);
-
-       drm_panel_disable(&panel->base);
-       drm_panel_unprepare(&panel->base);
-}
-
 static const struct display_timing auo_b101ean01_timing = {
        .pixelclock = { 65300000, 72500000, 75000000 },
        .hactive = { 1280, 1280, 1280 },