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/Makefile | 2 +- drivers/mfd/glamo/glamo-display.c | 144 ++++++++++++++++++++++++++++++++++ drivers/mfd/glamo/glamo-display.h | 30 +++++++ drivers/mfd/glamo/glamo-drm-drv.c | 41 +++++++--- drivers/mfd/glamo/glamo-drm-private.h | 11 +++ 5 files changed, 218 insertions(+), 10 deletions(-) create mode 100644 drivers/mfd/glamo/glamo-display.c create mode 100644 drivers/mfd/glamo/glamo-display.h (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile index 75476de5ad7..7d3f7d6bc69 100644 --- a/drivers/mfd/glamo/Makefile +++ b/drivers/mfd/glamo/Makefile @@ -12,4 +12,4 @@ obj-$(CONFIG_MFD_GLAMO_SPI_FB) += glamo-lcm-spi.o obj-$(CONFIG_MFD_GLAMO_MCI) += glamo-mci.o obj-$(CONFIG_MFD_GLAMO_DRM) += glamo-drm.o -glamo-drm-objs := glamo-drm-drv.o glamo-cmdq.o glamo-buffer.o +glamo-drm-objs := glamo-drm-drv.o glamo-cmdq.o glamo-buffer.o glamo-display.o 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; +} diff --git a/drivers/mfd/glamo/glamo-display.h b/drivers/mfd/glamo/glamo-display.h new file mode 100644 index 00000000000..6d8d43cbcfb --- /dev/null +++ b/drivers/mfd/glamo/glamo-display.h @@ -0,0 +1,30 @@ +/* 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 + */ + +#ifndef __GLAMO_DISPLAY_H +#define __GLAMO_DISPLAY_H + +#include + +extern int glamo_display_init(struct drm_device *dev); + +#endif /* __GLAMO_DISPLAY_H */ diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index 2208a8ef5f7..5136263375b 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -31,6 +31,7 @@ #include "glamo-cmdq.h" #include "glamo-buffer.h" #include "glamo-drm-private.h" +#include "glamo-display.h" #define DRIVER_AUTHOR "Openmoko, Inc." #define DRIVER_NAME "glamo-drm" @@ -126,13 +127,43 @@ static void glamodrm_master_destroy(struct drm_device *dev, } +static int glamodrm_load(struct drm_device *dev, unsigned long flags) +{ + struct glamodrm_handle *gdrm; + + gdrm = dev->dev_private; + + glamo_buffer_init(gdrm); + glamo_cmdq_init(gdrm); + glamo_display_init(dev); + + return 0; +} + + +static int glamodrm_unload(struct drm_device *dev) +{ + struct glamodrm_handle *gdrm; + + gdrm = dev->dev_private; + + glamo_engine_disable(gdrm->glamo_core, GLAMO_ENGINE_2D); + glamo_engine_disable(gdrm->glamo_core, GLAMO_ENGINE_3D); + glamo_buffer_final(gdrm); + + return 0; +} + + static struct vm_operations_struct glamodrm_gem_vm_ops = { .fault = glamodrm_gem_fault, }; static struct drm_driver glamodrm_drm_driver = { - .driver_features = DRIVER_IS_PLATFORM | DRIVER_GEM, + .driver_features = DRIVER_IS_PLATFORM | DRIVER_GEM | DRIVER_MODESET, .firstopen = glamodrm_firstopen, + .load = glamodrm_load, + .unload = glamodrm_unload, .open = glamodrm_open, .preclose = glamodrm_preclose, .postclose = glamodrm_postclose, @@ -247,9 +278,6 @@ static int glamodrm_probe(struct platform_device *pdev) /* Initialise DRM */ drm_platform_init(&glamodrm_drm_driver, pdev, (void *)gdrm); - glamo_buffer_init(gdrm); - glamo_cmdq_init(gdrm); - return 0; out_release_cmdq: @@ -272,12 +300,7 @@ out_free: static int glamodrm_remove(struct platform_device *pdev) { struct glamodrm_handle *gdrm = platform_get_drvdata(pdev); - struct glamo_core *glamocore = pdev->dev.platform_data; - - glamo_engine_disable(glamocore, GLAMO_ENGINE_2D); - glamo_engine_disable(glamocore, GLAMO_ENGINE_3D); - glamo_buffer_final(gdrm); drm_exit(&glamodrm_drm_driver); platform_set_drvdata(pdev, NULL); diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h index 59fbc2488c5..d1c76c23115 100644 --- a/drivers/mfd/glamo/glamo-drm-private.h +++ b/drivers/mfd/glamo/glamo-drm-private.h @@ -58,6 +58,7 @@ struct glamodrm_handle { struct drm_mm *mmgr; }; + /* Private data. This is where we keep our memory management bits */ struct drm_glamo_gem_object { struct drm_gem_object *obj; /* The GEM object this refers to */ @@ -65,5 +66,15 @@ struct drm_glamo_gem_object { }; +struct glamo_crtc { + struct drm_crtc base; +}; + + +#define to_glamo_crtc(x) container_of(x, struct glamo_crtc, base) +#define to_glamo_output(x) container_of(x, struct glamo_output, base) +#define enc_to_glamo_output(x) container_of(x, struct glamo_output, enc) +#define to_glamo_framebuffer(x) container_of(x, struct glamo_framebuffer, base) + #endif /* __GLAMO_DRMPRIV_H */ -- cgit v1.2.3 From 31f56d4cb19c8ba73bd2b5fba91ce7d626dc642e Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 2 Jun 2009 22:06:50 +0100 Subject: Reorganise memory map (again) This reuinites the "framebuffer" and "work" VRAM areas. With KMS, both roles will be done by one pool of memory. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-cmdq.c | 2 +- drivers/mfd/glamo/glamo-core.c | 20 ++++++--------- drivers/mfd/glamo/glamo-core.h | 13 +++++----- drivers/mfd/glamo/glamo-drm-drv.c | 52 +++++++++++++++++++-------------------- drivers/mfd/glamo/glamo-fb.c | 10 -------- 5 files changed, 40 insertions(+), 57 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c index 199cb6cc170..f24d6814849 100644 --- a/drivers/mfd/glamo/glamo-cmdq.c +++ b/drivers/mfd/glamo/glamo-cmdq.c @@ -281,7 +281,7 @@ static int glamo_do_relocation(struct glamodrm_handle *gdrm, goto fail; } - addr = GLAMO_OFFSET_WORK + gobj->block->start; + addr = GLAMO_OFFSET_FB + gobj->block->start; addr_low = addr & 0xffff; addr_high = (addr >> 16) & 0x7f; printk(KERN_INFO "Addr low 0x%x, high 0x%x\n", diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index a485e34f748..075b9a05a0e 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -181,18 +181,18 @@ static struct resource glamo_cmdq_resources[] = { .start = GLAMO_REGOFS_CMDQUEUE, .end = GLAMO_REGOFS_RISC - 1, .flags = IORESOURCE_MEM, - }, { - .name = "glamo-work-mem", - .start = GLAMO_MEM_BASE + GLAMO_OFFSET_WORK, - .end = GLAMO_MEM_BASE + GLAMO_OFFSET_WORK + - GLAMO_WORK_SIZE - 1, - .flags = IORESOURCE_MEM, }, { .name = "glamo-command-queue", .start = GLAMO_MEM_BASE + GLAMO_OFFSET_CMDQ, .end = GLAMO_MEM_BASE + GLAMO_OFFSET_CMDQ + GLAMO_CMDQ_SIZE - 1, .flags = IORESOURCE_MEM, + }, { + .name = "glamo-fb-mem", + .start = GLAMO_MEM_BASE + GLAMO_OFFSET_FB, + .end = GLAMO_MEM_BASE + GLAMO_OFFSET_FB + + GLAMO_FB_SIZE - 1, + .flags = IORESOURCE_MEM, }, }; @@ -213,13 +213,7 @@ static struct resource glamo_fb_resources[] = { .start = GLAMO_REGOFS_LCD, .end = GLAMO_REGOFS_MMC - 1, .flags = IORESOURCE_MEM, - }, { - .name = "glamo-fb-mem", - .start = GLAMO_MEM_BASE + GLAMO_OFFSET_FB, - .end = GLAMO_MEM_BASE + GLAMO_OFFSET_FB + - GLAMO_FB_SIZE - 1, - .flags = IORESOURCE_MEM, - }, + } }; static struct platform_device glamo_fb_dev = { diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h index 63390492141..4808ad72bb4 100644 --- a/drivers/mfd/glamo/glamo-core.h +++ b/drivers/mfd/glamo/glamo-core.h @@ -7,18 +7,19 @@ * sure we have sufficient memory for other functions of the chip */ /* FIXME: this should be autodetected */ #define GLAMO_INTERNAL_RAM_SIZE 0x800000 -/* A 640x480, 16bpp, double-buffered framebuffer */ -#define GLAMO_FB_SIZE (640 * 480 * 4) /* == 0x12c000 */ /* Arbitrarily determined amount for the hardware cursor */ #define GLAMO_CURSOR_SIZE (4096) #define GLAMO_MMC_BUFFER_SIZE (64 * 1024) /* 64k MMC buffer */ #define GLAMO_CMDQ_SIZE (128 * 1024) /* 128k ring buffer */ /* Remaining memory will be used for 2D and 3D graphics */ -#define GLAMO_WORK_SIZE (GLAMO_INTERNAL_RAM_SIZE \ - - GLAMO_FB_SIZE \ +#define GLAMO_FB_SIZE (GLAMO_INTERNAL_RAM_SIZE \ - GLAMO_CURSOR_SIZE \ - GLAMO_MMC_BUFFER_SIZE \ - GLAMO_CMDQ_SIZE) +/* A 640x480, 16bpp, double-buffered framebuffer */ +#if (GLAMO_FB_SIZE < (640 * 480 * 4)) /* == 0x12c000 */ +#error Not enough Glamo VRAM for framebuffer! +#endif /* for the time being, we put the on-screen framebuffer into the lowest * VRAM space. This should make the code easily compatible with the various @@ -26,12 +27,10 @@ * glamo-fb.c assumes FB comes first, followed by cursor, so DON'T MOVE THEM * (see glamo_regs[] in glamo-fb.c for more information) */ #define GLAMO_MEM_BASE (0x800000) -#define GLAMO_OFFSET_VRAM (0x000000) -#define GLAMO_OFFSET_FB (GLAMO_OFFSET_VRAM) +#define GLAMO_OFFSET_FB (0x000000) #define GLAMO_OFFSET_CURSOR (GLAMO_OFFSET_FB + GLAMO_FB_SIZE) #define GLAMO_OFFSET_MMC (GLAMO_OFFSET_CURSOR + GLAMO_CURSOR_SIZE) #define GLAMO_OFFSET_CMDQ (GLAMO_OFFSET_MMC + GLAMO_MMC_BUFFER_SIZE) -#define GLAMO_OFFSET_WORK (GLAMO_OFFSET_CMDQ + GLAMO_CMDQ_SIZE) struct glamo_core { int irq; diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index 5136263375b..a2303ce1d7e 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -229,33 +229,8 @@ static int glamodrm_probe(struct platform_device *pdev) goto out_release_regs; } - /* Find the working VRAM */ - gdrm->vram = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if ( !gdrm->vram ) { - dev_err(&pdev->dev, "Unable to find work VRAM.\n"); - rc = -ENOENT; - goto out_unmap_regs; - } - gdrm->vram = request_mem_region(gdrm->vram->start, - RESSIZE(gdrm->vram), pdev->name); - if ( !gdrm->vram ) { - dev_err(&pdev->dev, "failed to request VRAM region\n"); - rc = -ENOENT; - goto out_unmap_regs; - } - gdrm->vram_base = ioremap(gdrm->vram->start, RESSIZE(gdrm->vram)); - if ( !gdrm->vram_base ) { - dev_err(&pdev->dev, "failed to ioremap() VRAM\n"); - rc = -ENOENT; - goto out_release_vram; - } - - gdrm->vram_size = GLAMO_WORK_SIZE; - printk(KERN_INFO "[glamo-drm] %lli bytes of Glamo RAM to work with\n", - (long long int)gdrm->vram_size); - /* Find the command queue itself */ - gdrm->cmdq = platform_get_resource(pdev, IORESOURCE_MEM, 2); + gdrm->cmdq = platform_get_resource(pdev, IORESOURCE_MEM, 1); if ( !gdrm->cmdq ) { dev_err(&pdev->dev, "Unable to find command queue.\n"); rc = -ENOENT; @@ -275,6 +250,31 @@ static int glamodrm_probe(struct platform_device *pdev) goto out_release_cmdq; } + /* Find the VRAM */ + gdrm->vram = platform_get_resource(pdev, IORESOURCE_MEM, 2); + if ( !gdrm->vram ) { + dev_err(&pdev->dev, "Unable to find VRAM.\n"); + rc = -ENOENT; + goto out_unmap_regs; + } + gdrm->vram = request_mem_region(gdrm->vram->start, + RESSIZE(gdrm->vram), pdev->name); + if ( !gdrm->vram ) { + dev_err(&pdev->dev, "failed to request VRAM region\n"); + rc = -ENOENT; + goto out_unmap_regs; + } + gdrm->vram_base = ioremap(gdrm->vram->start, RESSIZE(gdrm->vram)); + if ( !gdrm->vram_base ) { + dev_err(&pdev->dev, "failed to ioremap() VRAM\n"); + rc = -ENOENT; + goto out_release_vram; + } + + gdrm->vram_size = GLAMO_FB_SIZE; + printk(KERN_INFO "[glamo-drm] %lli bytes of VRAM\n", + (long long int)gdrm->vram_size); + /* Initialise DRM */ drm_platform_init(&glamodrm_drm_driver, pdev, (void *)gdrm); diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 589b924b6bf..d9a610eeda4 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -995,16 +995,6 @@ static int __init glamofb_probe(struct platform_device *pdev) dev_err(&pdev->dev, "failed to request mmio region\n"); goto out_free; } - if (mach_info->fb_mem_size != RESSIZE(glamofb->fb_res)) - dev_warn(&pdev->dev, "different vram sizes\n"); - - glamofb->fb_res = request_mem_region(glamofb->fb_res->start, - mach_info->fb_mem_size, - pdev->name); - if (!glamofb->fb_res) { - dev_err(&pdev->dev, "failed to request vram region\n"); - goto out_release_reg; - } /* we want to remap only the registers required for this core * driver. */ -- cgit v1.2.3 From da4745334d168390fc9afe7dbe8f729df2aa9afa Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 3 Jun 2009 00:40:16 +0100 Subject: Tidy up Kconfig This just tidies up the Glamo Kconfig file a bit. Signed-off-by: Thomas White --- drivers/mfd/glamo/Kconfig | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig index eaa415df890..30932b0c2ee 100644 --- a/drivers/mfd/glamo/Kconfig +++ b/drivers/mfd/glamo/Kconfig @@ -1,12 +1,15 @@ config MFD_GLAMO - bool "Smedia Glamo 336x/337x support" + bool "SMedia Glamo 336x/337x support" help This enables the core driver for the Smedia Glamo 336x/337x multi-function device. It includes irq_chip demultiplex as well as clock / power management and GPIO support. +menu "SMedia Glamo 336x/337x engine drivers" + depends on MFD_GLAMO + config MFD_GLAMO_FB - tristate "Smedia Glamo 336x/337x framebuffer support" + tristate "SMedia Glamo 336x/337x framebuffer support" depends on FB && MFD_GLAMO select FB_CFB_FILLRECT select FB_CFB_COPYAREA @@ -31,7 +34,6 @@ config MFD_GLAMO_FB_XGLAMO_WORKAROUND If unsure, say N. - config MFD_GLAMO_SPI_GPIO tristate "Glamo GPIO SPI bitbang support" depends on MFD_GLAMO @@ -57,10 +59,15 @@ config MFD_GLAMO_MCI If unsure, say N. config MFD_GLAMO_DRM - tristate "Glamo DRM support" + tristate "Glamo direct rendering and kernel modesetting support" depends on MFD_GLAMO && DRM help - Direct Rendering Manager interface for the S-Media GLAMO chip, as - used in Openmoko neo1973 GTA-02. + Direct Rendering Manager interface for the S-Media Glamo chip, as + used in Openmoko FreeRunner (GTA02). + + This DRM driver includes kernel modesetting (KMS) support. As such, + do not select MFD_GLAMO_FB above if you choose to enable this option. If unsure, say N. + +endmenu -- 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 +++++++++++++++++++++++++++++++--- drivers/mfd/glamo/glamo-drm-private.h | 12 ++ 2 files changed, 198 insertions(+), 13 deletions(-) (limited to 'drivers/mfd') 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; } diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h index d1c76c23115..835b65bc8cd 100644 --- a/drivers/mfd/glamo/glamo-drm-private.h +++ b/drivers/mfd/glamo/glamo-drm-private.h @@ -71,6 +71,18 @@ struct glamo_crtc { }; +struct glamo_framebuffer { + struct drm_framebuffer base; + struct drm_gem_object *obj; +}; + + +struct glamo_output { + struct drm_connector base; + struct drm_encoder enc; +}; + + #define to_glamo_crtc(x) container_of(x, struct glamo_crtc, base) #define to_glamo_output(x) container_of(x, struct glamo_output, base) #define enc_to_glamo_output(x) container_of(x, struct glamo_output, enc) -- 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') 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/Kconfig | 3 + drivers/mfd/glamo/Makefile | 3 +- drivers/mfd/glamo/glamo-core.c | 53 ++-- drivers/mfd/glamo/glamo-display.c | 173 +++++++++-- drivers/mfd/glamo/glamo-display.h | 7 +- drivers/mfd/glamo/glamo-drm-drv.c | 37 ++- drivers/mfd/glamo/glamo-drm-private.h | 8 + drivers/mfd/glamo/glamo-kms-fb.c | 561 ++++++++++++++++++++++++++++++++++ drivers/mfd/glamo/glamo-kms-fb.h | 37 +++ 9 files changed, 820 insertions(+), 62 deletions(-) create mode 100644 drivers/mfd/glamo/glamo-kms-fb.c create mode 100644 drivers/mfd/glamo/glamo-kms-fb.h (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig index 30932b0c2ee..3b942ab0a6d 100644 --- a/drivers/mfd/glamo/Kconfig +++ b/drivers/mfd/glamo/Kconfig @@ -61,6 +61,9 @@ config MFD_GLAMO_MCI config MFD_GLAMO_DRM tristate "Glamo direct rendering and kernel modesetting support" depends on MFD_GLAMO && DRM + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT help Direct Rendering Manager interface for the S-Media Glamo chip, as used in Openmoko FreeRunner (GTA02). diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile index 7d3f7d6bc69..155427c5c61 100644 --- a/drivers/mfd/glamo/Makefile +++ b/drivers/mfd/glamo/Makefile @@ -12,4 +12,5 @@ obj-$(CONFIG_MFD_GLAMO_SPI_FB) += glamo-lcm-spi.o obj-$(CONFIG_MFD_GLAMO_MCI) += glamo-mci.o obj-$(CONFIG_MFD_GLAMO_DRM) += glamo-drm.o -glamo-drm-objs := glamo-drm-drv.o glamo-cmdq.o glamo-buffer.o glamo-display.o +glamo-drm-objs := glamo-drm-drv.o glamo-cmdq.o glamo-buffer.o \ + glamo-display.o glamo-kms-fb.o diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 075b9a05a0e..9e690b5db4b 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -175,7 +175,7 @@ static inline void glamo_vmem_read(struct glamo_core *glamo, u_int16_t *buf, /*********************************************************************** * resources of sibling devices ***********************************************************************/ -static struct resource glamo_cmdq_resources[] = { +static struct resource glamo_graphics_resources[] = { { .name = "glamo-cmdq-regs", .start = GLAMO_REGOFS_CMDQUEUE, @@ -193,22 +193,7 @@ static struct resource glamo_cmdq_resources[] = { .end = GLAMO_MEM_BASE + GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1, .flags = IORESOURCE_MEM, - }, -}; - -static struct platform_device glamo_cmdq_dev = { - .name = "glamo-cmdq", - .resource = glamo_cmdq_resources, - .num_resources = ARRAY_SIZE(glamo_cmdq_resources), -}; - -static struct platform_device glamo_spigpio_dev = { - .name = "glamo-spi-gpio", -}; - -static struct resource glamo_fb_resources[] = { - /* FIXME: those need to be incremented by parent base */ - { + }, { .name = "glamo-fb-regs", .start = GLAMO_REGOFS_LCD, .end = GLAMO_REGOFS_MMC - 1, @@ -216,12 +201,17 @@ static struct resource glamo_fb_resources[] = { } }; -static struct platform_device glamo_fb_dev = { - .name = "glamo-fb", - .resource = glamo_fb_resources, - .num_resources = ARRAY_SIZE(glamo_fb_resources), +static struct platform_device glamo_graphics_dev = { + .name = "glamo-graphics", + .resource = glamo_graphics_resources, + .num_resources = ARRAY_SIZE(glamo_graphics_resources), +}; + +static struct platform_device glamo_spigpio_dev = { + .name = "glamo-spi-gpio", }; + static struct resource glamo_mmc_resources[] = { { /* FIXME: those need to be incremented by parent base */ @@ -1253,18 +1243,11 @@ static int __init glamo_probe(struct platform_device *pdev) glamo->pdata->glamo = glamo; /* Command queue device (for DRM) */ - glamo_cmdq_dev.dev.parent = &pdev->dev; - glamo_cmdq_dev.dev.platform_data = glamo; - mangle_mem_resources(glamo_cmdq_dev.resource, - glamo_cmdq_dev.num_resources, glamo->mem); - platform_device_register(&glamo_cmdq_dev); - - /* Frambuffer device */ - glamo_fb_dev.dev.parent = &pdev->dev; - glamo_fb_dev.dev.platform_data = glamo->pdata; - mangle_mem_resources(glamo_fb_dev.resource, - glamo_fb_dev.num_resources, glamo->mem); - platform_device_register(&glamo_fb_dev); + glamo_graphics_dev.dev.parent = &pdev->dev; + glamo_graphics_dev.dev.platform_data = glamo; + mangle_mem_resources(glamo_graphics_dev.resource, + glamo_graphics_dev.num_resources, glamo->mem); + platform_device_register(&glamo_graphics_dev); /* GPIO */ glamo->pdata->spigpio_info->glamo = glamo; @@ -1325,8 +1308,10 @@ static int glamo_remove(struct platform_device *pdev) } platform_set_drvdata(pdev, NULL); - platform_device_unregister(&glamo_fb_dev); platform_device_unregister(glamo->pdata->mmc_dev); + /* FIXME: Don't we need to unregister these as well? + * platform_device_unregister(glamo->pdata->graphics_dev); + * platform_device_unregister(glamo->pdata->gpio_dev); */ iounmap(glamo->base); release_mem_region(glamo->mem->start, GLAMO_REGOFS_VIDCAP); glamo_handle = NULL; 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; } diff --git a/drivers/mfd/glamo/glamo-display.h b/drivers/mfd/glamo/glamo-display.h index 6d8d43cbcfb..c8f526d747d 100644 --- a/drivers/mfd/glamo/glamo-display.h +++ b/drivers/mfd/glamo/glamo-display.h @@ -1,4 +1,4 @@ -/* Smedia Glamo 336x/337x display +/* Smedia Glamo 336x/337x Display * * Copyright (c) 2008-2009 Thomas White * @@ -27,4 +27,9 @@ extern int glamo_display_init(struct drm_device *dev); +extern int glamo_framebuffer_create(struct drm_device *dev, + struct drm_mode_fb_cmd *mode_cmd, + struct drm_framebuffer **fb, + struct drm_gem_object *obj); + #endif /* __GLAMO_DISPLAY_H */ diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index a2303ce1d7e..dbcb8eb4ab5 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -1,4 +1,4 @@ -/* Smedia Glamo 336x/337x driver +/* Smedia Glamo 336x/337x Graphics Driver * * Copyright (C) 2009 Openmoko, Inc. Jorge Luis Zapata * Copyright (C) 2008-2009 Thomas White @@ -36,7 +36,7 @@ #define DRIVER_AUTHOR "Openmoko, Inc." #define DRIVER_NAME "glamo-drm" #define DRIVER_DESC "SMedia Glamo 3362" -#define DRIVER_DATE "20090426" +#define DRIVER_DATE "20090614" #define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1) @@ -130,7 +130,6 @@ static void glamodrm_master_destroy(struct drm_device *dev, static int glamodrm_load(struct drm_device *dev, unsigned long flags) { struct glamodrm_handle *gdrm; - gdrm = dev->dev_private; glamo_buffer_init(gdrm); @@ -200,7 +199,7 @@ static int glamodrm_probe(struct platform_device *pdev) int rc; struct glamodrm_handle *gdrm; - printk(KERN_INFO "[glamo-drm] SMedia Glamo Direct Rendering Support\n"); + printk(KERN_CRIT "[glamo-drm] SMedia Glamo Direct Rendering Support\n"); gdrm = kmalloc(sizeof(*gdrm), GFP_KERNEL); if ( !gdrm ) @@ -271,15 +270,41 @@ static int glamodrm_probe(struct platform_device *pdev) goto out_release_vram; } + /* Find the LCD controller */ + gdrm->lcd_regs = platform_get_resource(pdev, IORESOURCE_MEM, 3); + if ( !gdrm->lcd_regs ) { + dev_err(&pdev->dev, "Unable to find LCD registers.\n"); + rc = -ENOENT; + goto out_unmap_cmdq; + } + gdrm->lcd_regs = request_mem_region(gdrm->lcd_regs->start, + RESSIZE(gdrm->lcd_regs), + pdev->name); + if ( !gdrm->lcd_regs ) { + dev_err(&pdev->dev, "failed to request VRAM region\n"); + rc = -ENOENT; + goto out_release_lcd; + } + gdrm->lcd_base = ioremap(gdrm->lcd_regs->start, RESSIZE(gdrm->lcd_regs)); + if ( !gdrm->lcd_base ) { + dev_err(&pdev->dev, "failed to ioremap() VRAM\n"); + rc = -ENOENT; + goto out_release_lcd; + } + gdrm->vram_size = GLAMO_FB_SIZE; printk(KERN_INFO "[glamo-drm] %lli bytes of VRAM\n", - (long long int)gdrm->vram_size); + (long long int)gdrm->vram_size); /* Initialise DRM */ drm_platform_init(&glamodrm_drm_driver, pdev, (void *)gdrm); return 0; +out_release_lcd: + release_mem_region(gdrm->lcd_regs->start, RESSIZE(gdrm->lcd_regs)); +out_unmap_cmdq: + iounmap(gdrm->cmdq_base); out_release_cmdq: release_mem_region(gdrm->cmdq->start, RESSIZE(gdrm->cmdq)); out_unmap_vram: @@ -344,7 +369,7 @@ static struct platform_driver glamodrm_driver = { .suspend = glamodrm_suspend, .resume = glamodrm_resume, .driver = { - .name = "glamo-cmdq", + .name = "glamo-graphics", .owner = THIS_MODULE, }, }; diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h index 835b65bc8cd..ae65d10a19c 100644 --- a/drivers/mfd/glamo/glamo-drm-private.h +++ b/drivers/mfd/glamo/glamo-drm-private.h @@ -52,6 +52,10 @@ struct glamodrm_handle { struct resource *cmdq; char __iomem *cmdq_base; + /* LCD controller registers */ + struct resource *lcd_regs; + char __iomem *lcd_base; + ssize_t vram_size; /* Memory management */ @@ -68,6 +72,10 @@ struct drm_glamo_gem_object { struct glamo_crtc { struct drm_crtc base; + struct glamodrm_handle *gdrm; + /* a mode_set for fbdev users on this crtc */ + struct drm_mode_set mode_set; + int blank_mode; }; diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c new file mode 100644 index 00000000000..4a7c551c37d --- /dev/null +++ b/drivers/mfd/glamo/glamo-kms-fb.c @@ -0,0 +1,561 @@ +/* + * SMedia Glamo 336x/337x KMS Framebuffer + * + * Copyright (C) 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 + * 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 + * + * + * Based on intel_fb.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 + * + */ + + +#include +#include +#include +#include + +#include "glamo-core.h" +#include "glamo-drm-private.h" +#include "glamo-regs.h" +#include "glamo-display.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]; +}; + + +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); +} + + +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 int glamofb_setcolreg(unsigned regno, unsigned red, unsigned green, + unsigned blue, unsigned transp, + struct fb_info *info) +{ + struct glamofb_par *par = info->par; + struct drm_device *dev = par->dev; + struct drm_crtc *crtc; + int i; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc); + struct drm_mode_set *modeset = &glamo_crtc->mode_set; + struct drm_framebuffer *fb = modeset->fb; + + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + if (i == par->crtc_count) + continue; + + + if (regno > 255) + return 1; + + if (regno < 16) { + switch (fb->depth) { + case 15: + fb->pseudo_palette[regno] = ((red & 0xf800) >> 1) | + ((green & 0xf800) >> 6) | + ((blue & 0xf800) >> 11); + break; + case 16: + fb->pseudo_palette[regno] = (red & 0xf800) | + ((green & 0xfc00) >> 5) | + ((blue & 0xf800) >> 11); + break; + case 24: + case 32: + fb->pseudo_palette[regno] = ((red & 0xff00) << 8) | + (green & 0xff00) | + ((blue & 0xff00) >> 8); + break; + } + } + } + return 0; +} + +static int glamofb_check_var(struct fb_var_screeninfo *var, + struct fb_info *info) +{ + struct glamofb_par *par = info->par; + struct glamo_framebuffer *glamo_fb = par->glamo_fb; + struct drm_framebuffer *fb = &glamo_fb->base; + int depth; + + if (var->pixclock == -1 || !var->pixclock) + return -EINVAL; + + /* Need to resize the fb object !!! */ + if (var->xres > fb->width || var->yres > fb->height) { + DRM_ERROR("Requested width/height is greater than current fb object %dx%d > %dx%d\n",var->xres,var->yres,fb->width,fb->height); + DRM_ERROR("Need resizing code.\n"); + return -EINVAL; + } + + switch (var->bits_per_pixel) { + case 16: + depth = (var->green.length == 6) ? 16 : 15; + break; + case 32: + depth = (var->transp.length > 0) ? 32 : 24; + break; + default: + depth = var->bits_per_pixel; + break; + } + + switch (depth) { + case 16: + var->red.offset = 11; + var->green.offset = 5; + var->blue.offset = 0; + var->red.length = 5; + var->green.length = 6; + var->blue.length = 5; + var->transp.length = 0; + var->transp.offset = 0; + break; + default: + return -EINVAL; + } + + return 0; +} + +/* this will let fbcon do the mode init */ +/* FIXME: take mode config lock? */ +static int glamofb_set_par(struct fb_info *info) +{ + struct glamofb_par *par = info->par; + struct drm_device *dev = par->dev; + struct fb_var_screeninfo *var = &info->var; + int i; + + DRM_DEBUG("%d %d\n", var->xres, var->pixclock); + + if (var->pixclock != -1) { + + DRM_ERROR("PIXEL CLOCK SET\n"); + return -EINVAL; + } else { + struct drm_crtc *crtc; + int ret; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct glamo_crtc *glamo_crtc = to_glamo_crtc(crtc); + + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + if (i == par->crtc_count) + continue; + + if (crtc->fb == glamo_crtc->mode_set.fb) { + mutex_lock(&dev->mode_config.mutex); + ret = crtc->funcs->set_config(&glamo_crtc->mode_set); + mutex_unlock(&dev->mode_config.mutex); + if (ret) + return ret; + } + } + return 0; + } +} + +static int glamofb_pan_display(struct fb_var_screeninfo *var, + struct fb_info *info) +{ + struct glamofb_par *par = info->par; + struct drm_device *dev = par->dev; + struct drm_mode_set *modeset; + struct drm_crtc *crtc; + struct glamo_crtc *glamo_crtc; + int ret = 0; + int i; + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + if (i == par->crtc_count) + continue; + + glamo_crtc = to_glamo_crtc(crtc); + modeset = &glamo_crtc->mode_set; + + modeset->x = var->xoffset; + modeset->y = var->yoffset; + + if (modeset->num_connectors) { + mutex_lock(&dev->mode_config.mutex); + ret = crtc->funcs->set_config(modeset); + mutex_unlock(&dev->mode_config.mutex); + if (!ret) { + info->var.xoffset = var->xoffset; + info->var.yoffset = var->yoffset; + } + } + } + + return ret; +} + +static void glamofb_on(struct fb_info *info) +{ + struct glamofb_par *par = info->par; + struct drm_device *dev = par->dev; + struct drm_crtc *crtc; + struct drm_encoder *encoder; + int i; + + /* + * For each CRTC in this fb, find all associated encoders + * and turn them off, then turn off the CRTC. + */ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON); + + /* Found a CRTC on this fb, now find encoders */ + list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { + if (encoder->crtc == crtc) { + struct drm_encoder_helper_funcs *encoder_funcs; + encoder_funcs = encoder->helper_private; + encoder_funcs->dpms(encoder, DRM_MODE_DPMS_ON); + } + } + } +} + +static void glamofb_off(struct fb_info *info, int dpms_mode) +{ + struct glamofb_par *par = info->par; + struct drm_device *dev = par->dev; + struct drm_crtc *crtc; + struct drm_encoder *encoder; + int i; + + /* + * For each CRTC in this fb, find all associated encoders + * and turn them off, then turn off the CRTC. + */ + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { + struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; + + for (i = 0; i < par->crtc_count; i++) + if (crtc->base.id == par->crtc_ids[i]) + break; + + /* Found a CRTC on this fb, now find encoders */ + list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { + if (encoder->crtc == crtc) { + struct drm_encoder_helper_funcs *encoder_funcs; + encoder_funcs = encoder->helper_private; + encoder_funcs->dpms(encoder, dpms_mode); + } + } + if (dpms_mode == DRM_MODE_DPMS_OFF) + crtc_funcs->dpms(crtc, dpms_mode); + } +} + +static int glamofb_blank(int blank, struct fb_info *info) +{ + switch (blank) { + case FB_BLANK_UNBLANK: + glamofb_on(info); + break; + case FB_BLANK_NORMAL: + glamofb_off(info, DRM_MODE_DPMS_STANDBY); + break; + case FB_BLANK_HSYNC_SUSPEND: + glamofb_off(info, DRM_MODE_DPMS_STANDBY); + break; + case FB_BLANK_VSYNC_SUSPEND: + glamofb_off(info, DRM_MODE_DPMS_SUSPEND); + break; + case FB_BLANK_POWERDOWN: + glamofb_off(info, DRM_MODE_DPMS_OFF); + break; + } + return 0; +} + +static struct fb_ops glamofb_ops = { + .owner = THIS_MODULE, + .fb_check_var = glamofb_check_var, + .fb_set_par = glamofb_set_par, + .fb_setcolreg = glamofb_setcolreg, + .fb_fillrect = cfb_fillrect, + .fb_copyarea = cfb_copyarea, + .fb_imageblit = cfb_imageblit, + .fb_pan_display = glamofb_pan_display, + .fb_blank = glamofb_blank, +}; + + +/* Here, we create a GEM object of the correct size, and then turn it into + * /dev/fbX so that the kernel can put a console on it. */ +int glamofb_create(struct drm_device *dev, uint32_t fb_width, + uint32_t fb_height, uint32_t surface_width, + uint32_t surface_height, + struct glamo_framebuffer **glamo_fb_p) +{ + struct fb_info *info; + struct glamofb_par *par; + struct drm_framebuffer *fb; + struct glamo_framebuffer *glamo_fb; + struct drm_mode_fb_cmd mode_cmd; + struct drm_gem_object *fbo = NULL; + struct drm_glamo_gem_object *obj_priv; + struct device *device = &dev->pdev->dev; + struct glamodrm_handle *gdrm; + int size, ret; + + printk(KERN_ERR "1\n"); + + gdrm = dev->dev_private; + + mode_cmd.width = surface_width; + mode_cmd.height = surface_height; + + mode_cmd.bpp = 2; + mode_cmd.pitch = ALIGN(mode_cmd.width * ((mode_cmd.bpp + 1) / 8), 64); + mode_cmd.depth = 16; + + printk(KERN_ERR "2\n"); + size = mode_cmd.pitch * mode_cmd.height; + size = ALIGN(size, PAGE_SIZE); + fbo = drm_gem_object_alloc(dev, size); + printk(KERN_ERR "3\n"); + if (!fbo) { + printk(KERN_ERR "failed to allocate framebuffer\n"); + ret = -ENOMEM; + goto out; + } + obj_priv = fbo->driver_private; + printk(KERN_ERR "4\n"); + + mutex_lock(&dev->struct_mutex); + + ret = glamo_framebuffer_create(dev, &mode_cmd, &fb, fbo); + printk(KERN_ERR "5\n"); + if (ret) { + DRM_ERROR("failed to allocate fb.\n"); + goto out_unref; + } + printk(KERN_ERR "6\n"); + + list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list); + + glamo_fb = to_glamo_framebuffer(fb); + *glamo_fb_p = glamo_fb; + + printk(KERN_ERR "7\n"); + info = framebuffer_alloc(sizeof(struct glamofb_par), device); + printk(KERN_ERR "8\n"); + if (!info) { + ret = -ENOMEM; + goto out_unref; + } + printk(KERN_ERR "9\n"); + + par = info->par; + + strcpy(info->fix.id, "glamodrmfb"); + info->fix.type = FB_TYPE_PACKED_PIXELS; + info->fix.visual = FB_VISUAL_TRUECOLOR; + info->fix.type_aux = 0; + 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.type_aux = 0; + printk(KERN_ERR "10\n"); + info->flags = FBINFO_DEFAULT; + + info->fbops = &glamofb_ops; + + info->fix.line_length = fb->pitch; + info->fix.smem_start = dev->mode_config.fb_base + + (unsigned long) gdrm->vram->start; + info->fix.smem_len = size; + + info->flags = FBINFO_DEFAULT; + + info->screen_base = ioremap_wc(gdrm->vram->start, size); + if (!info->screen_base) { + printk(KERN_ERR "[glamo-drm] Couldn't map framebuffer!\n"); + ret = -ENOSPC; + goto out_unref; + } + info->screen_size = size; + + info->pseudo_palette = fb->pseudo_palette; + info->var.xres_virtual = fb->width; + info->var.yres_virtual = fb->height; + info->var.bits_per_pixel = fb->bits_per_pixel; + info->var.xoffset = 0; + info->var.yoffset = 0; + info->var.activate = FB_ACTIVATE_NOW; + info->var.height = -1; + info->var.width = -1; + printk(KERN_ERR "11\n"); + info->var.xres = fb_width; + info->var.yres = fb_height; + + info->fix.mmio_start = 0; + info->fix.mmio_len = 0; + + info->pixmap.size = 64*1024; + info->pixmap.buf_align = 8; + info->pixmap.access_align = 32; + info->pixmap.flags = FB_PIXMAP_SYSTEM; + info->pixmap.scan_align = 1; + + switch (fb->depth) { + case 16: + switch (reg_read(gdrm, GLAMO_REG_LCD_MODE3) & 0xc000) { + case GLAMO_LCD_SRC_RGB565: + info->var.red.offset = 11; + info->var.green.offset = 5; + info->var.blue.offset = 0; + info->var.red.length = 5; + info->var.green.length = 6; + info->var.blue.length = 5; + info->var.transp.length = 0; + break; + case GLAMO_LCD_SRC_ARGB1555: + info->var.transp.offset = 15; + info->var.red.offset = 10; + info->var.green.offset = 5; + info->var.blue.offset = 0; + info->var.transp.length = 1; + info->var.red.length = 5; + info->var.green.length = 5; + info->var.blue.length = 5; + break; + case GLAMO_LCD_SRC_ARGB4444: + info->var.transp.offset = 12; + info->var.red.offset = 8; + info->var.green.offset = 4; + info->var.blue.offset = 0; + info->var.transp.length = 4; + info->var.red.length = 4; + info->var.green.length = 4; + info->var.blue.length = 4; + break; + } + break; + case 24: + case 32: + default: + /* The Smedia Glamo doesn't support anything but 16bit color */ + printk(KERN_ERR + "Smedia driver does not [yet?] support 24/32bpp\n"); + return -EINVAL; + } + + fb->fbdev = info; +printk(KERN_ERR "12\n"); + par->glamo_fb = glamo_fb; + par->dev = dev; + + /* To allow resizeing without swapping buffers */ + printk("allocated %dx%d fb: bo %p\n", glamo_fb->base.width, + glamo_fb->base.height, fbo); +printk(KERN_ERR "13\n"); + mutex_unlock(&dev->struct_mutex); + return 0; + +out_unref: + printk(KERN_ERR "14\n"); + drm_gem_object_unreference(fbo); + printk(KERN_ERR "15\n"); + mutex_unlock(&dev->struct_mutex); + printk(KERN_ERR "16\n"); +out: + printk(KERN_ERR "7\n"); + return ret; +} + diff --git a/drivers/mfd/glamo/glamo-kms-fb.h b/drivers/mfd/glamo/glamo-kms-fb.h new file mode 100644 index 00000000000..f98bf6540aa --- /dev/null +++ b/drivers/mfd/glamo/glamo-kms-fb.h @@ -0,0 +1,37 @@ +/* + * SMedia Glamo 336x/337x KMS framebuffer + * + * Copyright (C) 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 + * 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 + * + */ + +#ifndef __GLAMO_KMS_FB_H +#define __GLAMO_KMS_FB_H + +#include + +extern int glamofb_create(struct drm_device *dev, uint32_t fb_width, + uint32_t fb_height, uint32_t surface_width, + uint32_t surface_height, + struct glamo_framebuffer **glamo_fb_p); + +#endif /* __GLAMO_KMS_FB_H */ -- 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-buffer.c | 54 ++++++++++++++++++++++++----------- drivers/mfd/glamo/glamo-buffer.h | 3 ++ drivers/mfd/glamo/glamo-display.c | 59 +++++++++++++++++++++++++++++++++++++-- drivers/mfd/glamo/glamo-drm-drv.c | 16 +++++------ drivers/mfd/glamo/glamo-kms-fb.c | 47 +++++++------------------------ 5 files changed, 115 insertions(+), 64 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-buffer.c b/drivers/mfd/glamo/glamo-buffer.c index 945824a1b15..9f19c454477 100644 --- a/drivers/mfd/glamo/glamo-buffer.c +++ b/drivers/mfd/glamo/glamo-buffer.c @@ -27,49 +27,70 @@ #include "glamo-drm-private.h" -int glamo_ioctl_gem_create(struct drm_device *dev, void *data, - struct drm_file *file_priv) +struct drm_gem_object *glamo_gem_object_alloc(struct drm_device *dev, int size, + int alignment) { - struct drm_glamo_gem_create *args = data; struct drm_gem_object *obj; struct glamodrm_handle *gdrm; struct drm_glamo_gem_object *gobj; - int handle, ret; gdrm = dev->dev_private; - args->size = roundup(args->size, PAGE_SIZE); + size = roundup(size, PAGE_SIZE); - obj = drm_gem_object_alloc(dev, args->size); - if (obj == NULL) return -ENOMEM; + obj = drm_gem_object_alloc(dev, size); + if (obj == NULL) return NULL; gobj = obj->driver_private; /* Allocate memory for this object in VRAM */ - gobj->block = drm_mm_search_free(gdrm->mmgr, args->size, - args->alignment, 1); + gobj->block = drm_mm_search_free(gdrm->mmgr, size, alignment, 1); if (!gobj->block) { - ret = -ENOMEM; goto fail; } - gobj->block = drm_mm_get_block(gobj->block, args->size, - args->alignment); + gobj->block = drm_mm_get_block(gobj->block, size, alignment); if (!gobj->block) { - ret = -ENOMEM; goto fail; } + return obj; + +fail: + mutex_lock(&dev->struct_mutex); + drm_gem_object_unreference(obj); + mutex_unlock(&dev->struct_mutex); + printk(KERN_INFO "[glamo-drm] Failed to allocate object\n"); + + return NULL; +} + + +int glamo_ioctl_gem_create(struct drm_device *dev, void *data, + struct drm_file *file_priv) +{ + struct drm_glamo_gem_create *args = data; + struct drm_gem_object *obj; + struct drm_glamo_gem_object *gobj; + int handle, ret; + + /* Create an object */ + obj = glamo_gem_object_alloc(dev, args->size, args->alignment); + if ( obj == NULL ) return -ENOMEM; + + /* Create a handle for it */ ret = drm_gem_handle_create(file_priv, obj, &handle); mutex_lock(&dev->struct_mutex); drm_gem_object_handle_unreference(obj); mutex_unlock(&dev->struct_mutex); - if (ret) goto fail; - + + /* Watchpoint */ + gobj = obj->driver_private; printk(KERN_INFO "[glamo-drm] GEM object %i: %li bytes at 0x%lx\n", handle, gobj->block->size, gobj->block->start); + + /* Return */ args->handle = handle; - return 0; fail: @@ -77,7 +98,6 @@ fail: drm_gem_object_unreference(obj); mutex_unlock(&dev->struct_mutex); printk(KERN_INFO "[glamo-drm] Failed to allocate object\n"); - return ret; } diff --git a/drivers/mfd/glamo/glamo-buffer.h b/drivers/mfd/glamo/glamo-buffer.h index 7d87e428d79..41f18fd7989 100644 --- a/drivers/mfd/glamo/glamo-buffer.h +++ b/drivers/mfd/glamo/glamo-buffer.h @@ -36,6 +36,9 @@ extern int glamodrm_gem_init_object(struct drm_gem_object *obj); extern void glamodrm_gem_free_object(struct drm_gem_object *obj); +extern struct drm_gem_object *glamo_gem_object_alloc(struct drm_device *dev, + int size, int alignment); + extern int glamo_ioctl_gem_create(struct drm_device *dev, void *data, struct drm_file *file_priv); 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; } diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index dbcb8eb4ab5..b389325235c 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -263,12 +263,12 @@ static int glamodrm_probe(struct platform_device *pdev) rc = -ENOENT; goto out_unmap_regs; } - gdrm->vram_base = ioremap(gdrm->vram->start, RESSIZE(gdrm->vram)); - if ( !gdrm->vram_base ) { - dev_err(&pdev->dev, "failed to ioremap() VRAM\n"); - rc = -ENOENT; - goto out_release_vram; - } +// gdrm->vram_base = ioremap(gdrm->vram->start, RESSIZE(gdrm->vram)); +// if ( !gdrm->vram_base ) { +// dev_err(&pdev->dev, "failed to ioremap() VRAM\n"); +// rc = -ENOENT; +// goto out_release_vram; +// } /* Find the LCD controller */ gdrm->lcd_regs = platform_get_resource(pdev, IORESOURCE_MEM, 3); @@ -308,7 +308,7 @@ out_unmap_cmdq: out_release_cmdq: release_mem_region(gdrm->cmdq->start, RESSIZE(gdrm->cmdq)); out_unmap_vram: - iounmap(gdrm->vram_base); +// iounmap(gdrm->vram_base); out_release_vram: release_mem_region(gdrm->vram->start, RESSIZE(gdrm->vram)); out_unmap_regs: @@ -335,7 +335,7 @@ static int glamodrm_remove(struct platform_device *pdev) release_mem_region(gdrm->reg->start, RESSIZE(gdrm->reg)); /* Release VRAM */ - iounmap(gdrm->vram_base); +// iounmap(gdrm->vram_base); release_mem_region(gdrm->vram->start, RESSIZE(gdrm->vram)); /* Release command queue */ diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c index 4a7c551c37d..440863dc1b4 100644 --- a/drivers/mfd/glamo/glamo-kms-fb.c +++ b/drivers/mfd/glamo/glamo-kms-fb.c @@ -62,6 +62,7 @@ #include "glamo-drm-private.h" #include "glamo-regs.h" #include "glamo-display.h" +#include "glamo-buffer.h" struct glamofb_par { @@ -85,19 +86,6 @@ static int reg_read(struct glamodrm_handle *gdrm, u_int16_t reg) } -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 int glamofb_setcolreg(unsigned regno, unsigned red, unsigned green, unsigned blue, unsigned transp, struct fb_info *info) @@ -374,6 +362,9 @@ static struct fb_ops glamofb_ops = { }; +#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1) + + /* Here, we create a GEM object of the correct size, and then turn it into * /dev/fbX so that the kernel can put a console on it. */ int glamofb_create(struct drm_device *dev, uint32_t fb_width, @@ -392,8 +383,6 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, struct glamodrm_handle *gdrm; int size, ret; - printk(KERN_ERR "1\n"); - gdrm = dev->dev_private; mode_cmd.width = surface_width; @@ -403,43 +392,35 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, mode_cmd.pitch = ALIGN(mode_cmd.width * ((mode_cmd.bpp + 1) / 8), 64); mode_cmd.depth = 16; - printk(KERN_ERR "2\n"); size = mode_cmd.pitch * mode_cmd.height; size = ALIGN(size, PAGE_SIZE); - fbo = drm_gem_object_alloc(dev, size); - printk(KERN_ERR "3\n"); + fbo = glamo_gem_object_alloc(dev, size, 2); if (!fbo) { printk(KERN_ERR "failed to allocate framebuffer\n"); ret = -ENOMEM; goto out; } obj_priv = fbo->driver_private; - printk(KERN_ERR "4\n"); - + mutex_lock(&dev->struct_mutex); ret = glamo_framebuffer_create(dev, &mode_cmd, &fb, fbo); - printk(KERN_ERR "5\n"); if (ret) { DRM_ERROR("failed to allocate fb.\n"); goto out_unref; } - printk(KERN_ERR "6\n"); - + list_add(&fb->filp_head, &dev->mode_config.fb_kernel_list); glamo_fb = to_glamo_framebuffer(fb); *glamo_fb_p = glamo_fb; - printk(KERN_ERR "7\n"); info = framebuffer_alloc(sizeof(struct glamofb_par), device); - printk(KERN_ERR "8\n"); if (!info) { ret = -ENOMEM; goto out_unref; } - printk(KERN_ERR "9\n"); - + par = info->par; strcpy(info->fix.id, "glamodrmfb"); @@ -451,7 +432,6 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, info->fix.ywrapstep = 0; info->fix.accel = FB_ACCEL_I830; info->fix.type_aux = 0; - printk(KERN_ERR "10\n"); info->flags = FBINFO_DEFAULT; info->fbops = &glamofb_ops; @@ -463,7 +443,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, info->flags = FBINFO_DEFAULT; - info->screen_base = ioremap_wc(gdrm->vram->start, size); + info->screen_base = ioremap(gdrm->vram->start, RESSIZE(gdrm->vram)); if (!info->screen_base) { printk(KERN_ERR "[glamo-drm] Couldn't map framebuffer!\n"); ret = -ENOSPC; @@ -480,7 +460,6 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, info->var.activate = FB_ACTIVATE_NOW; info->var.height = -1; info->var.width = -1; - printk(KERN_ERR "11\n"); info->var.xres = fb_width; info->var.yres = fb_height; @@ -495,7 +474,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, switch (fb->depth) { case 16: - switch (reg_read(gdrm, GLAMO_REG_LCD_MODE3) & 0xc000) { + switch (reg_read(gdrm, GLAMO_REG_LCD_MODE3) & 0xc000) { /* FIXME */ case GLAMO_LCD_SRC_RGB565: info->var.red.offset = 11; info->var.green.offset = 5; @@ -537,25 +516,19 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, } fb->fbdev = info; -printk(KERN_ERR "12\n"); par->glamo_fb = glamo_fb; par->dev = dev; /* To allow resizeing without swapping buffers */ printk("allocated %dx%d fb: bo %p\n", glamo_fb->base.width, glamo_fb->base.height, fbo); -printk(KERN_ERR "13\n"); mutex_unlock(&dev->struct_mutex); return 0; out_unref: - printk(KERN_ERR "14\n"); drm_gem_object_unreference(fbo); - printk(KERN_ERR "15\n"); mutex_unlock(&dev->struct_mutex); - printk(KERN_ERR "16\n"); out: - printk(KERN_ERR "7\n"); return ret; } -- cgit v1.2.3 From 0ed944174340f21b68f47c06919e7762803dc0fb Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 24 Jun 2009 19:23:07 +0100 Subject: This is not a PCI device pdev -> platform_dev Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-kms-fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c index 440863dc1b4..7523af3b54a 100644 --- a/drivers/mfd/glamo/glamo-kms-fb.c +++ b/drivers/mfd/glamo/glamo-kms-fb.c @@ -379,7 +379,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, struct drm_mode_fb_cmd mode_cmd; struct drm_gem_object *fbo = NULL; struct drm_glamo_gem_object *obj_priv; - struct device *device = &dev->pdev->dev; + struct device *device = &dev->platform_dev->dev; struct glamodrm_handle *gdrm; int size, ret; -- 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-buffer.c | 1 + drivers/mfd/glamo/glamo-display.c | 9 ++++++--- drivers/mfd/glamo/glamo-kms-fb.c | 9 +++++---- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'drivers/mfd') 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); -- 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') 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 +++++++++++++++++------ drivers/mfd/glamo/glamo-kms-fb.c | 5 ++++- 2 files changed, 21 insertions(+), 7 deletions(-) (limited to 'drivers/mfd') 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; diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c index 2ae361c5604..918b5febfee 100644 --- a/drivers/mfd/glamo/glamo-kms-fb.c +++ b/drivers/mfd/glamo/glamo-kms-fb.c @@ -148,7 +148,8 @@ static int glamofb_check_var(struct fb_var_screeninfo *var, /* Need to resize the fb object !!! */ if (var->xres > fb->width || var->yres > fb->height) { - DRM_ERROR("Requested width/height is greater than current fb object %dx%d > %dx%d\n",var->xres,var->yres,fb->width,fb->height); + DRM_ERROR("Cannot resize framebuffer object (%dx%d > %dx%d)\n", + var->xres,var->yres,fb->width,fb->height); DRM_ERROR("Need resizing code.\n"); return -EINVAL; } @@ -192,6 +193,8 @@ static int glamofb_set_par(struct fb_info *info) struct fb_var_screeninfo *var = &info->var; int i; + printk(KERN_CRIT "glamofb_set_par\n"); + DRM_DEBUG("%d %d\n", var->xres, var->pixclock); if (var->pixclock != -1) { -- 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 +++++++++++++++++++++++++++++++--- drivers/mfd/glamo/glamo-drm-private.h | 1 + drivers/mfd/glamo/glamo-kms-fb.c | 11 +- 3 files changed, 201 insertions(+), 22 deletions(-) (limited to 'drivers/mfd') 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; } diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h index ae65d10a19c..ec4b67c084d 100644 --- a/drivers/mfd/glamo/glamo-drm-private.h +++ b/drivers/mfd/glamo/glamo-drm-private.h @@ -88,6 +88,7 @@ struct glamo_framebuffer { struct glamo_output { struct drm_connector base; struct drm_encoder enc; + struct glamodrm_handle *gdrm; }; diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c index 918b5febfee..43adaed1ea9 100644 --- a/drivers/mfd/glamo/glamo-kms-fb.c +++ b/drivers/mfd/glamo/glamo-kms-fb.c @@ -237,6 +237,8 @@ static int glamofb_pan_display(struct fb_var_screeninfo *var, struct glamo_crtc *glamo_crtc; int ret = 0; int i; + + printk(KERN_CRIT "glamofb_pan_display\n"); list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { for (i = 0; i < par->crtc_count; i++) @@ -399,7 +401,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, size = ALIGN(size, PAGE_SIZE); fbo = glamo_gem_object_alloc(dev, size, 2); if (!fbo) { - printk(KERN_ERR "failed to allocate framebuffer\n"); + printk(KERN_ERR "[glamo-drm] Failed to allocate framebuffer\n"); ret = -ENOMEM; goto out; } @@ -513,8 +515,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, case 32: default: /* The Smedia Glamo doesn't support anything but 16bit color */ - printk(KERN_ERR - "Glamo driver does not [yet?] support 24/32bpp\n"); + printk(KERN_ERR "[glamo-drm] Only 16bpp is supported.\n"); return -EINVAL; } @@ -524,8 +525,8 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, info->var.pixclock = -1; - printk("allocated %dx%d fb: bo %p\n", glamo_fb->base.width, - glamo_fb->base.height, fbo); + printk(KERN_INFO "[glamo-drm] Allocated %dx%d fb: bo %p\n", + glamo_fb->base.width, glamo_fb->base.height, fbo); mutex_unlock(&dev->struct_mutex); return 0; -- cgit v1.2.3 From dc0edb9b1067238feb88e0fb95ca7cd6db812381 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Tue, 30 Jun 2009 17:59:52 +0100 Subject: Set gdrm->dev This was uninitialised before. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-drm-drv.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index b389325235c..2421f104035 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -206,6 +206,7 @@ static int glamodrm_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, gdrm); gdrm->glamo_core = pdev->dev.platform_data; + gdrm->dev = &pdev->dev; /* Find the command queue registers */ gdrm->reg = platform_get_resource(pdev, IORESOURCE_MEM, 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') 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') 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 89815f11b50befdcff19dc8cb862549ea057715e Mon Sep 17 00:00:00 2001 From: Thomas White Date: Wed, 1 Jul 2009 19:08:22 +0100 Subject: Compatibility glamo-drm <---> glamo-fb Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-core.c | 4 ++-- drivers/mfd/glamo/glamo-drm-drv.c | 7 +++++-- drivers/mfd/glamo/glamo-fb.c | 8 ++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 9e690b5db4b..d8ebf400180 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -202,7 +202,7 @@ static struct resource glamo_graphics_resources[] = { }; static struct platform_device glamo_graphics_dev = { - .name = "glamo-graphics", + .name = "glamo-fb", .resource = glamo_graphics_resources, .num_resources = ARRAY_SIZE(glamo_graphics_resources), }; @@ -1244,7 +1244,7 @@ static int __init glamo_probe(struct platform_device *pdev) /* Command queue device (for DRM) */ glamo_graphics_dev.dev.parent = &pdev->dev; - glamo_graphics_dev.dev.platform_data = glamo; + glamo_graphics_dev.dev.platform_data = glamo->pdata; mangle_mem_resources(glamo_graphics_dev.resource, glamo_graphics_dev.num_resources, glamo->mem); platform_device_register(&glamo_graphics_dev); diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index 2421f104035..97d058f57d6 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -26,6 +26,7 @@ #include #include #include +#include #include "glamo-core.h" #include "glamo-cmdq.h" @@ -198,6 +199,7 @@ static int glamodrm_probe(struct platform_device *pdev) { int rc; struct glamodrm_handle *gdrm; + struct glamofb_platform_data *mach_info; printk(KERN_CRIT "[glamo-drm] SMedia Glamo Direct Rendering Support\n"); @@ -205,7 +207,8 @@ static int glamodrm_probe(struct platform_device *pdev) if ( !gdrm ) return -ENOMEM; platform_set_drvdata(pdev, gdrm); - gdrm->glamo_core = pdev->dev.platform_data; + mach_info = pdev->dev.platform_data; + gdrm->glamo_core = mach_info->glamo; gdrm->dev = &pdev->dev; /* Find the command queue registers */ @@ -370,7 +373,7 @@ static struct platform_driver glamodrm_driver = { .suspend = glamodrm_suspend, .resume = glamodrm_resume, .driver = { - .name = "glamo-graphics", + .name = "glamo-fb", .owner = THIS_MODULE, }, }; diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index d9a610eeda4..95d40d25cf7 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -996,6 +996,14 @@ static int __init glamofb_probe(struct platform_device *pdev) goto out_free; } + glamofb->fb_res = request_mem_region(glamofb->fb_res->start, + mach_info->fb_mem_size, + pdev->name); + if (!glamofb->fb_res) { + dev_err(&pdev->dev, "failed to request vram region\n"); + goto out_release_reg; + } + /* we want to remap only the registers required for this core * driver. */ glamofb->base = ioremap(glamofb->reg->start, RESSIZE(glamofb->reg)); -- 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-core.c | 1 + drivers/mfd/glamo/glamo-display.c | 2 +- drivers/mfd/glamo/glamo-fb.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index d8ebf400180..9e9292b70e4 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -107,6 +107,7 @@ static struct glamo_core *glamo_handle; static inline void __reg_write(struct glamo_core *glamo, u_int16_t reg, u_int16_t val) { + printk(KERN_CRIT "Core %i -> %x\n", val, reg); writew(val, glamo->base + reg); } 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); } diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 95d40d25cf7..fcdc373ca77 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -103,7 +103,7 @@ static void reg_write(struct glamofb_handle *glamo, for (i = 0; i != 2; i++) nop(); - + printk(KERN_CRIT "LCD %i -> %x\n", val, reg); writew(val, glamo->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') 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') 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-core.c | 1 - drivers/mfd/glamo/glamo-display.c | 2 +- drivers/mfd/glamo/glamo-fb.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c index 9e9292b70e4..d8ebf400180 100644 --- a/drivers/mfd/glamo/glamo-core.c +++ b/drivers/mfd/glamo/glamo-core.c @@ -107,7 +107,6 @@ static struct glamo_core *glamo_handle; static inline void __reg_write(struct glamo_core *glamo, u_int16_t reg, u_int16_t val) { - printk(KERN_CRIT "Core %i -> %x\n", val, reg); writew(val, glamo->base + reg); } 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); } diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index fcdc373ca77..409bbf6be27 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -103,7 +103,7 @@ static void reg_write(struct glamofb_handle *glamo, for (i = 0; i != 2; i++) nop(); - printk(KERN_CRIT "LCD %i -> %x\n", val, reg); + writew(val, glamo->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') 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') 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 ++-- drivers/mfd/glamo/glamo-kms-fb.c | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'drivers/mfd') 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; } - -- cgit v1.2.3 From ab1292a80b414632d78f457b904890605244a98c Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 2 Jul 2009 22:12:01 +0100 Subject: More whitespace Fix a whitespace error introduced by the earlier debug stuff. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 409bbf6be27..95d40d25cf7 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -103,7 +103,7 @@ static void reg_write(struct glamofb_handle *glamo, for (i = 0; i != 2; i++) nop(); - + writew(val, glamo->base + reg); } -- 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-cmdq.c | 12 +++++++ drivers/mfd/glamo/glamo-cmdq.h | 2 ++ drivers/mfd/glamo/glamo-display.c | 66 +++++++++++++++++++++++++++++++++++ drivers/mfd/glamo/glamo-display.h | 6 +++- drivers/mfd/glamo/glamo-drm-drv.c | 14 +++++++- drivers/mfd/glamo/glamo-drm-private.h | 20 +++++++++++ drivers/mfd/glamo/glamo-kms-fb.c | 13 +++++++ drivers/mfd/glamo/glamo-kms-fb.h | 4 +++ 8 files changed, 135 insertions(+), 2 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c index f24d6814849..bdae9859854 100644 --- a/drivers/mfd/glamo/glamo-cmdq.c +++ b/drivers/mfd/glamo/glamo-cmdq.c @@ -385,3 +385,15 @@ int glamo_cmdq_init(struct glamodrm_handle *gdrm) return 0; } + + +void glamo_cmdq_suspend(struct glamodrm_handle *gdrm) +{ + /* Placeholder... */ +} + + +void glamo_cmdq_resume(struct glamodrm_handle *gdrm) +{ + glamo_cmdq_init(gdrm); +} diff --git a/drivers/mfd/glamo/glamo-cmdq.h b/drivers/mfd/glamo/glamo-cmdq.h index f5d5ce6ae5a..4bc6b717115 100644 --- a/drivers/mfd/glamo/glamo-cmdq.h +++ b/drivers/mfd/glamo/glamo-cmdq.h @@ -34,6 +34,8 @@ extern int glamo_ioctl_cmdbuf(struct drm_device *dev, void *data, struct drm_file *file_priv); extern int glamo_cmdq_init(struct glamodrm_handle *gdrm); +extern void glamo_cmdq_suspend(struct glamodrm_handle *gdrm); +extern void glamo_cmdq_resume(struct glamodrm_handle *gdrm); #endif /* __GLAMO_CMDQ_H */ 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); +} diff --git a/drivers/mfd/glamo/glamo-display.h b/drivers/mfd/glamo/glamo-display.h index c8f526d747d..d6f21bcb0c0 100644 --- a/drivers/mfd/glamo/glamo-display.h +++ b/drivers/mfd/glamo/glamo-display.h @@ -24,6 +24,7 @@ #define __GLAMO_DISPLAY_H #include +#include "glamo-drm-private.h" extern int glamo_display_init(struct drm_device *dev); @@ -31,5 +32,8 @@ extern int glamo_framebuffer_create(struct drm_device *dev, struct drm_mode_fb_cmd *mode_cmd, struct drm_framebuffer **fb, struct drm_gem_object *obj); - + +extern void glamo_display_suspend(struct glamodrm_handle *gdrm); +extern void glamo_display_resume(struct glamodrm_handle *gdrm); + #endif /* __GLAMO_DISPLAY_H */ diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c index 97d058f57d6..d71da8850ac 100644 --- a/drivers/mfd/glamo/glamo-drm-drv.c +++ b/drivers/mfd/glamo/glamo-drm-drv.c @@ -33,6 +33,7 @@ #include "glamo-buffer.h" #include "glamo-drm-private.h" #include "glamo-display.h" +#include "glamo-kms-fb.h" #define DRIVER_AUTHOR "Openmoko, Inc." #define DRIVER_NAME "glamo-drm" @@ -354,7 +355,14 @@ static int glamodrm_remove(struct platform_device *pdev) static int glamodrm_suspend(struct platform_device *pdev, pm_message_t state) { + struct glamodrm_handle *gdrm = platform_get_drvdata(pdev); + + glamo_kmsfb_suspend(gdrm); + glamo_display_suspend(gdrm); + glamo_cmdq_suspend(gdrm); + /* glamo_core.c will suspend the engines for us */ + return 0; } @@ -362,7 +370,11 @@ static int glamodrm_suspend(struct platform_device *pdev, pm_message_t state) static int glamodrm_resume(struct platform_device *pdev) { struct glamodrm_handle *gdrm = platform_get_drvdata(pdev); - glamo_cmdq_init(gdrm); + + glamo_cmdq_resume(gdrm); + glamo_display_resume(gdrm); + glamo_kmsfb_resume(gdrm); + return 0; } diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h index ec4b67c084d..b7a9932e6ca 100644 --- a/drivers/mfd/glamo/glamo-drm-private.h +++ b/drivers/mfd/glamo/glamo-drm-private.h @@ -37,9 +37,13 @@ struct glamodrm_handle { /* This device */ struct device *dev; + /* The parent device handle */ struct glamo_core *glamo_core; + /* Framebuffer handle for the console (i.e. /dev/fb0) */ + struct fb_info *fb; + /* Command queue registers */ struct resource *reg; char __iomem *reg_base; @@ -60,6 +64,22 @@ struct glamodrm_handle { /* Memory management */ struct drm_mm *mmgr; + + /* Saved state */ + u_int16_t saved_clock; + u_int16_t saved_width; + u_int16_t saved_height; + u_int16_t saved_pitch; + u_int16_t saved_htotal; + u_int16_t saved_hrtrst; + u_int16_t saved_hrtren; + u_int16_t saved_hdspst; + u_int16_t saved_hdspen; + u_int16_t saved_vtotal; + u_int16_t saved_vrtrst; + u_int16_t saved_vrtren; + u_int16_t saved_vdspst; + u_int16_t saved_vdspen; }; diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c index 0c828831bb0..13dce09d615 100644 --- a/drivers/mfd/glamo/glamo-kms-fb.c +++ b/drivers/mfd/glamo/glamo-kms-fb.c @@ -522,6 +522,7 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, fb->fbdev = info; par->glamo_fb = glamo_fb; par->dev = dev; + gdrm->fb = info; info->var.pixclock = -1; @@ -536,3 +537,15 @@ out_unref: out: return ret; } + + +void glamo_kmsfb_suspend(struct glamodrm_handle *gdrm) +{ + fb_set_suspend(gdrm->fb, 1); +} + + +void glamo_kmsfb_resume(struct glamodrm_handle *gdrm) +{ + fb_set_suspend(gdrm->fb, 0); +} diff --git a/drivers/mfd/glamo/glamo-kms-fb.h b/drivers/mfd/glamo/glamo-kms-fb.h index f98bf6540aa..9ae597bd366 100644 --- a/drivers/mfd/glamo/glamo-kms-fb.h +++ b/drivers/mfd/glamo/glamo-kms-fb.h @@ -28,10 +28,14 @@ #define __GLAMO_KMS_FB_H #include +#include "glamo-drm-private.h" extern int glamofb_create(struct drm_device *dev, uint32_t fb_width, uint32_t fb_height, uint32_t surface_width, uint32_t surface_height, struct glamo_framebuffer **glamo_fb_p); +extern void glamo_kmsfb_suspend(struct glamodrm_handle *gdrm); +extern void glamo_kmsfb_resume(struct glamodrm_handle *gdrm); + #endif /* __GLAMO_KMS_FB_H */ -- 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') 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 848ba5dcf46955be02a5ec249a7caacf0615fa79 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 9 Jul 2009 00:58:03 +0100 Subject: Fix resume, part 2 This removes a bogus check of var->pixclock. With KMS, this value is not relevant. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-kms-fb.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c index 13dce09d615..b0d46b39a29 100644 --- a/drivers/mfd/glamo/glamo-kms-fb.c +++ b/drivers/mfd/glamo/glamo-kms-fb.c @@ -143,9 +143,6 @@ static int glamofb_check_var(struct fb_var_screeninfo *var, struct drm_framebuffer *fb = &glamo_fb->base; int depth; - if (var->pixclock == -1 || !var->pixclock) - return -EINVAL; - /* Need to resize the fb object !!! */ if (var->xres > fb->width || var->yres > fb->height) { DRM_ERROR("Cannot resize framebuffer object (%dx%d > %dx%d)\n", -- cgit v1.2.3 From 29a463f963afcd0da83dff2dfd9f0fdc2720dc35 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 9 Jul 2009 00:59:54 +0100 Subject: Expose more memory via glamo-kms-fb This increases the amount of memory exposed via the framebuffer. This should eventually allow an fbdev-based DDX or a KMS DDX to run on the same kernel, albeit suboptimally. Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-drm-private.h | 5 +++++ drivers/mfd/glamo/glamo-kms-fb.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h index b7a9932e6ca..59030cb2313 100644 --- a/drivers/mfd/glamo/glamo-drm-private.h +++ b/drivers/mfd/glamo/glamo-drm-private.h @@ -33,6 +33,11 @@ #include "glamo-core.h" +/* Memory to allocate for the framebuffer. + * The rest is reserved for the DRM memory manager */ +#define GLAMO_FRAMEBUFFER_ALLOCATION (4*1024*1024) + + struct glamodrm_handle { /* This device */ diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c index b0d46b39a29..4a153fc4857 100644 --- a/drivers/mfd/glamo/glamo-kms-fb.c +++ b/drivers/mfd/glamo/glamo-kms-fb.c @@ -396,7 +396,12 @@ int glamofb_create(struct drm_device *dev, uint32_t fb_width, size = mode_cmd.pitch * mode_cmd.height; size = ALIGN(size, PAGE_SIZE); - fbo = glamo_gem_object_alloc(dev, size, 2); + if ( size > GLAMO_FRAMEBUFFER_ALLOCATION ) { + printk(KERN_ERR "[glamo-drm] Not enough memory for fb\n"); + ret = -ENOMEM; + goto out; + } + fbo = glamo_gem_object_alloc(dev, GLAMO_FRAMEBUFFER_ALLOCATION, 2); if (!fbo) { printk(KERN_ERR "[glamo-drm] Failed to allocate framebuffer\n"); ret = -ENOMEM; -- cgit v1.2.3 From 59c7e1e25087e77f35b2ebcf916ba3b70c4647dc Mon Sep 17 00:00:00 2001 From: Thomas White Date: Thu, 9 Jul 2009 01:03:13 +0100 Subject: Debug Just a little bit more debug information Signed-off-by: Thomas White --- drivers/mfd/glamo/glamo-kms-fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/mfd') diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c index 4a153fc4857..4d3e8977d47 100644 --- a/drivers/mfd/glamo/glamo-kms-fb.c +++ b/drivers/mfd/glamo/glamo-kms-fb.c @@ -234,8 +234,8 @@ static int glamofb_pan_display(struct fb_var_screeninfo *var, struct glamo_crtc *glamo_crtc; int ret = 0; int i; - - printk(KERN_CRIT "glamofb_pan_display\n"); + + printk(KERN_CRIT "glamofb_pan_display (%i,%i)\n", var->xoffset, var->yoffset); list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { for (i = 0; i < par->crtc_count; i++) -- 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') 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