diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c
index 3c72ef3fc05..78530f2105b 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_drv.c
@@ -3812,6 +3812,10 @@ amdgpu_attachhook(struct device *self)
 	if (r)
 		goto out;
 
+	r = drm_dev_register(dev, adev->flags);
+	if (r)
+		goto out;
+
 	/*
 	 * 1. don't init fbdev on hw without DCE
 	 * 2. don't init fbdev if there are no connectors
@@ -3820,12 +3824,6 @@ amdgpu_attachhook(struct device *self)
 	    !list_empty(&adev_to_drm(adev)->mode_config.connector_list)) {
 		const struct drm_format_info *format;
 
-		/*
-		 * in linux via amdgpu_pci_probe -> drm_dev_register
-		 * must be before drm_fbdev_generic_setup()
-		 */
-		drm_dev_register(dev, adev->flags);
-
 		/* OpenBSD specific backlight property on connector */
 		amdgpu_init_backlight(adev);