summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorMaarten Maathuis <madman2003@gmail.com>2008-07-02 16:13:54 +0200
committerMaarten Maathuis <madman2003@gmail.com>2008-07-02 16:14:48 +0200
commitf1fe9178f1a2aef272c7feeb15c8de42c8c609d5 (patch)
tree515703f927e30626f7f4eedd026a2e8818ba6e97 /shared-core
parentb28d309210475b6f671af7617c779bd1d7a6810a (diff)
NV50: basic fbcon + misc fixes
- There is one fb, used for as many outputs as possible. - Eventually smaller screens will be scaled to see the full console, but for the moment this'll do.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/nouveau_state.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/shared-core/nouveau_state.c b/shared-core/nouveau_state.c
index 9f8fc43d..3baae6ad 100644
--- a/shared-core/nouveau_state.c
+++ b/shared-core/nouveau_state.c
@@ -28,6 +28,7 @@
#include "nouveau_drv.h"
#include "nouveau_drm.h"
#include "nv50_kms_wrapper.h"
+#include "nv50_fbcon.h"
static int nouveau_init_card_mappings(struct drm_device *dev)
{
@@ -367,7 +368,8 @@ nouveau_card_init(struct drm_device *dev)
if (drm_core_check_feature(dev, DRIVER_MODESET))
if (dev_priv->card_type >= NV_50) {
nv50_kms_init(dev);
- nv50_kms_connector_detect_all(dev);
+ //nv50_kms_connector_detect_all(dev);
+ nv50_fbcon_init(dev);
}
return 0;
@@ -615,6 +617,7 @@ int nouveau_unload(struct drm_device *dev)
{
if (drm_core_check_feature(dev, DRIVER_MODESET)) {
nv50_kms_destroy(dev);
+ nv50_fbcon_destroy(dev);
nouveau_close(dev);
}