aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/mfd/glamo/glamo-display.c4
-rw-r--r--drivers/mfd/glamo/glamo-kms-fb.c13
2 files changed, 8 insertions, 9 deletions
diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
index 706c6293903..4a39534dfdf 100644
--- a/drivers/mfd/glamo/glamo-display.c
+++ b/drivers/mfd/glamo/glamo-display.c
@@ -104,7 +104,7 @@ static void reg_write_lcd(struct glamodrm_handle *gdrm,
for (i = 0; i != 2; i++)
nop();
-
+
iowrite16(val, gdrm->lcd_base + reg);
}
@@ -458,7 +458,7 @@ static int glamo_connector_get_modes(struct drm_connector *connector)
mode->hsync_end = mode->hsync_start + mach_info->hsync_len;
mode->htotal = mode->hsync_end + mach_info->left_margin;
mode->hskew = 0;
-
+
mode->vdisplay = mach_info->yres.defval;
mode->vsync_start = mach_info->lower_margin + mode->vdisplay;
mode->vsync_end = mode->vsync_start + mach_info->vsync_len;
diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c
index 43adaed1ea9..0c828831bb0 100644
--- a/drivers/mfd/glamo/glamo-kms-fb.c
+++ b/drivers/mfd/glamo/glamo-kms-fb.c
@@ -387,9 +387,9 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
struct device *device = &dev->platform_dev->dev;
struct glamodrm_handle *gdrm;
int size, ret;
-
+
gdrm = dev->dev_private;
-
+
mode_cmd.width = surface_width;
mode_cmd.height = surface_height;
@@ -406,7 +406,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
goto out;
}
obj_priv = fbo->driver_private;
-
+
mutex_lock(&dev->struct_mutex);
ret = glamo_framebuffer_create(dev, &mode_cmd, &fb, fbo);
@@ -414,7 +414,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
DRM_ERROR("failed to allocate fb.\n");
goto out_unref;
}
-
+
list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list);
glamo_fb = to_glamo_framebuffer(fb);
@@ -425,7 +425,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
ret = -ENOMEM;
goto out_unref;
}
-
+
par = info->par;
strcpy(info->fix.id, "glamodrmfb");
@@ -522,7 +522,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width,
fb->fbdev = info;
par->glamo_fb = glamo_fb;
par->dev = dev;
-
+
info->var.pixclock = -1;
printk(KERN_INFO "[glamo-drm] Allocated %dx%d fb: bo %p\n",
@@ -536,4 +536,3 @@ out_unref:
out:
return ret;
}
-