Re: [git pull] drm - fixes + radeon KMS (part 2)
From: Ryan Hope
Date: Tue Jun 16 2009 - 11:53:56 EST
Dave, you mentioned that you were going to pull in the TTM Kconfig fix
that I submitted (the one that allows TTM to be built into the kernel
instead of just a module). What are you going to do about the hardlock
that occurs when drm/radeon/fbcon are all built into the kernel. It
seems like fbcon does not get initialized before radeon and as a
result, there is a hardlock. My fix was to init radeon later which
works fine for me. Maybe it would be better to init fbcon earlier if
possible? Either way, I am not sure if you missed that patch so I am
going to resubmit it here as a reminder that this bug exists if you
build everything into the kernel..
diff --git a/85adafcf5d18e58c60d9fdbb718abe9149661736:drivers/gpu/drm/radeon/radeon_drv.c
b/093f1cb1a1850951f86244ada018672885ec4ace:drivers/gpu/drm/radeon/radeon_drv.c
index f70c351bb43e5770b9d18f76ad2a6fc1a2c7d1d4..ff4e052f997deaaa87081069d17d2026d925eabb
100644
--- a/85adafcf5d18e58c60d9fdbb718abe9149661736:drivers/gpu/drm/radeon/radeon_drv.c
+++ b/093f1cb1a1850951f86244ada018672885ec4ace:drivers/gpu/drm/radeon/radeon_drv.c
@@ -345,7 +345,11 @@ static void __exit radeon_exit(void)
drm_exit(driver);
}
+#ifdef MODULE
module_init(radeon_init);
+#else
+late_initcall(radeon_init);
+#endif
module_exit(radeon_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
On Sun, Jun 14, 2009 at 10:43 PM, Dave Airlie<airlied@xxxxxxxxx> wrote:
> On Mon, Jun 15, 2009 at 12:22 PM, Greg KH<greg@xxxxxxxxx> wrote:
>> On Mon, Jun 15, 2009 at 03:08:56AM +0100, Dave Airlie wrote:
>>>
>>> Hi Linus,
>>>
>>> Please pull the 'drm-linus' branch from
>>> ssh://master.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git drm-linus
>>>
>>> This is big. It contains the initial TTM memory manager + ATI radeon KMS
>>> support. Currently the KMS code is part of the DRM radeon driver however
>>> it is very clearly separated internally from the old codepaths. We've
>>> elected to keep the radeon KMS Kconfig build/enable under staging for now
>>> since we may have some ABI tweaks to sort out in this release cycle,
>>> however the code is all in the drm. I don't think this enables crap
>>> tainting, but at least no-one will find kms by accident.
>>
>> No, the module loader looks for stuff in drivers/staging/ to cause a
>> "taint".
>>
>> But why not just keep the Kconfig stuff in your own directory, and
>> depend on CONFIG_STAGING if you want to not have it show up for "normal"
>> users? ÂIt seems odd to put anything in drivers/staging/Kconfig for
>> something that is not in drivers/staging.
>>
>> I'm guessing this Kconfig change was not in linux-next? ÂOr had it been
>> there and I just missed it somehow?
>>
>
> No since I was on holidays until the just before the merge window
> opened, the patches
> did get posted to lkml but missed your cc.
>
> Well we'd like to make sure people go via the staging menus to get at
> the kconfig option
> for now, granted it probably doesn't matter whether it goes in staging
> menus or in drm depends
> on CONFIG_STAGING. Up to you I can post a patch after this merge to
> move it to drm.
>
> Since its only temporary I'm not hugely pushed about taint.
>
> Dave.
>
> ------------------------------------------------------------------------------
> Crystal Reports - New Free Runtime and 30 Day Trial
> Check out the new simplified licensing option that enables unlimited
> royalty-free distribution of the report engine for externally facing
> server and web deployment.
> http://p.sf.net/sfu/businessobjects
> --
> _______________________________________________
> Dri-devel mailing list
> Dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.sourceforge.net/lists/listinfo/dri-devel
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/