Ertuğrul Erata
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
|
|
Adapt for kernel-3.17
|
|
|
|
DRM_ARRAY_SIZE is a duplicate of ARRAY_SIZE and have been dropped.
|
|
|
|
drm_dev_to_irq has been dropped, so call dev->pdev->irq directly
|
|
for code simplicity.
|
|
|
|
Signed-off-by: Thomas Backlund <tmb@mageia.org>
|
|
|
|
diff -urp linux/drivers/gpu/drm/mach64/mach64_state.c.orig linux/drivers/gpu/drm/mach64/mach64_state.c
|
|
--- linux/drivers/gpu/drm/mach64/mach64_state.c.orig
|
|
+++ linux/drivers/gpu/drm/mach64/mach64_state.c
|
|
@@ -52,7 +52,7 @@ struct drm_ioctl_desc mach64_ioctls[] =
|
|
DRM_IOCTL_DEF_DRV(MACH64_GETPARAM, mach64_get_param, DRM_AUTH),
|
|
};
|
|
|
|
-int mach64_max_ioctl = DRM_ARRAY_SIZE(mach64_ioctls);
|
|
+int mach64_max_ioctl = ARRAY_SIZE(mach64_ioctls);
|
|
|
|
/* ================================================================
|
|
* DMA hardware state programming functions
|
|
@@ -895,7 +895,7 @@ int mach64_get_param(struct drm_device *
|
|
value = mach64_do_get_frames_queued(dev_priv);
|
|
break;
|
|
case MACH64_PARAM_IRQ_NR:
|
|
- value = drm_dev_to_irq(dev);
|
|
+ value = dev->pdev->irq;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|