Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 176f613e authored Jun 22, 2009 by Jerome Glisse Committed by Dave Airlie Jun 24, 2009

drm/radeon: fix driver initialization order so radeon kms can be builtin



TTM need to be initialized before radeon if KMS is enabled otherwise
the kernel will crash hard.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>

parent e14cbee4

drivers/gpu/drm/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
	drm-$(CONFIG_COMPAT) += drm_ioc32.o		drm-$(CONFIG_COMPAT) += drm_ioc32.o

	obj-$(CONFIG_DRM) += drm.o		obj-$(CONFIG_DRM) += drm.o
			obj-$(CONFIG_DRM_TTM) += ttm/
	obj-$(CONFIG_DRM_TDFX) += tdfx/		obj-$(CONFIG_DRM_TDFX) += tdfx/
	obj-$(CONFIG_DRM_R128) += r128/		obj-$(CONFIG_DRM_R128) += r128/
	obj-$(CONFIG_DRM_RADEON)+= radeon/		obj-$(CONFIG_DRM_RADEON)+= radeon/
	@@ -26,4 +27,3 @@ obj-$(CONFIG_DRM_I915) += i915/
	obj-$(CONFIG_DRM_SIS) += sis/		obj-$(CONFIG_DRM_SIS) += sis/
	obj-$(CONFIG_DRM_SAVAGE)+= savage/		obj-$(CONFIG_DRM_SAVAGE)+= savage/
	obj-$(CONFIG_DRM_VIA) +=via/		obj-$(CONFIG_DRM_VIA) +=via/
	obj-$(CONFIG_DRM_TTM) += ttm/

drivers/gpu/drm/radeon/radeon_drv.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -345,7 +345,7 @@ static void __exit radeon_exit(void)
	drm_exit(driver);		drm_exit(driver);
	}		}

	late_initcall(radeon_init);		module_init(radeon_init);
	module_exit(radeon_exit);		module_exit(radeon_exit);

	MODULE_AUTHOR(DRIVER_AUTHOR);		MODULE_AUTHOR(DRIVER_AUTHOR);