On Wed, Jun 10, 2026 at 02:37:06PM +1000, Jonathan Gray wrote:
> committed with the call order changed to match
> inteldrm_doswitch() and inteldrm_enter_ddb()

Ah, at some point I got confused about this!

What I had noticed that didn't work was calling rasops_*() before
i915_*_resume(), as in the amdgpu patch.  But after testing this now I
confirm that doing it before drm_client_dev_restore() also works, so
let's better respect the order we see in the other two functions.


Thank you.


> 
> Index: i915_driver.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/pci/drm/i915/i915_driver.c,v
> diff -u -p -r1.31 i915_driver.c
> --- i915_driver.c	9 Jun 2026 11:23:02 -0000	1.31
> +++ i915_driver.c	10 Jun 2026 03:54:32 -0000
> @@ -2567,8 +2567,8 @@ inteldrm_activate(struct device *self, i
>  			i915_pm_resume_early(self);
>  			i915_pm_resume(self);
>  		}
> -		drm_client_dev_restore(dev);
>  		rasops_show_screen(ri, ri->ri_active, 0, NULL, NULL);
> +		drm_client_dev_restore(dev);
>  		rv = config_suspend(dev->dev, act);
>  		break;
>  	}


-- 
Walter