Merge tag 'drm/tegra/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux into...

drm/tegra: Changes for v3.15-rc1

Implement eDP support for Tegra124 and support the PRIME vmap()/vunmap()
operations.

A symbol that is required for upcoming V4L2 support is now exported by
the host1x driver.

Relicense drivers under the GPL v2 for consistency. One exception is the
public header file, which is relicensed under MIT to abide by the common
rule.

* tag 'drm/tegra/for-3.15-rc1' of git://anongit.freedesktop.org/tegra/linux:
  drm/tegra: Use standard GPL v2 license text
  drm/tegra: Relicense under GPL v2
  drm/tegra: Relicense public header under MIT
  drm/tegra: Add eDP support
  gpu: host1x: export host1x_syncpt_incr_max() function
  drm/tegra: prime: Add vmap support

diff --combined drivers/gpu/drm/tegra/drm.c
index c71594754f46fa18810d5b654d2c2d31288f6c3a,4c583d58334ac0b69c46b26d5ba7ad93bd6774c2..6f5b6e2f552e3798c6dc30e582ee804f9dffbee4
--- 1/drivers/gpu/drm/tegra/drm.c
--- 2/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@@ -104,7 -104,7 +104,7 @@@ static void tegra_drm_context_free(stru
  
  static void tegra_drm_lastclose(struct drm_device *drm)
  {
 -#ifdef CONFIG_TEGRA_DRM_FBDEV
 +#ifdef CONFIG_DRM_TEGRA_FBDEV
        struct tegra_drm *tegra = drm->dev_private;
  
        tegra_fbdev_restore_mode(tegra->fbdev);
@@@ -665,6 -665,7 +665,7 @@@ static const struct of_device_id host1x
        { .compatible = "nvidia,tegra114-hdmi", },
        { .compatible = "nvidia,tegra114-gr3d", },
        { .compatible = "nvidia,tegra124-dc", },
+       { .compatible = "nvidia,tegra124-sor", },
        { /* sentinel */ }
  };
  
@@@ -691,14 -692,22 +692,22 @@@ static int __init host1x_drm_init(void
        if (err < 0)
                goto unregister_dc;
  
-       err = platform_driver_register(&tegra_hdmi_driver);
+       err = platform_driver_register(&tegra_sor_driver);
        if (err < 0)
                goto unregister_dsi;
  
-       err = platform_driver_register(&tegra_gr2d_driver);
+       err = platform_driver_register(&tegra_hdmi_driver);
+       if (err < 0)
+               goto unregister_sor;
+ 
+       err = platform_driver_register(&tegra_dpaux_driver);
        if (err < 0)
                goto unregister_hdmi;
  
+       err = platform_driver_register(&tegra_gr2d_driver);
+       if (err < 0)
+               goto unregister_dpaux;
+ 
        err = platform_driver_register(&tegra_gr3d_driver);
        if (err < 0)
                goto unregister_gr2d;
@@@ -707,8 -716,12 +716,12 @@@
  
  unregister_gr2d:
        platform_driver_unregister(&tegra_gr2d_driver);
+ unregister_dpaux:
+       platform_driver_unregister(&tegra_dpaux_driver);
  unregister_hdmi:
        platform_driver_unregister(&tegra_hdmi_driver);
+ unregister_sor:
+       platform_driver_unregister(&tegra_sor_driver);
  unregister_dsi:
        platform_driver_unregister(&tegra_dsi_driver);
  unregister_dc:
@@@ -723,7 -736,9 +736,9 @@@ static void __exit host1x_drm_exit(void
  {
        platform_driver_unregister(&tegra_gr3d_driver);
        platform_driver_unregister(&tegra_gr2d_driver);
+       platform_driver_unregister(&tegra_dpaux_driver);
        platform_driver_unregister(&tegra_hdmi_driver);
+       platform_driver_unregister(&tegra_sor_driver);
        platform_driver_unregister(&tegra_dsi_driver);
        platform_driver_unregister(&tegra_dc_driver);
        host1x_driver_unregister(&host1x_drm_driver);