From 740d8196e83bd7eaccf2f3575019a7bd96444c1d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 27 May 2009 22:14:11 +0100 Subject: Initial KMS stuff --- drivers/mfd/glamo/glamo-display.c | 144 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 drivers/mfd/glamo/glamo-display.c (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c new file mode 100644 index 00000000000..b129b8da455 --- /dev/null +++ b/drivers/mfd/glamo/glamo-display.c @@ -0,0 +1,144 @@ +/* + * SMedia Glamo 336x/337x display + * + * Copyright (C) 2008-2009 Thomas White + * + * All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + */ + + +#include +#include +#include +#include + +#include "glamo-core.h" +#include "glamo-drm-private.h" +#include "glamo-regs.h" + + +static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) +{ +} + + +static bool glamo_crtc_mode_fixup(struct drm_crtc *crtc, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ + return true; +} + + +static void glamo_crtc_mode_set(struct drm_crtc *crtc, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode, + int x, int y, + struct drm_framebuffer *old_fb) +{ +} + + + +static void glamo_pipe_set_base(struct drm_crtc *crtc, int x, int y, + struct drm_framebuffer *old_fb) +{ +} + + +static void glamo_crtc_prepare(struct drm_crtc *crtc) +{ + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF); +} + + +static void glamo_crtc_commit(struct drm_crtc *crtc) +{ + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON); +} + + +static int glamo_crtc_cursor_set(struct drm_crtc *crtc, + struct drm_file *file_priv, + uint32_t handle, + uint32_t width, uint32_t height) +{ + return 0; +} + + +static int glamo_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) +{ + return 0; +} + + +static void glamo_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, + u16 *blue, uint32_t size) +{ +} + + +static void glamo_crtc_destroy(struct drm_crtc *crtc) +{ + struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc); + + drm_crtc_cleanup(crtc); + kfree(glamo_crtc); +} + + +static const struct drm_crtc_helper_funcs glamo_helper_funcs = { + .dpms = glamo_crtc_dpms, + .mode_fixup = glamo_crtc_mode_fixup, + .mode_set = glamo_crtc_mode_set, + .mode_set_base = glamo_pipe_set_base, + .prepare = glamo_crtc_prepare, + .commit = glamo_crtc_commit, +}; + + +static const struct drm_crtc_funcs glamo_crtc_funcs = { + .cursor_set = glamo_crtc_cursor_set, + .cursor_move = glamo_crtc_cursor_move, + .gamma_set = glamo_crtc_gamma_set, + .set_config = drm_crtc_helper_set_config, + .destroy = glamo_crtc_destroy, +}; + + +int glamo_display_init(struct drm_device *dev) +{ + struct glamodrm_handle *gdrm; + struct glamo_crtc *glamo_crtc; + + glamo_crtc = kzalloc(sizeof(struct glamo_crtc) + + sizeof(struct drm_connector *), GFP_KERNEL); + if (glamo_crtc == NULL) + return 1; + + gdrm = dev->dev_private; + + drm_crtc_init(dev, &glamo_crtc->base, &glamo_crtc_funcs); + drm_crtc_helper_add(&glamo_crtc->base, &glamo_helper_funcs); + + return 0; +} -- cgit v1.2.3 From fc1aa2d81852798ea8772705cafec88405d3b4f7 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 3 Jun 2009 00:42:45 +0100 Subject: KMS Skeleton Bits This adds more of the bare bones for KMS, to be fleshed out later. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 199 +++++++++++++++++++++++++++++++++++--- 1 file changed, 186 insertions(+), 13 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index b129b8da455..e0c654f2386 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -20,6 +20,34 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * + * + * Based on intel_display.c and intel_crt.c from drivers/gpu/drm/i915 + * to which the following licence applies: + * + * Copyright © 2006-2007 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * Eric Anholt + * */ @@ -106,7 +134,106 @@ static void glamo_crtc_destroy(struct drm_crtc *crtc) } -static const struct drm_crtc_helper_funcs glamo_helper_funcs = { +static enum drm_connector_status +glamo_connector_detect(struct drm_connector *connector) +{ + /* One hopes it hasn't been de-soldered... */ + return connector_status_connected; +} + + +static void glamo_connector_destroy(struct drm_connector *connector) +{ + drm_sysfs_connector_remove(connector); + drm_connector_cleanup(connector); + kfree(connector); +} + + +static int glamo_connector_get_modes(struct drm_connector *connector) +{ + return false; +} + + +static int glamo_connector_set_property(struct drm_connector *connector, + struct drm_property *property, + uint64_t value) +{ + return 0; +} + + +static int glamo_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) +{ + if (mode->flags & DRM_MODE_FLAG_DBLSCAN) + return MODE_NO_DBLESCAN; + + if (mode->clock > 400000 || mode->clock < 25000) + return MODE_CLOCK_RANGE; + + return MODE_OK; +} + + +struct drm_encoder * +glamo_connector_best_encoder(struct drm_connector *connector) +{ + struct glamo_output *glamo_output = to_glamo_output(connector); + + return &glamo_output->enc; +} + + +static void glamo_encoder_dpms(struct drm_encoder *encoder, int mode) +{ +} + + +static bool glamo_encoder_mode_fixup(struct drm_encoder *encoder, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ + return true; +} + + +void glamo_encoder_prepare(struct drm_encoder *encoder) +{ +} + + +void glamo_encoder_commit(struct drm_encoder *encoder) +{ +} + + +static void glamo_encoder_mode_set(struct drm_encoder *encoder, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ +} + + +static void glamo_encoder_destroy(struct drm_encoder *encoder) +{ + drm_encoder_cleanup(encoder); +} + + +/* CRTC functions */ +static const struct drm_crtc_funcs glamo_crtc_funcs = { + .cursor_set = glamo_crtc_cursor_set, + .cursor_move = glamo_crtc_cursor_move, + .gamma_set = glamo_crtc_gamma_set, + .set_config = drm_crtc_helper_set_config, + .destroy = glamo_crtc_destroy, +}; + + +/* CRTC helper functions */ +static const struct drm_crtc_helper_funcs glamo_crtc_helper_funcs = { .dpms = glamo_crtc_dpms, .mode_fixup = glamo_crtc_mode_fixup, .mode_set = glamo_crtc_mode_set, @@ -116,12 +243,36 @@ static const struct drm_crtc_helper_funcs glamo_helper_funcs = { }; -static const struct drm_crtc_funcs glamo_crtc_funcs = { - .cursor_set = glamo_crtc_cursor_set, - .cursor_move = glamo_crtc_cursor_move, - .gamma_set = glamo_crtc_gamma_set, - .set_config = drm_crtc_helper_set_config, - .destroy = glamo_crtc_destroy, +/* Connector functions */ +static const struct drm_connector_funcs glamo_connector_funcs = { + .detect = glamo_connector_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = glamo_connector_destroy, + .set_property = glamo_connector_set_property, +}; + + +/* Connector helper functions */ +static const struct drm_connector_helper_funcs glamo_connector_helper_funcs = { + .mode_valid = glamo_connector_mode_valid, + .get_modes = glamo_connector_get_modes, + .best_encoder = glamo_connector_best_encoder, +}; + + +/* Encoder functions */ +static const struct drm_encoder_funcs glamo_encoder_funcs = { + .destroy = glamo_encoder_destroy, +}; + + +/* Encoder helper functions */ +static const struct drm_encoder_helper_funcs glamo_encoder_helper_funcs = { + .dpms = glamo_encoder_dpms, + .mode_fixup = glamo_encoder_mode_fixup, + .prepare = glamo_encoder_prepare, + .commit = glamo_encoder_commit, + .mode_set = glamo_encoder_mode_set, }; @@ -129,16 +280,38 @@ int glamo_display_init(struct drm_device *dev) { struct glamodrm_handle *gdrm; struct glamo_crtc *glamo_crtc; - - glamo_crtc = kzalloc(sizeof(struct glamo_crtc) - + sizeof(struct drm_connector *), GFP_KERNEL); - if (glamo_crtc == NULL) - return 1; + struct glamo_output *glamo_output; + struct drm_connector *connector; gdrm = dev->dev_private; + /* Initialise our CRTC object */ + glamo_crtc = kzalloc(sizeof(struct glamo_crtc) + + sizeof(struct drm_connector *), GFP_KERNEL); + if (glamo_crtc == NULL) return 1; drm_crtc_init(dev, &glamo_crtc->base, &glamo_crtc_funcs); - drm_crtc_helper_add(&glamo_crtc->base, &glamo_helper_funcs); + drm_crtc_helper_add(&glamo_crtc->base, &glamo_crtc_helper_funcs); + + /* Create our "output" object: consists of an output and an encoder */ + glamo_output = kzalloc(sizeof(struct glamo_output), GFP_KERNEL); + if (glamo_output == NULL) return 1; + connector = &glamo_output->base; + + /* Initialise the connector */ + drm_connector_init(dev, &glamo_output->base, &glamo_connector_funcs, + DRM_MODE_CONNECTOR_Unknown); + drm_sysfs_connector_add(connector); + connector->interlace_allowed = 0; + connector->doublescan_allowed = 0; + + /* Initialise the encoder */ + drm_encoder_init(dev, &glamo_output->enc, &glamo_encoder_funcs, + DRM_MODE_ENCODER_DAC); + drm_mode_connector_attach_encoder(&glamo_output->base, + &glamo_output->enc); + + drm_encoder_helper_add(&glamo_output->enc, &glamo_encoder_helper_funcs); + drm_connector_helper_add(connector, &glamo_connector_helper_funcs); return 0; } -- cgit v1.2.3 From a65c9e7b43b33537255f934a377920f4fb47b8ed Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 8 Jun 2009 20:21:01 +0100 Subject: Just backing up progress Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 151 +++++++++++++++++++++++++++++++++++++- 1 file changed, 148 insertions(+), 3 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index e0c654f2386..afa4c11bad1 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -3,6 +3,8 @@ * * Copyright (C) 2008-2009 Thomas White * + * Based on glamo-fb.c (C) 2007-2008 by Openmoko, Inc. + * Author: Harald Welte * All rights reserved. * * This program is free software; you can redistribute it and/or @@ -61,8 +63,48 @@ #include "glamo-regs.h" +static void notify_blank(struct drm_crtc *crtc, int mode) +{ + struct fb_event event; + + event.info = info; + event.data = &blank_mode; + fb_notifier_call_chain(FB_EVENT_CONBLANK, &event); +} + + +/* Power on/off */ static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) { + dev_dbg(gfb->dev, "glamofb_blank(%u)\n", blank_mode); + + switch (mode) { + case DRM_MODE_DPMS_OFF: + /* Simulating FB_BLANK_NORMAL allow turning off backlight */ + if (gfb->blank_mode != FB_BLANK_NORMAL) + notify_blank(info, FB_BLANK_NORMAL); + + /* LCM need notification before pixel clock is stopped */ + notify_blank(crtc, blank_mode); + + /* disable the pixel clock */ + glamo_engine_clkreg_set(gcore, GLAMO_ENGINE_LCD, + GLAMO_CLOCK_LCD_EN_DCLK, 0); + gfb->blank_mode = blank_mode; + break; + case DRM_MODE_DPMS_ON: + /* enable the pixel clock if off */ + if (gfb->blank_mode == DRM_MODE_DPMS_OFF) + glamo_engine_clkreg_set(gcore, + GLAMO_ENGINE_LCD, + GLAMO_CLOCK_LCD_EN_DCLK, + GLAMO_CLOCK_LCD_EN_DCLK); + + notify_blank(info, blank_mode); + gfb->blank_mode = blank_mode; + break; + } + } @@ -84,8 +126,8 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, -static void glamo_pipe_set_base(struct drm_crtc *crtc, int x, int y, - struct drm_framebuffer *old_fb) +static void glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, + struct drm_framebuffer *old_fb) { } @@ -222,6 +264,95 @@ static void glamo_encoder_destroy(struct drm_encoder *encoder) } +static void glamo_user_framebuffer_destroy(struct drm_framebuffer *fb) +{ + struct glamo_framebuffer *glamo_fb = to_glamo_framebuffer(fb); + struct drm_device *dev = fb->dev; + + drm_framebuffer_cleanup(fb); + mutex_lock(&dev->struct_mutex); + drm_gem_object_unreference(glamo_fb->obj); + mutex_unlock(&dev->struct_mutex); + + kfree(glamo_fb); +} + +static int glamo_user_framebuffer_create_handle(struct drm_framebuffer *fb, + struct drm_file *file_priv, + unsigned int *handle) +{ + struct glamo_framebuffer *glamo_fb = to_glamo_framebuffer(fb); + struct drm_gem_object *object = glamo_fb->obj; + + return drm_gem_handle_create(file_priv, object, handle); +} + + + +static const struct drm_framebuffer_funcs glamo_fb_funcs = { + .destroy = glamo_user_framebuffer_destroy, + .create_handle = glamo_user_framebuffer_create_handle, +}; + + +int glamo_framebuffer_create(struct drm_device *dev, + struct drm_mode_fb_cmd *mode_cmd, + struct drm_framebuffer **fb, + struct drm_gem_object *obj) +{ + struct glamo_framebuffer *glamo_fb; + int ret; + + glamo_fb = kzalloc(sizeof(*glamo_fb), GFP_KERNEL); + if (!glamo_fb) + return -ENOMEM; + + ret = drm_framebuffer_init(dev, &glamo_fb->base, &glamo_fb_funcs); + if (ret) { + DRM_ERROR("framebuffer init failed %d\n", ret); + return ret; + } + + drm_helper_mode_fill_fb_struct(&glamo_fb->base, mode_cmd); + + glamo_fb->obj = obj; + + *fb = &glamo_fb->base; + + return 0; +} + + +static struct drm_framebuffer * +glamo_user_framebuffer_create(struct drm_device *dev, + struct drm_file *filp, + struct drm_mode_fb_cmd *mode_cmd) +{ + struct drm_gem_object *obj; + struct drm_framebuffer *fb; + int ret; + + obj = drm_gem_object_lookup(dev, filp, mode_cmd->handle); + if (!obj) + return NULL; + + ret = glamo_framebuffer_create(dev, mode_cmd, &fb, obj); + if (ret) { + drm_gem_object_unreference(obj); + return NULL; + } + + return fb; +} + + +int glamo_fb_changed(struct drm_device *dev) +{ + return 0; +} + + + /* CRTC functions */ static const struct drm_crtc_funcs glamo_crtc_funcs = { .cursor_set = glamo_crtc_cursor_set, @@ -237,7 +368,7 @@ static const struct drm_crtc_helper_funcs glamo_crtc_helper_funcs = { .dpms = glamo_crtc_dpms, .mode_fixup = glamo_crtc_mode_fixup, .mode_set = glamo_crtc_mode_set, - .mode_set_base = glamo_pipe_set_base, + .mode_set_base = glamo_crtc_mode_set_base, .prepare = glamo_crtc_prepare, .commit = glamo_crtc_commit, }; @@ -276,6 +407,13 @@ static const struct drm_encoder_helper_funcs glamo_encoder_helper_funcs = { }; +/* Mode functions */ +static const struct drm_mode_config_funcs glamo_mode_funcs = { + .fb_create = glamo_user_framebuffer_create, + .fb_changed = glamofb_fbchanged +}; + + int glamo_display_init(struct drm_device *dev) { struct glamodrm_handle *gdrm; @@ -285,6 +423,13 @@ int glamo_display_init(struct drm_device *dev) gdrm = dev->dev_private; + drm_mode_config_init(dev); + + dev->mode_config.min_width = 0; + dev->mode_config.min_height = 0; + + dev->mode_config.funcs = (void *)&glamo_mode_funcs; + /* Initialise our CRTC object */ glamo_crtc = kzalloc(sizeof(struct glamo_crtc) + sizeof(struct drm_connector *), GFP_KERNEL); -- cgit v1.2.3 From ef859741e8baf985777015207041860cc42a2939 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 15 Jun 2009 01:21:30 +0100 Subject: Just backing up progress (again) Nearly there... Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 173 +++++++++++++++++++++++++++++++++----- 1 file changed, 153 insertions(+), 20 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index afa4c11bad1..1ced367c4af 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -52,6 +52,7 @@ * */ +#define DEBUG 1 #include #include @@ -61,8 +62,95 @@ #include "glamo-core.h" #include "glamo-drm-private.h" #include "glamo-regs.h" +#include "glamo-kms-fb.h" +struct glamofb_par { + struct drm_device *dev; + struct drm_display_mode *our_mode; + struct glamo_framebuffer *glamo_fb; + int crtc_count; + /* crtc currently bound to this */ + uint32_t crtc_ids[2]; +}; + + +#if 0 +static int reg_read(struct glamodrm_handle *gdrm, u_int16_t reg) +{ + int i = 0; + + for (i = 0; i != 2; i++) + nop(); + + return ioread16(gdrm->lcd_base + reg); +} +#endif + + +static void reg_write(struct glamodrm_handle *gdrm, + u_int16_t reg, u_int16_t val) +{ + int i = 0; + + for (i = 0; i != 2; i++) + nop(); + + iowrite16(val, gdrm->lcd_base + reg); +} + + +static struct glamo_script lcd_init_script[] = { + { GLAMO_REG_LCD_MODE1, 0x0020 }, + /* no display rotation, no hardware cursor, no dither, no gamma, + * no retrace flip, vsync low-active, hsync low active, + * no TVCLK, no partial display, hw dest color from fb, + * no partial display mode, LCD1, software flip, */ + { GLAMO_REG_LCD_MODE2, 0x9020 }, + /* video flip, no ptr, no ptr, dhclk off, + * normal mode, no cpuif, + * res, serial msb first, single fb, no fr ctrl, + * cpu if bits all zero, no crc + * 0000 0000 0010 0000 */ + { GLAMO_REG_LCD_MODE3, 0x0b40 }, + /* src data rgb565, res, 18bit rgb666 + * 000 01 011 0100 0000 */ + { GLAMO_REG_LCD_POLARITY, 0x440c }, + /* DE high active, no cpu/lcd if, cs0 force low, a0 low active, + * np cpu if, 9bit serial data, sclk rising edge latch data + * 01 00 0 100 0 000 01 0 0 */ + /* The following values assume 640*480@16bpp */ + { GLAMO_REG_LCD_A_BASE1, 0x0000 }, /* display A base address 15:0 */ + { GLAMO_REG_LCD_A_BASE2, 0x0000 }, /* display A base address 22:16 */ + { GLAMO_REG_LCD_B_BASE1, 0x6000 }, /* display B base address 15:0 */ + { GLAMO_REG_LCD_B_BASE2, 0x0009 }, /* display B base address 22:16 */ + { GLAMO_REG_LCD_CURSOR_BASE1, 0xC000 }, /* cursor base address 15:0 */ + { GLAMO_REG_LCD_CURSOR_BASE2, 0x0012 }, /* cursor base address 22:16 */ + { GLAMO_REG_LCD_COMMAND2, 0x0000 }, /* display page A */ +}; + + +static int glamo_run_lcd_script(struct glamodrm_handle *gdrm, + struct glamo_script *script, int len) +{ + int i; + + for (i = 0; i < len; i++) { + struct glamo_script *line = &script[i]; + + if (line->reg == 0xffff) + return 0; + else if (line->reg == 0xfffe) + msleep(line->val); + else + reg_write(gdrm, script[i].reg, script[i].val); + } + + return 0; +} + + +#if 0 static void notify_blank(struct drm_crtc *crtc, int mode) { struct fb_event event; @@ -71,37 +159,42 @@ static void notify_blank(struct drm_crtc *crtc, int mode) event.data = &blank_mode; fb_notifier_call_chain(FB_EVENT_CONBLANK, &event); } +#endif /* Power on/off */ static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) { - dev_dbg(gfb->dev, "glamofb_blank(%u)\n", blank_mode); - + struct glamodrm_handle *gdrm; + struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc); + + printk(KERN_CRIT "glamo_crtc_dpms(%u)\n", mode); + gdrm = glamo_crtc->gdrm; + switch (mode) { case DRM_MODE_DPMS_OFF: /* Simulating FB_BLANK_NORMAL allow turning off backlight */ - if (gfb->blank_mode != FB_BLANK_NORMAL) - notify_blank(info, FB_BLANK_NORMAL); + //if (gfb->blank_mode != FB_BLANK_NORMAL) + // notify_blank(info, FB_BLANK_NORMAL); /* LCM need notification before pixel clock is stopped */ - notify_blank(crtc, blank_mode); + //notify_blank(crtc, blank_mode); /* disable the pixel clock */ - glamo_engine_clkreg_set(gcore, GLAMO_ENGINE_LCD, + glamo_engine_clkreg_set(gdrm->glamo_core, GLAMO_ENGINE_LCD, GLAMO_CLOCK_LCD_EN_DCLK, 0); - gfb->blank_mode = blank_mode; + glamo_crtc->blank_mode = mode; break; case DRM_MODE_DPMS_ON: /* enable the pixel clock if off */ - if (gfb->blank_mode == DRM_MODE_DPMS_OFF) - glamo_engine_clkreg_set(gcore, + if (glamo_crtc->blank_mode == DRM_MODE_DPMS_OFF) + glamo_engine_clkreg_set(gdrm->glamo_core, GLAMO_ENGINE_LCD, GLAMO_CLOCK_LCD_EN_DCLK, GLAMO_CLOCK_LCD_EN_DCLK); - notify_blank(info, blank_mode); - gfb->blank_mode = blank_mode; + //notify_blank(info, blank_mode); + glamo_crtc->blank_mode = mode; break; } @@ -112,6 +205,7 @@ static bool glamo_crtc_mode_fixup(struct drm_crtc *crtc, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { + printk(KERN_CRIT "glamo_crtc_mode_fixup\n"); return true; } @@ -122,6 +216,7 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { + printk(KERN_CRIT "glamo_crtc_mode_set\n"); } @@ -129,12 +224,14 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, static void glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { + printk(KERN_CRIT "glamo_crtc_mode_set\n"); } static void glamo_crtc_prepare(struct drm_crtc *crtc) { struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + printk(KERN_CRIT "glamo_crtc_prepare\n"); crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF); } @@ -142,6 +239,7 @@ static void glamo_crtc_prepare(struct drm_crtc *crtc) static void glamo_crtc_commit(struct drm_crtc *crtc) { struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + printk(KERN_CRIT "glamo_crtc_commit\n"); crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON); } @@ -151,12 +249,14 @@ static int glamo_crtc_cursor_set(struct drm_crtc *crtc, uint32_t handle, uint32_t width, uint32_t height) { + printk(KERN_CRIT "glamo_crtc_cursor_set\n"); return 0; } static int glamo_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) { + printk(KERN_CRIT "glamo_crtc_cursor_move\n"); return 0; } @@ -164,13 +264,14 @@ static int glamo_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) static void glamo_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, u16 *blue, uint32_t size) { + printk(KERN_CRIT "glamo_crtc_gamma_set\n"); } static void glamo_crtc_destroy(struct drm_crtc *crtc) { struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc); - + printk(KERN_CRIT "glamo_crtc_destroy\n"); drm_crtc_cleanup(crtc); kfree(glamo_crtc); } @@ -180,12 +281,14 @@ static enum drm_connector_status glamo_connector_detect(struct drm_connector *connector) { /* One hopes it hasn't been de-soldered... */ + printk(KERN_CRIT "glamo_connector_detect\n"); return connector_status_connected; } static void glamo_connector_destroy(struct drm_connector *connector) { + printk(KERN_CRIT "glamo_connector_destroy\n"); drm_sysfs_connector_remove(connector); drm_connector_cleanup(connector); kfree(connector); @@ -194,6 +297,7 @@ static void glamo_connector_destroy(struct drm_connector *connector) static int glamo_connector_get_modes(struct drm_connector *connector) { + printk(KERN_CRIT "glamo_connector_get_modes\n"); return false; } @@ -202,6 +306,7 @@ static int glamo_connector_set_property(struct drm_connector *connector, struct drm_property *property, uint64_t value) { + printk(KERN_CRIT "glamo_connector_set_property\n"); return 0; } @@ -209,6 +314,7 @@ static int glamo_connector_set_property(struct drm_connector *connector, static int glamo_connector_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { + printk(KERN_CRIT "glamo_connector_mode_valid\n"); if (mode->flags & DRM_MODE_FLAG_DBLSCAN) return MODE_NO_DBLESCAN; @@ -223,13 +329,14 @@ struct drm_encoder * glamo_connector_best_encoder(struct drm_connector *connector) { struct glamo_output *glamo_output = to_glamo_output(connector); - + printk(KERN_CRIT "glamo_connector_best_encoder\n"); return &glamo_output->enc; } static void glamo_encoder_dpms(struct drm_encoder *encoder, int mode) { + printk(KERN_CRIT "glamo_encoder_dpms\n"); } @@ -237,17 +344,20 @@ static bool glamo_encoder_mode_fixup(struct drm_encoder *encoder, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { + printk(KERN_CRIT "glamo_encoder_mode_fixup\n"); return true; } void glamo_encoder_prepare(struct drm_encoder *encoder) { + printk(KERN_CRIT "glamo_encoder_prepare\n"); } void glamo_encoder_commit(struct drm_encoder *encoder) { + printk(KERN_CRIT "glamo_encoder_commit\n"); } @@ -255,19 +365,22 @@ static void glamo_encoder_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode) { + printk(KERN_CRIT "glamo_encoder_mode_set\n"); } static void glamo_encoder_destroy(struct drm_encoder *encoder) { + printk(KERN_CRIT "glamo_encoder_destroy\n"); drm_encoder_cleanup(encoder); } -static void glamo_user_framebuffer_destroy(struct drm_framebuffer *fb) +static void glamo_framebuffer_destroy(struct drm_framebuffer *fb) { struct glamo_framebuffer *glamo_fb = to_glamo_framebuffer(fb); struct drm_device *dev = fb->dev; + printk(KERN_CRIT "glamo_user_framebuffer_destroy\n"); drm_framebuffer_cleanup(fb); mutex_lock(&dev->struct_mutex); @@ -277,12 +390,13 @@ static void glamo_user_framebuffer_destroy(struct drm_framebuffer *fb) kfree(glamo_fb); } -static int glamo_user_framebuffer_create_handle(struct drm_framebuffer *fb, +static int glamo_framebuffer_create_handle(struct drm_framebuffer *fb, struct drm_file *file_priv, unsigned int *handle) { struct glamo_framebuffer *glamo_fb = to_glamo_framebuffer(fb); struct drm_gem_object *object = glamo_fb->obj; + printk(KERN_CRIT "glamo_user_framebuffer_create_handle\n"); return drm_gem_handle_create(file_priv, object, handle); } @@ -290,8 +404,8 @@ static int glamo_user_framebuffer_create_handle(struct drm_framebuffer *fb, static const struct drm_framebuffer_funcs glamo_fb_funcs = { - .destroy = glamo_user_framebuffer_destroy, - .create_handle = glamo_user_framebuffer_create_handle, + .destroy = glamo_framebuffer_destroy, + .create_handle = glamo_framebuffer_create_handle, }; @@ -303,6 +417,7 @@ int glamo_framebuffer_create(struct drm_device *dev, struct glamo_framebuffer *glamo_fb; int ret; + printk(KERN_CRIT "glamo_framebuffer_create\n"); glamo_fb = kzalloc(sizeof(*glamo_fb), GFP_KERNEL); if (!glamo_fb) return -ENOMEM; @@ -331,6 +446,7 @@ glamo_user_framebuffer_create(struct drm_device *dev, struct drm_gem_object *obj; struct drm_framebuffer *fb; int ret; + printk(KERN_CRIT "glamo_user_framebuffer_create\n"); obj = drm_gem_object_lookup(dev, filp, mode_cmd->handle); if (!obj) @@ -346,8 +462,9 @@ glamo_user_framebuffer_create(struct drm_device *dev, } -int glamo_fb_changed(struct drm_device *dev) +int glamo_fbchanged(struct drm_device *dev) { + printk(KERN_CRIT "glamo_fb_changed\n"); return 0; } @@ -410,7 +527,7 @@ static const struct drm_encoder_helper_funcs glamo_encoder_helper_funcs = { /* Mode functions */ static const struct drm_mode_config_funcs glamo_mode_funcs = { .fb_create = glamo_user_framebuffer_create, - .fb_changed = glamofb_fbchanged + .fb_changed = glamo_fbchanged }; @@ -420,9 +537,12 @@ int glamo_display_init(struct drm_device *dev) struct glamo_crtc *glamo_crtc; struct glamo_output *glamo_output; struct drm_connector *connector; + struct glamo_framebuffer *glamo_fb; gdrm = dev->dev_private; + printk(KERN_CRIT "glamo_display_init\n"); + drm_mode_config_init(dev); dev->mode_config.min_width = 0; @@ -434,6 +554,8 @@ int glamo_display_init(struct drm_device *dev) glamo_crtc = kzalloc(sizeof(struct glamo_crtc) + sizeof(struct drm_connector *), GFP_KERNEL); if (glamo_crtc == NULL) return 1; + glamo_crtc->gdrm = gdrm; + 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); @@ -457,6 +579,17 @@ int glamo_display_init(struct drm_device *dev) drm_encoder_helper_add(&glamo_output->enc, &glamo_encoder_helper_funcs); drm_connector_helper_add(connector, &glamo_connector_helper_funcs); - + + /* Initial setup of the LCD controller */ + glamo_run_lcd_script(gdrm, lcd_init_script, + ARRAY_SIZE(lcd_init_script)); + + if (list_empty(&dev->mode_config.fb_kernel_list)) { + int ret; + printk(KERN_CRIT "creating new fb (console size %dx%d, " + "buffer size %dx%d)\n", 480, 640, 480, 640); + ret = glamofb_create(dev, 480, 640, 480, 640, &glamo_fb); + if (ret) return -EINVAL; + } return 0; } -- cgit v1.2.3 From 9f1ef16f2c739da94261ecb32a8ce96a62a94eac Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 18 Jun 2009 00:00:30 +0100 Subject: More KMS plumbing Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 59 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 1ced367c4af..bcea62b2ed5 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -531,6 +531,30 @@ static const struct drm_mode_config_funcs glamo_mode_funcs = { }; +static struct drm_mode_set kernelfb_mode; + + +/* Restore's the kernel's fbcon mode, used for panic path */ +void glamo_display_restore(void) +{ + drm_crtc_helper_set_config(&kernelfb_mode); +} + + +static int glamo_display_panic(struct notifier_block *n, unsigned long ununsed, + void *panic_str) +{ + DRM_ERROR("panic occurred, switching back to text console\n"); + + glamo_display_restore(); + return 0; +} + +static struct notifier_block paniced = { + .notifier_call = glamo_display_panic, +}; + + int glamo_display_init(struct drm_device *dev) { struct glamodrm_handle *gdrm; @@ -538,6 +562,9 @@ int glamo_display_init(struct drm_device *dev) struct glamo_output *glamo_output; struct drm_connector *connector; struct glamo_framebuffer *glamo_fb; + struct fb_info *info; + struct glamofb_par *par; + struct drm_mode_set *modeset; gdrm = dev->dev_private; @@ -550,7 +577,8 @@ int glamo_display_init(struct drm_device *dev) dev->mode_config.funcs = (void *)&glamo_mode_funcs; - /* Initialise our CRTC object */ + /* Initialise our CRTC object. + * Only one connector per CRTC. We know this: it's kind of soldered. */ glamo_crtc = kzalloc(sizeof(struct glamo_crtc) + sizeof(struct drm_connector *), GFP_KERNEL); if (glamo_crtc == NULL) return 1; @@ -565,7 +593,7 @@ int glamo_display_init(struct drm_device *dev) connector = &glamo_output->base; /* Initialise the connector */ - drm_connector_init(dev, &glamo_output->base, &glamo_connector_funcs, + drm_connector_init(dev, connector, &glamo_connector_funcs, DRM_MODE_CONNECTOR_Unknown); drm_sysfs_connector_add(connector); connector->interlace_allowed = 0; @@ -591,5 +619,32 @@ int glamo_display_init(struct drm_device *dev) ret = glamofb_create(dev, 480, 640, 480, 640, &glamo_fb); if (ret) return -EINVAL; } + + info = glamo_fb->base.fbdev; + par = info->par; + + modeset = &glamo_crtc->mode_set; + modeset->fb = &glamo_fb->base; +// modeset->connectors[0] = connector; + + //par->crtc_ids[0] = glamo_crtc->base.id; + + modeset->num_connectors = 1; +// modeset->mode = modeset->crtc->desired_mode; + + par->crtc_count = 1; + + info->var.pixclock = -1; + if (register_framebuffer(info) < 0) + return -EINVAL; + + printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, + info->fix.id); + + /* Switch back to kernel console on panic */ + kernelfb_mode = *modeset; + atomic_notifier_chain_register(&panic_notifier_list, &paniced); + printk(KERN_INFO "registered panic notifier\n"); + return 0; } -- cgit v1.2.3 From 6308edb906313ead6f66d2543e6aab6e7f2adb5a Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 24 Jun 2009 19:23:51 +0100 Subject: Muppetry and comments, and other small things Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') 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; -- cgit v1.2.3 From bfdf7016e915a89f381d6d8da342ad974681736e Mon Sep 17 00:00:00 2001 From: Thomas White Date: Sat, 27 Jun 2009 00:27:20 +0100 Subject: Call the helper init function Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 67d9d011ba0..2110e19732d 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -612,6 +612,8 @@ int glamo_display_init(struct drm_device *dev) drm_encoder_helper_add(&glamo_output->enc, &glamo_encoder_helper_funcs); drm_connector_helper_add(connector, &glamo_connector_helper_funcs); + drm_helper_initial_config(dev, false); + /* Initial setup of the LCD controller */ glamo_run_lcd_script(gdrm, lcd_init_script, ARRAY_SIZE(lcd_init_script)); -- cgit v1.2.3 From ee66b72542a996ee8f161221713125ef93f8e105 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Sun, 28 Jun 2009 22:14:17 +0100 Subject: KMS bits and pieces This adds some missing bits and pieces to make most of the KMS initialisation flow work.` Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 2110e19732d..debcd0706f9 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -297,8 +297,17 @@ static void glamo_connector_destroy(struct drm_connector *connector) static int glamo_connector_get_modes(struct drm_connector *connector) { + struct drm_display_mode *mode; printk(KERN_CRIT "glamo_connector_get_modes\n"); - return false; + + mode = drm_mode_create(connector->dev); + if (!mode) + return 0; + /* Fill in 'mode' here */ + mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED; + drm_mode_probed_add(connector, mode); + + return 1; /* one mode, for now */ } @@ -315,11 +324,12 @@ static int glamo_connector_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { printk(KERN_CRIT "glamo_connector_mode_valid\n"); - if (mode->flags & DRM_MODE_FLAG_DBLSCAN) + if (mode->flags & DRM_MODE_FLAG_DBLSCAN) { + printk(KERN_CRIT "Doublescan is not allowed\n"); return MODE_NO_DBLESCAN; - - if (mode->clock > 400000 || mode->clock < 25000) - return MODE_CLOCK_RANGE; + } + + printk(KERN_CRIT "Ok!\n"); return MODE_OK; } @@ -606,6 +616,7 @@ int glamo_display_init(struct drm_device *dev) /* Initialise the encoder */ drm_encoder_init(dev, &glamo_output->enc, &glamo_encoder_funcs, DRM_MODE_ENCODER_DAC); + glamo_output->enc.possible_crtcs = 1 << 0; drm_mode_connector_attach_encoder(&glamo_output->base, &glamo_output->enc); @@ -633,7 +644,7 @@ int glamo_display_init(struct drm_device *dev) modeset->fb = &glamo_fb->base; modeset->connectors[0] = connector; - //par->crtc_ids[0] = glamo_crtc->base.id; + par->crtc_ids[0] = glamo_crtc->base.base.id; modeset->num_connectors = 1; modeset->mode = modeset->crtc->desired_mode; -- cgit v1.2.3 From 32babb5ddf8c7ca02bd8e64482c2a5d9eb727724 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 30 Jun 2009 10:15:49 +0100 Subject: Program the LCD registers This also alters some debug lines. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 211 +++++++++++++++++++++++++++++++++++--- 1 file changed, 194 insertions(+), 17 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index debcd0706f9..9c498010725 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -63,6 +63,17 @@ #include "glamo-drm-private.h" #include "glamo-regs.h" #include "glamo-kms-fb.h" +#include + + +#define GLAMO_LCD_WIDTH_MASK 0x03FF +#define GLAMO_LCD_HEIGHT_MASK 0x03FF +#define GLAMO_LCD_PITCH_MASK 0x07FE +#define GLAMO_LCD_HV_TOTAL_MASK 0x03FF +#define GLAMO_LCD_HV_RETR_START_MASK 0x03FF +#define GLAMO_LCD_HV_RETR_END_MASK 0x03FF +#define GLAMO_LCD_HV_RETR_DISP_START_MASK 0x03FF +#define GLAMO_LCD_HV_RETR_DISP_END_MASK 0x03FF struct glamofb_par { @@ -75,8 +86,7 @@ struct glamofb_par { }; -#if 0 -static int reg_read(struct glamodrm_handle *gdrm, u_int16_t reg) +static int reg_read_lcd(struct glamodrm_handle *gdrm, u_int16_t reg) { int i = 0; @@ -85,11 +95,10 @@ static int reg_read(struct glamodrm_handle *gdrm, u_int16_t reg) return ioread16(gdrm->lcd_base + reg); } -#endif -static void reg_write(struct glamodrm_handle *gdrm, - u_int16_t reg, u_int16_t val) +static void reg_write_lcd(struct glamodrm_handle *gdrm, + u_int16_t reg, u_int16_t val) { int i = 0; @@ -100,6 +109,96 @@ static void reg_write(struct glamodrm_handle *gdrm, } +static void reg_set_bit_mask_lcd(struct glamodrm_handle *gdrm, + u_int16_t reg, u_int16_t mask, + u_int16_t val) +{ + u_int16_t tmp; + + val &= mask; + + tmp = reg_read_lcd(gdrm, reg); + tmp &= ~mask; + tmp |= val; + reg_write_lcd(gdrm, reg, tmp); +} + + +/* Note that this has nothing at all to do with the engine command queue + * in glamo-cmdq.c */ +static inline int glamo_lcd_cmdq_empty(struct glamodrm_handle *gdrm) +{ + /* DGCMdQempty -- 1 == command queue is empty */ + return reg_read_lcd(gdrm, GLAMO_REG_LCD_STATUS1) & (1 << 15); +} + + +/* call holding gfb->lock_cmd when locking, until you unlock */ +int glamo_lcd_cmd_mode(struct glamodrm_handle *gdrm, int on) +{ + int timeout = 2000000; + + if (gdrm->glamo_core->suspending) { + dev_err(&gdrm->glamo_core->pdev->dev, + "IGNORING glamofb_cmd_mode while" + " suspended\n"); + return -EBUSY; + } + + dev_dbg(gdrm->dev, "glamofb_cmd_mode(on=%d)\n", on); + if (on) { + dev_dbg(gdrm->dev, "%s: waiting for cmdq empty: ", + __func__); + while ((!glamo_lcd_cmdq_empty(gdrm)) && (timeout--)) + /* yield() */; + if (timeout < 0) { + printk(KERN_ERR "*************" + " LCD command queue never got empty " + "*************\n"); + return -EIO; + } + dev_dbg(gdrm->dev, "empty!\n"); + + /* display the entire frame then switch to command */ + reg_write_lcd(gdrm, GLAMO_REG_LCD_COMMAND1, + GLAMO_LCD_CMD_TYPE_DISP | + GLAMO_LCD_CMD_DATA_FIRE_VSYNC); + + /* wait until lcd idle */ + dev_dbg(gdrm->dev, "waiting for LCD idle: "); + timeout = 2000000; + while ((!reg_read_lcd(gdrm, GLAMO_REG_LCD_STATUS2) & (1 << 12)) && + (timeout--)) + /* yield() */; + if (timeout < 0) { + printk(KERN_ERR"*************" + " LCD never idle " + "*************\n"); + return -EIO; + } + + mdelay(100); + + dev_dbg(gdrm->dev, "cmd mode entered\n"); + + } else { + /* RGB interface needs vsync/hsync */ + int mode; + mode = reg_read_lcd(gdrm, GLAMO_REG_LCD_MODE3); + if ( mode & GLAMO_LCD_MODE3_RGB) + reg_write_lcd(gdrm, GLAMO_REG_LCD_COMMAND1, + GLAMO_LCD_CMD_TYPE_DISP | + GLAMO_LCD_CMD_DATA_DISP_SYNC); + + reg_write_lcd(gdrm, GLAMO_REG_LCD_COMMAND1, + GLAMO_LCD_CMD_TYPE_DISP | + GLAMO_LCD_CMD_DATA_DISP_FIRE); + } + + return 0; +} + + static struct glamo_script lcd_init_script[] = { { GLAMO_REG_LCD_MODE1, 0x0020 }, /* no display rotation, no hardware cursor, no dither, no gamma, @@ -143,7 +242,7 @@ static int glamo_run_lcd_script(struct glamodrm_handle *gdrm, else if (line->reg == 0xfffe) msleep(line->val); else - reg_write(gdrm, script[i].reg, script[i].val); + reg_write_lcd(gdrm, script[i].reg, script[i].val); } return 0; @@ -216,7 +315,57 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { + struct glamodrm_handle *gdrm; + struct glamo_crtc *gcrtc; + int retr_end, disp_start, disp_end; + printk(KERN_CRIT "glamo_crtc_mode_set\n"); + + /* Dig out our handle */ + gcrtc = to_glamo_crtc(crtc); + gdrm = gcrtc->gdrm; /* Here it is! */ + + glamo_lcd_cmd_mode(gdrm, 1); + glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, mode->clock); + + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH, + GLAMO_LCD_WIDTH_MASK, mode->hdisplay); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT, + GLAMO_LCD_HEIGHT_MASK, mode->vdisplay); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH, + GLAMO_LCD_PITCH_MASK, mode->hdisplay*2); + + /* Convert "X modeline timings" into "Glamo timings" */ + retr_end = mode->hsync_end - mode->hsync_start; + disp_start = mode->htotal - mode->hsync_start; + disp_end = mode->hsync_start; + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL, + GLAMO_LCD_HV_TOTAL_MASK, mode->htotal); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START, + GLAMO_LCD_HV_RETR_START_MASK, 0); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END, + GLAMO_LCD_HV_RETR_END_MASK, retr_end); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START, + GLAMO_LCD_HV_RETR_DISP_START_MASK, disp_start); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END, + GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end); + + /* The same in the vertical direction */ + retr_end = mode->vsync_end - mode->vsync_start; + disp_start = mode->vtotal - mode->vsync_start; + disp_end = mode->vsync_start; + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL, + GLAMO_LCD_HV_TOTAL_MASK, mode->vtotal); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START, + GLAMO_LCD_HV_RETR_START_MASK, 0); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END, + GLAMO_LCD_HV_RETR_END_MASK, retr_end); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START, + GLAMO_LCD_HV_RETR_DISP_START_MASK, disp_start); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END, + GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end); + + glamo_lcd_cmd_mode(gdrm, 0); } @@ -224,7 +373,7 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, static void glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { - printk(KERN_CRIT "glamo_crtc_mode_set\n"); + printk(KERN_CRIT "glamo_crtc_mode_set_base\n"); } @@ -298,6 +447,13 @@ static void glamo_connector_destroy(struct drm_connector *connector) static int glamo_connector_get_modes(struct drm_connector *connector) { struct drm_display_mode *mode; + struct glamofb_platform_data *mach_info; + struct glamo_output *goutput = to_glamo_output(connector); + struct glamodrm_handle *gdrm = goutput->gdrm; + + /* Dig out the record which will tell us about the hardware */ + mach_info = gdrm->glamo_core->pdev->dev.platform_data; + printk(KERN_CRIT "glamo_connector_get_modes\n"); mode = drm_mode_create(connector->dev); @@ -305,6 +461,32 @@ static int glamo_connector_get_modes(struct drm_connector *connector) return 0; /* Fill in 'mode' here */ mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED; + + /* Convert framebuffer timings into KMS timings */ + mode->clock = 1000000 / mach_info->pixclock; /* ps -> Hz */ + mode->hdisplay = mach_info->xres.defval; + mode->hsync_start = mach_info->right_margin + mode->hdisplay; + mode->hsync_end = mode->hsync_start + mach_info->hsync_len; + mode->htotal = mode->hdisplay + mach_info->left_margin + + mach_info->right_margin + mach_info->hsync_len; + + 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; + mode->vtotal = mode->vdisplay + mach_info->upper_margin + + mach_info->lower_margin + mach_info->vsync_len; + mode->vscan = 0; + + mode->width_mm = mach_info->width; + mode->height_mm = mach_info->height; + + printk(KERN_CRIT "Modeline \"%ix%i\" %i %i %i %i %i %i %i %i %i\n", + mode->hdisplay, mode->vdisplay, mode->clock, + mode->hdisplay, mode->hsync_start, mode->hsync_end, mode->htotal, + mode->vdisplay, mode->vsync_start, mode->vsync_end, mode->vtotal); + + drm_mode_set_name(mode); drm_mode_probed_add(connector, mode); return 1; /* one mode, for now */ @@ -324,13 +506,9 @@ static int glamo_connector_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { printk(KERN_CRIT "glamo_connector_mode_valid\n"); - if (mode->flags & DRM_MODE_FLAG_DBLSCAN) { - printk(KERN_CRIT "Doublescan is not allowed\n"); + if (mode->flags & DRM_MODE_FLAG_DBLSCAN) return MODE_NO_DBLESCAN; - } - printk(KERN_CRIT "Ok!\n"); - return MODE_OK; } @@ -605,6 +783,7 @@ int glamo_display_init(struct drm_device *dev) glamo_output = kzalloc(sizeof(struct glamo_output), GFP_KERNEL); if (glamo_output == NULL) return 1; connector = &glamo_output->base; + glamo_output->gdrm = gdrm; /* Initialise the connector */ drm_connector_init(dev, connector, &glamo_connector_funcs, @@ -631,8 +810,6 @@ int glamo_display_init(struct drm_device *dev) if (list_empty(&dev->mode_config.fb_kernel_list)) { int ret; - printk(KERN_CRIT "creating new fb (console size %dx%d, " - "buffer size %dx%d)\n", 480, 640, 480, 640); ret = glamofb_create(dev, 480, 640, 480, 640, &glamo_fb); if (ret) return -EINVAL; } @@ -654,13 +831,13 @@ int glamo_display_init(struct drm_device *dev) if (register_framebuffer(info) < 0) return -EINVAL; - printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, - info->fix.id); + printk(KERN_INFO "[glamo-drm] fb%d: %s frame buffer device\n", + info->node, info->fix.id); /* Switch back to kernel console on panic */ kernelfb_mode = *modeset; atomic_notifier_chain_register(&panic_notifier_list, &paniced); - printk(KERN_INFO "registered panic notifier\n"); + printk(KERN_INFO "[glamo-drm] registered panic notifier\n"); return 0; } -- cgit v1.2.3 From c4d629aec2b282795d213855effd1cdd310de32a Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 30 Jun 2009 18:00:23 +0100 Subject: Whitespace and debugging Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 60 ++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 33 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 9c498010725..3e6d1f9543c 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -147,8 +147,7 @@ int glamo_lcd_cmd_mode(struct glamodrm_handle *gdrm, int on) dev_dbg(gdrm->dev, "glamofb_cmd_mode(on=%d)\n", on); if (on) { - dev_dbg(gdrm->dev, "%s: waiting for cmdq empty: ", - __func__); + while ((!glamo_lcd_cmdq_empty(gdrm)) && (timeout--)) /* yield() */; if (timeout < 0) { @@ -157,7 +156,6 @@ int glamo_lcd_cmd_mode(struct glamodrm_handle *gdrm, int on) "*************\n"); return -EIO; } - dev_dbg(gdrm->dev, "empty!\n"); /* display the entire frame then switch to command */ reg_write_lcd(gdrm, GLAMO_REG_LCD_COMMAND1, @@ -165,10 +163,9 @@ int glamo_lcd_cmd_mode(struct glamodrm_handle *gdrm, int on) GLAMO_LCD_CMD_DATA_FIRE_VSYNC); /* wait until lcd idle */ - dev_dbg(gdrm->dev, "waiting for LCD idle: "); timeout = 2000000; - while ((!reg_read_lcd(gdrm, GLAMO_REG_LCD_STATUS2) & (1 << 12)) && - (timeout--)) + while ((!reg_read_lcd(gdrm, GLAMO_REG_LCD_STATUS2) & (1 << 12)) + && (timeout--)) /* yield() */; if (timeout < 0) { printk(KERN_ERR"*************" @@ -179,8 +176,6 @@ int glamo_lcd_cmd_mode(struct glamodrm_handle *gdrm, int on) mdelay(100); - dev_dbg(gdrm->dev, "cmd mode entered\n"); - } else { /* RGB interface needs vsync/hsync */ int mode; @@ -266,10 +261,10 @@ static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) { struct glamodrm_handle *gdrm; struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc); - + printk(KERN_CRIT "glamo_crtc_dpms(%u)\n", mode); gdrm = glamo_crtc->gdrm; - + switch (mode) { case DRM_MODE_DPMS_OFF: /* Simulating FB_BLANK_NORMAL allow turning off backlight */ @@ -318,23 +313,23 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, struct glamodrm_handle *gdrm; struct glamo_crtc *gcrtc; int retr_end, disp_start, disp_end; - + printk(KERN_CRIT "glamo_crtc_mode_set\n"); - + /* Dig out our handle */ gcrtc = to_glamo_crtc(crtc); gdrm = gcrtc->gdrm; /* Here it is! */ glamo_lcd_cmd_mode(gdrm, 1); glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, mode->clock); - + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH, GLAMO_LCD_WIDTH_MASK, mode->hdisplay); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT, GLAMO_LCD_HEIGHT_MASK, mode->vdisplay); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH, GLAMO_LCD_PITCH_MASK, mode->hdisplay*2); - + /* Convert "X modeline timings" into "Glamo timings" */ retr_end = mode->hsync_end - mode->hsync_start; disp_start = mode->htotal - mode->hsync_start; @@ -369,7 +364,6 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, } - static void glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb) { @@ -450,18 +444,18 @@ static int glamo_connector_get_modes(struct drm_connector *connector) struct glamofb_platform_data *mach_info; struct glamo_output *goutput = to_glamo_output(connector); struct glamodrm_handle *gdrm = goutput->gdrm; - + /* Dig out the record which will tell us about the hardware */ mach_info = gdrm->glamo_core->pdev->dev.platform_data; - + printk(KERN_CRIT "glamo_connector_get_modes\n"); - + mode = drm_mode_create(connector->dev); if (!mode) return 0; /* Fill in 'mode' here */ mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED; - + /* Convert framebuffer timings into KMS timings */ mode->clock = 1000000 / mach_info->pixclock; /* ps -> Hz */ mode->hdisplay = mach_info->xres.defval; @@ -469,7 +463,7 @@ static int glamo_connector_get_modes(struct drm_connector *connector) mode->hsync_end = mode->hsync_start + mach_info->hsync_len; mode->htotal = mode->hdisplay + mach_info->left_margin + mach_info->right_margin + mach_info->hsync_len; - + mode->hskew = 0; mode->vdisplay = mach_info->yres.defval; mode->vsync_start = mach_info->lower_margin + mode->vdisplay; @@ -477,15 +471,15 @@ static int glamo_connector_get_modes(struct drm_connector *connector) mode->vtotal = mode->vdisplay + mach_info->upper_margin + mach_info->lower_margin + mach_info->vsync_len; mode->vscan = 0; - + mode->width_mm = mach_info->width; mode->height_mm = mach_info->height; - + printk(KERN_CRIT "Modeline \"%ix%i\" %i %i %i %i %i %i %i %i %i\n", mode->hdisplay, mode->vdisplay, mode->clock, mode->hdisplay, mode->hsync_start, mode->hsync_end, mode->htotal, mode->vdisplay, mode->vsync_start, mode->vsync_end, mode->vtotal); - + drm_mode_set_name(mode); drm_mode_probed_add(connector, mode); @@ -508,7 +502,7 @@ static int glamo_connector_mode_valid(struct drm_connector *connector, printk(KERN_CRIT "glamo_connector_mode_valid\n"); if (mode->flags & DRM_MODE_FLAG_DBLSCAN) return MODE_NO_DBLESCAN; - + return MODE_OK; } @@ -517,7 +511,7 @@ struct drm_encoder * glamo_connector_best_encoder(struct drm_connector *connector) { struct glamo_output *glamo_output = to_glamo_output(connector); - printk(KERN_CRIT "glamo_connector_best_encoder\n"); + printk(KERN_CRIT "glamo_connector_best_encoder\n"); return &glamo_output->enc; } @@ -590,7 +584,6 @@ static int glamo_framebuffer_create_handle(struct drm_framebuffer *fb, } - static const struct drm_framebuffer_funcs glamo_fb_funcs = { .destroy = glamo_framebuffer_destroy, .create_handle = glamo_framebuffer_create_handle, @@ -657,7 +650,6 @@ int glamo_fbchanged(struct drm_device *dev) } - /* CRTC functions */ static const struct drm_crtc_funcs glamo_crtc_funcs = { .cursor_set = glamo_crtc_cursor_set, @@ -738,6 +730,7 @@ static int glamo_display_panic(struct notifier_block *n, unsigned long ununsed, return 0; } + static struct notifier_block paniced = { .notifier_call = glamo_display_panic, }; @@ -774,9 +767,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.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 */ @@ -801,9 +795,9 @@ int glamo_display_init(struct drm_device *dev) drm_encoder_helper_add(&glamo_output->enc, &glamo_encoder_helper_funcs); drm_connector_helper_add(connector, &glamo_connector_helper_funcs); - + drm_helper_initial_config(dev, false); - + /* Initial setup of the LCD controller */ glamo_run_lcd_script(gdrm, lcd_init_script, ARRAY_SIZE(lcd_init_script)); @@ -813,14 +807,14 @@ int glamo_display_init(struct drm_device *dev) ret = glamofb_create(dev, 480, 640, 480, 640, &glamo_fb); if (ret) return -EINVAL; } - + info = glamo_fb->base.fbdev; par = info->par; modeset = &glamo_crtc->mode_set; modeset->fb = &glamo_fb->base; modeset->connectors[0] = connector; - + par->crtc_ids[0] = glamo_crtc->base.base.id; modeset->num_connectors = 1; -- cgit v1.2.3 From 11954ff1745ec10e01db1d9b1e2037a5eea848ce Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 30 Jun 2009 18:49:39 +0100 Subject: Enable the LCD engine Well, duh. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 3e6d1f9543c..339c383805c 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -751,6 +751,9 @@ int glamo_display_init(struct drm_device *dev) printk(KERN_CRIT "glamo_display_init\n"); + glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD); + glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_LCD); + drm_mode_config_init(dev); dev->mode_config.min_width = 0; -- cgit v1.2.3 From 545aaa08cf1b77bca91137f17a625370c258ec0d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 1 Jul 2009 19:16:01 +0100 Subject: Debug This adds some register debugging watchpoints Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 339c383805c..1fd2b7de97c 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(); - + printk(KERN_CRIT "LCD %i -> %x\n", val, reg); iowrite16(val, gdrm->lcd_base + reg); } -- cgit v1.2.3 From f7d411ee185c7b992e9f95b512489892e8f7c30d Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 1 Jul 2009 19:17:21 +0100 Subject: Nasty jbt stuff This adds a stopgap measure to permit manipulation of the LCD controller chip in the absence of an fb notifier chain. It also adds some messing around with the DPMS stuff. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 1fd2b7de97c..8842c3ed267 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -256,6 +256,9 @@ static void notify_blank(struct drm_crtc *crtc, int mode) #endif +extern void jbt6k74_action(int val); + + /* Power on/off */ static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) { @@ -267,31 +270,26 @@ static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) switch (mode) { case DRM_MODE_DPMS_OFF: - /* Simulating FB_BLANK_NORMAL allow turning off backlight */ - //if (gfb->blank_mode != FB_BLANK_NORMAL) - // notify_blank(info, FB_BLANK_NORMAL); - /* LCM need notification before pixel clock is stopped */ - //notify_blank(crtc, blank_mode); + //jbt6k74_action(0); /* disable the pixel clock */ - glamo_engine_clkreg_set(gdrm->glamo_core, GLAMO_ENGINE_LCD, - GLAMO_CLOCK_LCD_EN_DCLK, 0); +// glamo_engine_clkreg_set(gdrm->glamo_core, GLAMO_ENGINE_LCD, +// GLAMO_CLOCK_LCD_EN_DCLK, 0); glamo_crtc->blank_mode = mode; break; case DRM_MODE_DPMS_ON: /* enable the pixel clock if off */ if (glamo_crtc->blank_mode == DRM_MODE_DPMS_OFF) glamo_engine_clkreg_set(gdrm->glamo_core, - GLAMO_ENGINE_LCD, - GLAMO_CLOCK_LCD_EN_DCLK, - GLAMO_CLOCK_LCD_EN_DCLK); + GLAMO_ENGINE_LCD, + GLAMO_CLOCK_LCD_EN_DCLK, + GLAMO_CLOCK_LCD_EN_DCLK); - //notify_blank(info, blank_mode); + //jbt6k74_action(1); glamo_crtc->blank_mode = mode; break; } - } -- cgit v1.2.3 From d3ae4ce3ee964940be32f0d19081256b26796c45 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 1 Jul 2009 23:10:25 +0100 Subject: Fix scanout timings This fixes the scanout timing conversion so that it works. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 8842c3ed267..15b20e37579 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -310,7 +310,7 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, { struct glamodrm_handle *gdrm; struct glamo_crtc *gcrtc; - int retr_end, disp_start, disp_end; + int retr_start, retr_end, disp_start, disp_end; printk(KERN_CRIT "glamo_crtc_mode_set\n"); @@ -329,13 +329,14 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, GLAMO_LCD_PITCH_MASK, mode->hdisplay*2); /* Convert "X modeline timings" into "Glamo timings" */ - retr_end = mode->hsync_end - mode->hsync_start; + retr_start = 0; + retr_end = retr_start + mode->hsync_end - mode->hsync_start; disp_start = mode->htotal - mode->hsync_start; - disp_end = mode->hsync_start; + disp_end = disp_start + mode->hdisplay; reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL, GLAMO_LCD_HV_TOTAL_MASK, mode->htotal); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START, - GLAMO_LCD_HV_RETR_START_MASK, 0); + GLAMO_LCD_HV_RETR_START_MASK, retr_start); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END, GLAMO_LCD_HV_RETR_END_MASK, retr_end); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START, @@ -344,13 +345,14 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, GLAMO_LCD_HV_RETR_DISP_END_MASK, disp_end); /* The same in the vertical direction */ - retr_end = mode->vsync_end - mode->vsync_start; + retr_start = 0; + retr_end = retr_start + mode->vsync_end - mode->vsync_start; disp_start = mode->vtotal - mode->vsync_start; - disp_end = mode->vsync_start; + disp_end = disp_start + mode->vdisplay; reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL, GLAMO_LCD_HV_TOTAL_MASK, mode->vtotal); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START, - GLAMO_LCD_HV_RETR_START_MASK, 0); + GLAMO_LCD_HV_RETR_START_MASK, retr_start); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END, GLAMO_LCD_HV_RETR_END_MASK, retr_end); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START, @@ -459,15 +461,13 @@ static int glamo_connector_get_modes(struct drm_connector *connector) mode->hdisplay = mach_info->xres.defval; mode->hsync_start = mach_info->right_margin + mode->hdisplay; mode->hsync_end = mode->hsync_start + mach_info->hsync_len; - mode->htotal = mode->hdisplay + mach_info->left_margin - + mach_info->right_margin + 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; - mode->vtotal = mode->vdisplay + mach_info->upper_margin - + mach_info->lower_margin + mach_info->vsync_len; + mode->vtotal = mode->vsync_end + mach_info->upper_margin; mode->vscan = 0; mode->width_mm = mach_info->width; -- cgit v1.2.3 From d6d7968dd72899989c2e989df832a80d18a9f07f Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 1 Jul 2009 23:11:52 +0100 Subject: Remove debug watchpoints Finished with these now. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 15b20e37579..05bc7537c64 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(); - printk(KERN_CRIT "LCD %i -> %x\n", val, reg); + iowrite16(val, gdrm->lcd_base + reg); } -- cgit v1.2.3 From c30b2dda89951504d3ac434848ac92d70376aec0 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 2 Jul 2009 00:04:26 +0100 Subject: Do not switch the screen off when changing mode ...because the clock(s) must be running while we talk to the chip. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 05bc7537c64..b79df84da68 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -274,8 +274,8 @@ static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) //jbt6k74_action(0); /* disable the pixel clock */ -// glamo_engine_clkreg_set(gdrm->glamo_core, GLAMO_ENGINE_LCD, -// GLAMO_CLOCK_LCD_EN_DCLK, 0); + glamo_engine_clkreg_set(gdrm->glamo_core, GLAMO_ENGINE_LCD, + GLAMO_CLOCK_LCD_EN_DCLK, 0); glamo_crtc->blank_mode = mode; break; case DRM_MODE_DPMS_ON: @@ -373,17 +373,13 @@ static void glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, static void glamo_crtc_prepare(struct drm_crtc *crtc) { - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; printk(KERN_CRIT "glamo_crtc_prepare\n"); - crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF); } static void glamo_crtc_commit(struct drm_crtc *crtc) { - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; printk(KERN_CRIT "glamo_crtc_commit\n"); - crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON); } -- cgit v1.2.3 From 1cdde8b8d0c579a80fdce2c87efb5069e3c688d0 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 2 Jul 2009 00:33:04 +0100 Subject: Alter jbt6k74 state on DPMS This uses the "stopgap" method implemented earlier. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index b79df84da68..706c6293903 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -271,7 +271,7 @@ static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) switch (mode) { case DRM_MODE_DPMS_OFF: /* LCM need notification before pixel clock is stopped */ - //jbt6k74_action(0); + jbt6k74_action(0); /* disable the pixel clock */ glamo_engine_clkreg_set(gdrm->glamo_core, GLAMO_ENGINE_LCD, @@ -285,8 +285,7 @@ static void glamo_crtc_dpms(struct drm_crtc *crtc, int mode) GLAMO_ENGINE_LCD, GLAMO_CLOCK_LCD_EN_DCLK, GLAMO_CLOCK_LCD_EN_DCLK); - - //jbt6k74_action(1); + jbt6k74_action(1); glamo_crtc->blank_mode = mode; break; } -- cgit v1.2.3 From 265bd0256e05dcc2cc8e640af4291b3574a857ed Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 2 Jul 2009 22:07:40 +0100 Subject: Whitespace Fix trailing whitespace Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') 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; -- cgit v1.2.3 From 791916962183d648d71f9b45125fa656696084fd Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 2 Jul 2009 23:44:07 +0100 Subject: Initial suspend/resume Doesn't work yet... Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index 4a39534dfdf..a5be9236b66 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -319,6 +319,7 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, glamo_lcd_cmd_mode(gdrm, 1); glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, mode->clock); + gdrm->saved_clock = mode->clock; reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH, GLAMO_LCD_WIDTH_MASK, mode->hdisplay); @@ -831,3 +832,68 @@ int glamo_display_init(struct drm_device *dev) return 0; } + + +void glamo_display_suspend(struct glamodrm_handle *gdrm) +{ + jbt6k74_action(0); + + gdrm->saved_width = reg_read_lcd(gdrm, GLAMO_REG_LCD_WIDTH); + gdrm->saved_height = reg_read_lcd(gdrm, GLAMO_REG_LCD_HEIGHT); + gdrm->saved_pitch = reg_read_lcd(gdrm, GLAMO_REG_LCD_PITCH); + gdrm->saved_htotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL); + gdrm->saved_hrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START); + gdrm->saved_hrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END); + gdrm->saved_hdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START); + gdrm->saved_hdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END); + gdrm->saved_vtotal = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL); + gdrm->saved_vrtrst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START); + gdrm->saved_vrtren = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END); + gdrm->saved_vdspst = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START); + gdrm->saved_vdspen = reg_read_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END); +} + + +void glamo_display_resume(struct glamodrm_handle *gdrm) +{ + /* Reinitialise the LCD controller */ + jbt6k74_action(0); + mdelay(5); + + glamo_engine_enable(gdrm->glamo_core, GLAMO_ENGINE_LCD); + glamo_engine_reset(gdrm->glamo_core, GLAMO_ENGINE_LCD); + glamo_run_lcd_script(gdrm, lcd_init_script, + ARRAY_SIZE(lcd_init_script)); + + /* Restore timings */ + glamo_lcd_cmd_mode(gdrm, 1); + glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, + gdrm->saved_clock); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL, + GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_htotal); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START, + GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_vrtrst); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END, + GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_vrtren); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START, + GLAMO_LCD_HV_RETR_DISP_START_MASK, + gdrm->saved_hdspst); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_END, + GLAMO_LCD_HV_RETR_DISP_END_MASK, + gdrm->saved_hdspen); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_TOTAL, + GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_vtotal); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_START, + GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_vrtrst); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_RETR_END, + GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_vrtren); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_START, + GLAMO_LCD_HV_RETR_DISP_START_MASK, + gdrm->saved_vdspst); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_VERT_DISP_END, + GLAMO_LCD_HV_RETR_DISP_END_MASK, + gdrm->saved_vdspen); + glamo_lcd_cmd_mode(gdrm, 0); + + jbt6k74_action(1); +} -- cgit v1.2.3 From 1bc42a6756626c744217ba1a3f488445d69df745 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 6 Jul 2009 19:06:22 +0100 Subject: Fix resume, part 1 This seems to fix the kernel-level suspend/resume. There remains a problem which causes Xorg to crash on resume. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index a5be9236b66..ceffb18331c 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -865,16 +865,28 @@ void glamo_display_resume(struct glamodrm_handle *gdrm) glamo_run_lcd_script(gdrm, lcd_init_script, ARRAY_SIZE(lcd_init_script)); + /* Enable pixel clock */ + glamo_engine_clkreg_set(gdrm->glamo_core, + GLAMO_ENGINE_LCD, + GLAMO_CLOCK_LCD_EN_DCLK, + GLAMO_CLOCK_LCD_EN_DCLK); + /* Restore timings */ glamo_lcd_cmd_mode(gdrm, 1); glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, gdrm->saved_clock); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH, GLAMO_LCD_WIDTH_MASK, + gdrm->saved_width); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HEIGHT, GLAMO_LCD_HEIGHT_MASK, + gdrm->saved_height); + reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_PITCH, GLAMO_LCD_PITCH_MASK, + gdrm->saved_pitch); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_TOTAL, GLAMO_LCD_HV_TOTAL_MASK, gdrm->saved_htotal); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_START, - GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_vrtrst); + GLAMO_LCD_HV_RETR_START_MASK, gdrm->saved_hrtrst); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_RETR_END, - GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_vrtren); + GLAMO_LCD_HV_RETR_END_MASK, gdrm->saved_hrtren); reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_HORIZ_DISP_START, GLAMO_LCD_HV_RETR_DISP_START_MASK, gdrm->saved_hdspst); -- cgit v1.2.3 From 5b85050a8f1e7db530f803627ba6371ca9c0ba9b Mon Sep 17 00:00:00 2001 From: Thomas White Date: Sat, 11 Jul 2009 23:24:49 +0100 Subject: De-bodge pixel clocks .. or re-bodge them, depending on your perspective. This makes mode->clock contain a value in Hz, in line with the KMS convention. This is at the expense of more calculations when generating the mode from the mach_info and when setting the mode. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-display.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'drivers/mfd/glamo/glamo-display.c') diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c index ceffb18331c..93f056dce43 100644 --- a/drivers/mfd/glamo/glamo-display.c +++ b/drivers/mfd/glamo/glamo-display.c @@ -310,6 +310,7 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, struct glamodrm_handle *gdrm; struct glamo_crtc *gcrtc; int retr_start, retr_end, disp_start, disp_end; + int ps; printk(KERN_CRIT "glamo_crtc_mode_set\n"); @@ -318,8 +319,11 @@ static void glamo_crtc_mode_set(struct drm_crtc *crtc, gdrm = gcrtc->gdrm; /* Here it is! */ glamo_lcd_cmd_mode(gdrm, 1); - glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, mode->clock); - gdrm->saved_clock = mode->clock; + ps = mode->clock / 1000; /* Hz -> kHz */ + ps = 1000000000UL / ps; /* kHz -> ps */ + printk(KERN_INFO "[glamo-drm] Reclocking LCD engine to %i ps\n", ps); + glamo_engine_reclock(gdrm->glamo_core, GLAMO_ENGINE_LCD, ps); + gdrm->saved_clock = ps; reg_set_bit_mask_lcd(gdrm, GLAMO_REG_LCD_WIDTH, GLAMO_LCD_WIDTH_MASK, mode->hdisplay); @@ -453,7 +457,8 @@ static int glamo_connector_get_modes(struct drm_connector *connector) mode->type = DRM_MODE_TYPE_DEFAULT | DRM_MODE_TYPE_PREFERRED; /* Convert framebuffer timings into KMS timings */ - mode->clock = 1000000 / mach_info->pixclock; /* ps -> Hz */ + mode->clock = 1000000000UL / mach_info->pixclock; /* ps -> kHz */ + mode->clock *= 1000; /* kHz -> Hz */ mode->hdisplay = mach_info->xres.defval; mode->hsync_start = mach_info->right_margin + mode->hdisplay; mode->hsync_end = mode->hsync_start + mach_info->hsync_len; -- cgit v1.2.3