From patchwork Fri Jan 13 19:41:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 6199 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E02D223E0E for ; Fri, 13 Jan 2012 19:41:33 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id C371DA18300 for ; Fri, 13 Jan 2012 19:41:33 +0000 (UTC) Received: by bkbzu5 with SMTP id zu5so3211046bkb.11 for ; Fri, 13 Jan 2012 11:41:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer; bh=P6LGDiv2SKe9TcFr1no0JzIUrjJRwAjm+qt3mIj7rBE=; b=Wn1HX3D1BqMGF9ha56GXxOlzlWQZhsFlhWHpYkmVvvUe6g59rcN8mT5kM8vsiV968D aiVDZL0b4Rg/KHApnEK3HDFchU1YpU4ZmfbxnK/W9gc/G12daSg96LOLzS/ldvO5Mpry wt15IlDh8R1/NsSgetaiP+o7DEeuLG31mGxNg= Received: by 10.205.126.137 with SMTP id gw9mr956578bkc.135.1326483693218; Fri, 13 Jan 2012 11:41:33 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.82.144 with SMTP id ac16cs37768bkc; Fri, 13 Jan 2012 11:41:32 -0800 (PST) Received: by 10.236.175.231 with SMTP id z67mr3827529yhl.23.1326483690902; Fri, 13 Jan 2012 11:41:30 -0800 (PST) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id d50si10844801yhh.29.2012.01.13.11.41.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jan 2012 11:41:30 -0800 (PST) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.213.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by yenq2 with SMTP id q2so469493yen.37 for ; Fri, 13 Jan 2012 11:41:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=P6LGDiv2SKe9TcFr1no0JzIUrjJRwAjm+qt3mIj7rBE=; b=K8BqRVnHiWQNg3GTDYWOnN1hZXRs7NjI9HekgRA5mUm0TU6+EjrmKwarQKUCLh+0Fe 0J70VzTkAJzeG2SAbgf+862Uu1Jr/2lgKwdoVnGF2IVX/OzYZibRjMYKEw7LVk3cplHY IJrPzvojFN+ptWfLIZfr5BdwHCVw1KlruP9Pk= Received: by 10.236.182.167 with SMTP id o27mr3463289yhm.115.1326483690244; Fri, 13 Jan 2012 11:41:30 -0800 (PST) Received: from localhost (ppp-70-129-131-203.dsl.rcsntx.swbell.net. [70.129.131.203]) by mx.google.com with ESMTPS id j11sm25805178anl.8.2012.01.13.11.41.28 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jan 2012 11:41:29 -0800 (PST) Sender: Rob Clark From: Rob Clark To: linux-omap@vger.kernel.org Cc: patches@linaro.org, Tomi Valkeinen , Andy Gross , Rob Clark Subject: [PATCH] omap2+: add drm device Date: Fri, 13 Jan 2012 13:41:27 -0600 Message-Id: <1326483687-458-1-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.5.4 From: Rob Clark Register OMAP DRM/KMS platform device, and reserve a CMA region for the device to use for buffer allocation. Signed-off-by: Rob Clark --- arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/common.c | 2 + arch/arm/plat-omap/drm.c | 88 +++++++++++++++++++++++++++++++++++++++++++ arch/arm/plat-omap/drm.h | 37 ++++++++++++++++++ 4 files changed, 128 insertions(+), 1 deletions(-) create mode 100644 arch/arm/plat-omap/drm.c create mode 100644 arch/arm/plat-omap/drm.h diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 9a58461..b86e6cb 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -4,7 +4,7 @@ # Common support obj-y := common.o sram.o clock.o devices.o dma.o mux.o \ - usb.o fb.o counter_32k.o + usb.o fb.o counter_32k.o drm.o obj-m := obj-n := obj- := diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 06383b5..caf6082 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -24,6 +24,7 @@ #include +#include "drm.h" #define NO_LENGTH_CHECK 0xffffffff @@ -65,6 +66,7 @@ const void *__init omap_get_var_config(u16 tag, size_t *len) void __init omap_reserve(void) { + omapdrm_reserve_vram(); omapfb_reserve_sdram_memblock(); omap_vram_reserve_sdram_memblock(); omap_dsp_reserve_sdram_memblock(); diff --git a/arch/arm/plat-omap/drm.c b/arch/arm/plat-omap/drm.c new file mode 100644 index 0000000..5d8588f --- /dev/null +++ b/arch/arm/plat-omap/drm.c @@ -0,0 +1,88 @@ +/* + * File: arch/arm/plat-omap/drm.c + * + * DRM/KMS device registration for TI OMAP platforms + * + * Copyright (C) 2011 Texas Instruments + * Author: Rob Clark + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * 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, see . + */ + +#include +#include +#include +#include +#include +#include +#ifdef CONFIG_CMA +# include +#endif + +#include +#include + +#include "drm.h" + +/* files from staging that contain platform data structure definitions */ +#include "../../../drivers/staging/omapdrm/omap_priv.h" +#include "../../../drivers/staging/omapdrm/omap_dmm_tiler.h" + +#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE) + +static struct omap_drm_platform_data omapdrm_platdata; +static struct omap_dmm_platform_data dmm_platdata; + +static struct platform_device omap_drm_device = { + .dev = { + .coherent_dma_mask = DMA_BIT_MASK(32), + .platform_data = &omapdrm_platdata, + }, + .name = "omapdrm", + .id = 0, +}; + +static int __init omap_init_gpu(void) +{ + struct omap_hwmod *oh = NULL; + + /* lookup and populate the DMM information, if present - OMAP4+ */ + oh = omap_hwmod_lookup("dmm"); + + if (oh) { + dmm_platdata.base = omap_hwmod_get_mpu_rt_va(oh); + dmm_platdata.irq = oh->mpu_irqs[0].irq; + + if (dmm_platdata.base) + omapdrm_platdata.dmm_pdata = &dmm_platdata; + } + + return platform_device_register(&omap_drm_device); +} + +arch_initcall(omap_init_gpu); + +void omapdrm_reserve_vram(void) +{ +#ifdef CONFIG_CMA + /* Create private 32MiB contiguous memory area for omapdrm.0 device + * TODO revisit size.. if uc/wc buffers are allocated from CMA pages + * then the amount of memory we need goes up.. + */ + dma_declare_contiguous(&omap_drm_device.dev, 32*SZ_1M, 0, 0); +#else +# warning "CMA is not enabled, there may be limitations about scanout buffer allocations on OMAP3 and earlier" +#endif +} + +#endif diff --git a/arch/arm/plat-omap/drm.h b/arch/arm/plat-omap/drm.h new file mode 100644 index 0000000..56e0c0e --- /dev/null +++ b/arch/arm/plat-omap/drm.h @@ -0,0 +1,37 @@ +/* + * File: arch/arm/plat-omap/drm.c + * + * DRM/KMS device registration for TI OMAP platforms + * + * Copyright (C) 2011 Texas Instruments + * Author: Rob Clark + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published by + * the Free Software Foundation. + * + * 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, see . + */ + +#ifndef __PLAT_OMAP_DRM_H__ +#define __PLAT_OMAP_DRM_H__ + +#if defined(CONFIG_DRM_OMAP) || defined(CONFIG_DRM_OMAP_MODULE) + +void omapdrm_reserve_vram(void); + +#else + +static inline void omapdrm_reserve_vram(void) +{ +} + +#endif + +#endif /* __PLAT_OMAP_DRM_H__ */