Module Name:    src
Committed By:   riastradh
Date:           Thu Jul 17 20:41:22 UTC 2014

Modified Files:
        src/sys/external/bsd/drm2/dist/drm/radeon: radeon_device.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.2 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c:1.2	Wed Jul 16 20:59:57 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_device.c	Thu Jul 17 20:41:22 2014
@@ -1250,7 +1250,7 @@ int radeon_device_init(struct radeon_dev
 #endif
 
 	rdev->shutdown = false;
-	rdev->dev = &pdev->dev;
+	rdev->dev = ddev->dev;
 	rdev->ddev = ddev;
 	rdev->pdev = pdev;
 	rdev->flags = flags;

Reply via email to