diff options
Diffstat (limited to 'drivers/gpu/drm/tegra/drm.c')
-rw-r--r-- | drivers/gpu/drm/tegra/drm.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index 88a529008ce0..4c583d58334a 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c | |||
@@ -665,6 +665,7 @@ static const struct of_device_id host1x_drm_subdevs[] = { | |||
665 | { .compatible = "nvidia,tegra114-hdmi", }, | 665 | { .compatible = "nvidia,tegra114-hdmi", }, |
666 | { .compatible = "nvidia,tegra114-gr3d", }, | 666 | { .compatible = "nvidia,tegra114-gr3d", }, |
667 | { .compatible = "nvidia,tegra124-dc", }, | 667 | { .compatible = "nvidia,tegra124-dc", }, |
668 | { .compatible = "nvidia,tegra124-sor", }, | ||
668 | { /* sentinel */ } | 669 | { /* sentinel */ } |
669 | }; | 670 | }; |
670 | 671 | ||
@@ -691,14 +692,22 @@ static int __init host1x_drm_init(void) | |||
691 | if (err < 0) | 692 | if (err < 0) |
692 | goto unregister_dc; | 693 | goto unregister_dc; |
693 | 694 | ||
694 | err = platform_driver_register(&tegra_hdmi_driver); | 695 | err = platform_driver_register(&tegra_sor_driver); |
695 | if (err < 0) | 696 | if (err < 0) |
696 | goto unregister_dsi; | 697 | goto unregister_dsi; |
697 | 698 | ||
698 | err = platform_driver_register(&tegra_gr2d_driver); | 699 | err = platform_driver_register(&tegra_hdmi_driver); |
700 | if (err < 0) | ||
701 | goto unregister_sor; | ||
702 | |||
703 | err = platform_driver_register(&tegra_dpaux_driver); | ||
699 | if (err < 0) | 704 | if (err < 0) |
700 | goto unregister_hdmi; | 705 | goto unregister_hdmi; |
701 | 706 | ||
707 | err = platform_driver_register(&tegra_gr2d_driver); | ||
708 | if (err < 0) | ||
709 | goto unregister_dpaux; | ||
710 | |||
702 | err = platform_driver_register(&tegra_gr3d_driver); | 711 | err = platform_driver_register(&tegra_gr3d_driver); |
703 | if (err < 0) | 712 | if (err < 0) |
704 | goto unregister_gr2d; | 713 | goto unregister_gr2d; |
@@ -707,8 +716,12 @@ static int __init host1x_drm_init(void) | |||
707 | 716 | ||
708 | unregister_gr2d: | 717 | unregister_gr2d: |
709 | platform_driver_unregister(&tegra_gr2d_driver); | 718 | platform_driver_unregister(&tegra_gr2d_driver); |
719 | unregister_dpaux: | ||
720 | platform_driver_unregister(&tegra_dpaux_driver); | ||
710 | unregister_hdmi: | 721 | unregister_hdmi: |
711 | platform_driver_unregister(&tegra_hdmi_driver); | 722 | platform_driver_unregister(&tegra_hdmi_driver); |
723 | unregister_sor: | ||
724 | platform_driver_unregister(&tegra_sor_driver); | ||
712 | unregister_dsi: | 725 | unregister_dsi: |
713 | platform_driver_unregister(&tegra_dsi_driver); | 726 | platform_driver_unregister(&tegra_dsi_driver); |
714 | unregister_dc: | 727 | unregister_dc: |
@@ -723,7 +736,9 @@ static void __exit host1x_drm_exit(void) | |||
723 | { | 736 | { |
724 | platform_driver_unregister(&tegra_gr3d_driver); | 737 | platform_driver_unregister(&tegra_gr3d_driver); |
725 | platform_driver_unregister(&tegra_gr2d_driver); | 738 | platform_driver_unregister(&tegra_gr2d_driver); |
739 | platform_driver_unregister(&tegra_dpaux_driver); | ||
726 | platform_driver_unregister(&tegra_hdmi_driver); | 740 | platform_driver_unregister(&tegra_hdmi_driver); |
741 | platform_driver_unregister(&tegra_sor_driver); | ||
727 | platform_driver_unregister(&tegra_dsi_driver); | 742 | platform_driver_unregister(&tegra_dsi_driver); |
728 | platform_driver_unregister(&tegra_dc_driver); | 743 | platform_driver_unregister(&tegra_dc_driver); |
729 | host1x_driver_unregister(&host1x_drm_driver); | 744 | host1x_driver_unregister(&host1x_drm_driver); |