Muppetry and comments, and other small things

Signed-off-by: Thomas White <taw@bitwiz.org.uk>

3 files changed, 12 insertions, 7 deletions

diff --git a/drivers/mfd/glamo/glamo-buffer.c b/drivers/mfd/glamo/glamo-buffer.c
index 9f19c454477..c8172cce503 100644
--- a/drivers/mfd/glamo/glamo-buffer.c
+++ b/drivers/mfd/glamo/glamo-buffer.c
@@ -41,6 +41,7 @@ struct drm_gem_object *glamo_gem_object_alloc(struct drm_device *dev, int size,
 	obj = drm_gem_object_alloc(dev, size);
 	if (obj == NULL) return NULL;
 
+	/* See glamodrm_gem_init_object() below */
 	gobj = obj->driver_private;
 
 	/* Allocate memory for this object in VRAM */
diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
index bcea62b2ed5..67d9d011ba0 100644
--- a/drivers/mfd/glamo/glamo-display.c
+++ b/drivers/mfd/glamo/glamo-display.c
@@ -586,6 +586,10 @@ int glamo_display_init(struct drm_device *dev)
 	glamo_crtc->blank_mode = DRM_MODE_DPMS_OFF;
 	drm_crtc_init(dev, &glamo_crtc->base, &glamo_crtc_funcs);
 	drm_crtc_helper_add(&glamo_crtc->base, &glamo_crtc_helper_funcs);
+	
+	glamo_crtc->mode_set.crtc = &glamo_crtc->base;
+	glamo_crtc->mode_set.connectors = (struct drm_connector **)(glamo_crtc + 1);
+	glamo_crtc->mode_set.num_connectors = 0;
 
 	/* Create our "output" object: consists of an output and an encoder */
 	glamo_output = kzalloc(sizeof(struct glamo_output), GFP_KERNEL);
@@ -625,16 +629,15 @@ int glamo_display_init(struct drm_device *dev)
 
 	modeset = &glamo_crtc->mode_set;
 	modeset->fb = &glamo_fb->base;
-//	modeset->connectors[0] = connector;
+	modeset->connectors[0] = connector;
 	
 	//par->crtc_ids[0] = glamo_crtc->base.id;
 
 	modeset->num_connectors = 1;
-//	modeset->mode = modeset->crtc->desired_mode;
+	modeset->mode = modeset->crtc->desired_mode;
 
 	par->crtc_count = 1;
 
-	info->var.pixclock = -1;
 	if (register_framebuffer(info) < 0)
 		return -EINVAL;
 
diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c
index 7523af3b54a..2ae361c5604 100644
--- a/drivers/mfd/glamo/glamo-kms-fb.c
+++ b/drivers/mfd/glamo/glamo-kms-fb.c
@@ -388,7 +388,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
 	mode_cmd.width = surface_width;
 	mode_cmd.height = surface_height;
 
-	mode_cmd.bpp = 2;
+	mode_cmd.bpp = 16;
 	mode_cmd.pitch = ALIGN(mode_cmd.width * ((mode_cmd.bpp + 1) / 8), 64);
 	mode_cmd.depth = 16;
 
@@ -430,7 +430,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
 	info->fix.xpanstep = 1; /* doing it in hw */
 	info->fix.ypanstep = 1; /* doing it in hw */
 	info->fix.ywrapstep = 0;
-	info->fix.accel = FB_ACCEL_I830;
+	info->fix.accel = FB_ACCEL_GLAMO;
 	info->fix.type_aux = 0;
 	info->flags = FBINFO_DEFAULT;
 
@@ -511,15 +511,16 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
 	default:
 		/* The Smedia Glamo doesn't support anything but 16bit color */
 		printk(KERN_ERR
-		       "Smedia driver does not [yet?] support 24/32bpp\n");
+		       "Glamo driver does not [yet?] support 24/32bpp\n");
 		return -EINVAL;
 	}
 
 	fb->fbdev = info;
 	par->glamo_fb = glamo_fb;
 	par->dev = dev;
+	
+	info->var.pixclock = -1;
 
-	/* To allow resizeing without swapping buffers */
 	printk("allocated %dx%d fb: bo %p\n", glamo_fb->base.width,
 	       glamo_fb->base.height, fbo);
 	mutex_unlock(&dev->struct_mutex);