No need to use a temporary pointer variable after the drm struct name

in the softc changed a while back.

3 files changed, 17 insertions, 21 deletions

diff --git a/sys/dev/pci/drm/radeon/evergreen.c b/sys/dev/pci/drm/radeon/evergreen.c
index f10f29640fd..92678cf0e4b 100644
--- a/sys/dev/pci/drm/radeon/evergreen.c
+++ b/sys/dev/pci/drm/radeon/evergreen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: evergreen.c,v 1.16 2015/04/06 05:35:29 jsg Exp $	*/
+/*	$OpenBSD: evergreen.c,v 1.17 2015/04/06 06:12:25 jsg Exp $	*/
 /*
  * Copyright 2010 Advanced Micro Devices, Inc.
  *
@@ -3032,7 +3032,6 @@ static u32 evergreen_get_ih_wptr(struct radeon_device *rdev)
 
 int evergreen_irq_process(struct radeon_device *rdev)
 {
-	struct drm_device *ddev = rdev->ddev;
 	u32 wptr;
 	u32 rptr;
 	u32 src_id, src_data;
@@ -3073,7 +3072,7 @@ restart_ih:
 			case 0: /* D1 vblank */
 				if (rdev->irq.stat_regs.evergreen.disp_int & LB_D1_VBLANK_INTERRUPT) {
 					if (rdev->irq.crtc_vblank_int[0]) {
-						drm_handle_vblank(ddev, 0);
+						drm_handle_vblank(rdev->ddev, 0);
 						rdev->pm.vblank_sync = true;
 						wake_up(&rdev->irq.vblank_queue);
 					}
@@ -3099,7 +3098,7 @@ restart_ih:
 			case 0: /* D2 vblank */
 				if (rdev->irq.stat_regs.evergreen.disp_int_cont & LB_D2_VBLANK_INTERRUPT) {
 					if (rdev->irq.crtc_vblank_int[1]) {
-						drm_handle_vblank(ddev, 1);
+						drm_handle_vblank(rdev->ddev, 1);
 						rdev->pm.vblank_sync = true;
 						wake_up(&rdev->irq.vblank_queue);
 					}
@@ -3125,7 +3124,7 @@ restart_ih:
 			case 0: /* D3 vblank */
 				if (rdev->irq.stat_regs.evergreen.disp_int_cont2 & LB_D3_VBLANK_INTERRUPT) {
 					if (rdev->irq.crtc_vblank_int[2]) {
-						drm_handle_vblank(ddev, 2);
+						drm_handle_vblank(rdev->ddev, 2);
 						rdev->pm.vblank_sync = true;
 						wake_up(&rdev->irq.vblank_queue);
 					}
@@ -3151,7 +3150,7 @@ restart_ih:
 			case 0: /* D4 vblank */
 				if (rdev->irq.stat_regs.evergreen.disp_int_cont3 & LB_D4_VBLANK_INTERRUPT) {
 					if (rdev->irq.crtc_vblank_int[3]) {
-						drm_handle_vblank(ddev, 3);
+						drm_handle_vblank(rdev->ddev, 3);
 						rdev->pm.vblank_sync = true;
 						wake_up(&rdev->irq.vblank_queue);
 					}
@@ -3177,7 +3176,7 @@ restart_ih:
 			case 0: /* D5 vblank */
 				if (rdev->irq.stat_regs.evergreen.disp_int_cont4 & LB_D5_VBLANK_INTERRUPT) {
 					if (rdev->irq.crtc_vblank_int[4]) {
-						drm_handle_vblank(ddev, 4);
+						drm_handle_vblank(rdev->ddev, 4);
 						rdev->pm.vblank_sync = true;
 						wake_up(&rdev->irq.vblank_queue);
 					}
@@ -3203,7 +3202,7 @@ restart_ih:
 			case 0: /* D6 vblank */
 				if (rdev->irq.stat_regs.evergreen.disp_int_cont5 & LB_D6_VBLANK_INTERRUPT) {
 					if (rdev->irq.crtc_vblank_int[5]) {
-						drm_handle_vblank(ddev, 5);
+						drm_handle_vblank(rdev->ddev, 5);
 						rdev->pm.vblank_sync = true;
 						wake_up(&rdev->irq.vblank_queue);
 					}
@@ -3701,7 +3700,6 @@ int evergreen_suspend(struct radeon_device *rdev)
  */
 int evergreen_init(struct radeon_device *rdev)
 {
-	struct drm_device *ddev = rdev->ddev;
 	int r;
 
 	/* Read BIOS */
@@ -3736,7 +3734,7 @@ int evergreen_init(struct radeon_device *rdev)
 	/* Initialize surface registers */
 	radeon_surface_init(rdev);
 	/* Initialize clocks */
-	radeon_get_clock_info(ddev);
+	radeon_get_clock_info(rdev->ddev);
 	/* Fence driver */
 	r = radeon_fence_driver_init(rdev);
 	if (r)
diff --git a/sys/dev/pci/drm/radeon/radeon_agp.c b/sys/dev/pci/drm/radeon/radeon_agp.c
index 27d980c35d0..86c737f2780 100644
--- a/sys/dev/pci/drm/radeon/radeon_agp.c
+++ b/sys/dev/pci/drm/radeon/radeon_agp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radeon_agp.c,v 1.3 2015/02/11 07:01:37 jsg Exp $	*/
+/*	$OpenBSD: radeon_agp.c,v 1.4 2015/04/06 06:12:25 jsg Exp $	*/
 /*
  * Copyright 2008 Red Hat Inc.
  * Copyright 2009 Jerome Glisse.
@@ -129,7 +129,6 @@ int radeon_agp_init(struct radeon_device *rdev)
 {
 #if __OS_HAS_AGP
 	struct radeon_agpmode_quirk *p = radeon_agpmode_quirk_list;
-	struct drm_device *ddev = rdev->ddev;
 	struct drm_agp_mode mode;
 	struct drm_agp_info info;
 	paddr_t start, end;
@@ -152,11 +151,11 @@ int radeon_agp_init(struct radeon_device *rdev)
 		return ret;
 	}
 
-	if ((ddev->agp->info.ai_aperture_size >> 20) < 32) {
+	if ((rdev->ddev->agp->info.ai_aperture_size >> 20) < 32) {
 		drm_agp_release(rdev->ddev);
 		dev_warn(rdev->dev, "AGP aperture too small (%zuM) "
 			"need at least 32M, disabling AGP\n",
-			ddev->agp->info.ai_aperture_size >> 20);
+			rdev->ddev->agp->info.ai_aperture_size >> 20);
 		return -EINVAL;
 	}
 
@@ -237,15 +236,15 @@ int radeon_agp_init(struct radeon_device *rdev)
 	}
 
 	mode.mode &= ~RADEON_AGP_FW_MODE; /* disable fw */
-	ret = drm_agp_enable(ddev, mode);
+	ret = drm_agp_enable(rdev->ddev, mode);
 	if (ret) {
 		DRM_ERROR("Unable to enable AGP (mode = 0x%lx)\n", mode.mode);
-		drm_agp_release(ddev);
+		drm_agp_release(rdev->ddev);
 		return ret;
 	}
 
-	rdev->mc.agp_base = ddev->agp->info.ai_aperture_base;
-	rdev->mc.gtt_size = ddev->agp->info.ai_aperture_size;
+	rdev->mc.agp_base = rdev->ddev->agp->info.ai_aperture_base;
+	rdev->mc.gtt_size = rdev->ddev->agp->info.ai_aperture_size;
 	rdev->mc.gtt_start = rdev->mc.agp_base;
 	rdev->mc.gtt_end = rdev->mc.gtt_start + rdev->mc.gtt_size - 1;
 	dev_info(rdev->dev, "GTT: %lluM 0x%08llX - 0x%08llX\n",
diff --git a/sys/dev/pci/drm/radeon/radeon_device.c b/sys/dev/pci/drm/radeon/radeon_device.c
index 3aa93875ba1..d38a13a6de2 100644
--- a/sys/dev/pci/drm/radeon/radeon_device.c
+++ b/sys/dev/pci/drm/radeon/radeon_device.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radeon_device.c,v 1.9 2015/02/11 07:01:37 jsg Exp $	*/
+/*	$OpenBSD: radeon_device.c,v 1.10 2015/04/06 06:12:25 jsg Exp $	*/
 /*
  * Copyright 2008 Advanced Micro Devices, Inc.
  * Copyright 2008 Red Hat Inc.
@@ -1393,7 +1393,6 @@ int radeon_resume_kms(struct drm_device *dev)
  */
 int radeon_gpu_reset(struct radeon_device *rdev)
 {
-	struct drm_device *dev = rdev->ddev;
 	unsigned ring_sizes[RADEON_NUM_RINGS];
 	uint32_t *ring_data[RADEON_NUM_RINGS];
 
@@ -1451,7 +1450,7 @@ retry:
 		}
 	}
 
-	drm_helper_resume_force_mode(dev);
+	drm_helper_resume_force_mode(rdev->ddev);
 
 	ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched);
 	if (r) {