From 5820ca24c6d0c6413eb79f4bda6a3184153ead97 Mon Sep 17 00:00:00 2001 From: riastradh Date: Thu, 17 Jul 2014 20:41:22 +0000 Subject: [PATCH] In radeon_device_init, use ddev->dev, not &pdev->dev, for rdev->dev. ddev->dev is the actual device_t, and we need it for firmware load. &pdev->dev is a dummy structure that serves no purpose except some kludge in our Linux PCI compatibility crap. In Linux the two should be the same, so no need to #ifdef __NetBSD__ this. --- sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c b/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c index 11ed84bb342c..4f230a532569 100644 --- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c +++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c @@ -1250,7 +1250,7 @@ int radeon_device_init(struct radeon_device *rdev, #endif rdev->shutdown = false; - rdev->dev = &pdev->dev; + rdev->dev = ddev->dev; rdev->ddev = ddev; rdev->pdev = pdev; rdev->flags = flags;