Skip to content

Commit 239f772

Browse files
jannaumarcan
authored andcommitted
drm/apple: Use drm_module_platform_driver
This check for the "nomodeset" kernel command line parameter in its register method. Signed-off-by: Janne Grunau <j@jannau.net>
1 parent f5f7937 commit 239f772

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

drivers/gpu/drm/apple/apple_drv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <drm/drm_simple_kms_helper.h>
2727
#include <drm/drm_mode.h>
2828
#include <drm/drm_modeset_helper.h>
29+
#include <drm/drm_module.h>
2930
#include <drm/drm_of.h>
3031
#include <drm/drm_probe_helper.h>
3132
#include <drm/drm_vblank.h>
@@ -535,7 +536,7 @@ static struct platform_driver apple_platform_driver = {
535536
.remove = apple_platform_remove,
536537
};
537538

538-
module_platform_driver(apple_platform_driver);
539+
drm_module_platform_driver(apple_platform_driver);
539540

540541
MODULE_AUTHOR("Alyssa Rosenzweig <alyssa@rosenzweig.io>");
541542
MODULE_DESCRIPTION(DRIVER_DESC);

drivers/gpu/drm/apple/dcp.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <drm/drm_fb_dma_helper.h>
2222
#include <drm/drm_fourcc.h>
2323
#include <drm/drm_framebuffer.h>
24+
#include <drm/drm_module.h>
2425
#include <drm/drm_probe_helper.h>
2526
#include <drm/drm_vblank.h>
2627

@@ -538,7 +539,7 @@ static struct platform_driver apple_platform_driver = {
538539
},
539540
};
540541

541-
module_platform_driver(apple_platform_driver);
542+
drm_module_platform_driver(apple_platform_driver);
542543

543544
MODULE_AUTHOR("Alyssa Rosenzweig <alyssa@rosenzweig.io>");
544545
MODULE_DESCRIPTION("Apple Display Controller DRM driver");

drivers/gpu/drm/apple/dummy-piodma.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// SPDX-License-Identifier: GPL-2.0-only OR MIT
22
/* Copyright 2021 Alyssa Rosenzweig <alyssa@rosenzweig.io> */
33

4+
#include <drm/drm_module.h>
5+
46
#include <linux/module.h>
57
#include <linux/dma-mapping.h>
68
#include <linux/of_device.h>
@@ -24,7 +26,7 @@ static struct platform_driver dcp_piodma_platform_driver = {
2426
},
2527
};
2628

27-
module_platform_driver(dcp_piodma_platform_driver);
29+
drm_module_platform_driver(dcp_piodma_platform_driver);
2830

2931
MODULE_AUTHOR("Alyssa Rosenzweig <alyssa@rosenzweig.io>");
3032
MODULE_DESCRIPTION("[HACK] Apple DCP PIODMA shim");

0 commit comments

Comments
 (0)