From patchwork Thu Aug 26 12:30:27 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y@legion.dal.design.ti.com X-Patchwork-Id: 134411 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o7QCTY7s012903 for ; Thu, 26 Aug 2010 12:29:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753404Ab0HZM3d (ORCPT ); Thu, 26 Aug 2010 08:29:33 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:45697 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752456Ab0HZM3d (ORCPT ); Thu, 26 Aug 2010 08:29:33 -0400 Received: from dlep36.itg.ti.com ([157.170.170.91]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o7QCTR8X018232 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 26 Aug 2010 07:29:27 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id o7QCTPMp027799; Thu, 26 Aug 2010 07:29:25 -0500 (CDT) Received: from localhost (ubna0393844.apr.dhcp.ti.com [172.24.137.250]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o7QCTNf05260; Thu, 26 Aug 2010 07:29:23 -0500 (CDT) From: y@legion.dal.design.ti.com To: tomi.valkeinen@nokia.com Cc: linux-omap@vger.kernel.org, Archit Taneja Subject: [PATCH 1/2] OMAP: DSS2: Introduce dss_features files Date: Thu, 26 Aug 2010 18:00:27 +0530 Message-Id: <1282825828-24115-2-git-send-email-y> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1282825828-24115-1-git-send-email-y> References: <1282825828-24115-1-git-send-email-y> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 26 Aug 2010 12:29:34 +0000 (UTC) diff --git a/drivers/video/omap2/dss/dss_features.c b/drivers/video/omap2/dss/dss_features.c new file mode 100644 index 0000000..0ac18d2 --- /dev/null +++ b/drivers/video/omap2/dss/dss_features.c @@ -0,0 +1,197 @@ +/* + * linux/drivers/video/omap2/dss/dss_features.c + * + * Copyright (C) 2010 Texas Instruments + * Author: Archit Taneja + * + * 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 + +#include "dss_features.h" + +static struct list_head reg_field_list; +static int num_reg_fields; + +/* Defines a generic omap register field */ +struct dss_reg_field { + struct list_head list; + int id; + u8 start, end; +}; + +/* This struct is divided into 2 sets: the first gives a value corresponding + * to a feature, the second tells if a dss feature exists or not */ +static struct +{ + int num_mgrs; + int num_ovls; + enum omap_display_type supported_displays[MAX_DSS_MANAGERS]; + enum omap_color_mode supported_color_modes[MAX_DSS_OVERLAYS]; + + bool has_feature[MAX_DSS_FEATURES]; +} omap_dss_features; + +/* Functions to add/fetch the start and end bits of a DSS register field */ +static void dss_add_reg_field(int id, u8 start, u8 end) +{ + struct dss_reg_field *field; + field = kzalloc(sizeof(*field), GFP_KERNEL); + + ++num_reg_fields; + + field->id = id; + field->start = start; + field->end = end; + + list_add_tail(&field->list, ®_field_list); +} + +void omap_dss_get_reg_field(int id, u8 *start, u8 *end) +{ + struct dss_reg_field *field; + + list_for_each_entry(field, ®_field_list, list) { + if (field->id == id) { + *start = field->start; + *end = field->end; + return; + } + } + BUG(); +} +EXPORT_SYMBOL(omap_dss_get_reg_field); + +/* Functions returning values related to a DSS feature */ +int omap_dss_num_mgrs(void) +{ + return omap_dss_features.num_mgrs; +} +EXPORT_SYMBOL(omap_dss_num_mgrs); + +int omap_dss_num_ovls(void) +{ + return omap_dss_features.num_ovls; +} +EXPORT_SYMBOL(omap_dss_num_ovls); + +enum omap_display_type omap_dss_supported_displays(int id) +{ + return omap_dss_features.supported_displays[id]; +} +EXPORT_SYMBOL(omap_dss_supported_displays); + +enum omap_color_mode omap_dss_supported_color_modes(int id) +{ + return omap_dss_features.supported_color_modes[id]; +} +EXPORT_SYMBOL(omap_dss_supported_color_modes); + +/* DSS has_feature check */ +bool omap_dss_has_feature(int id) +{ + return omap_dss_features.has_feature[id]; +} +EXPORT_SYMBOL(omap_dss_has_feature); + +void omap_dss_features_init(void) +{ + INIT_LIST_HEAD(®_field_list); + num_reg_fields = 0; + + omap_dss_features.num_mgrs = 2; + omap_dss_features.num_ovls = 3; + + omap_dss_features.supported_displays[OMAP_DSS_CHANNEL_LCD] = + OMAP_DISPLAY_TYPE_DPI | OMAP_DISPLAY_TYPE_DBI | + OMAP_DISPLAY_TYPE_SDI | OMAP_DISPLAY_TYPE_DSI; + + omap_dss_features.supported_displays[OMAP_DSS_CHANNEL_DIGIT] = + OMAP_DISPLAY_TYPE_VENC; + + omap_dss_features.has_feature[GLOBAL_ALPHA_VIDEO1] = false; + + if (cpu_is_omap34xx()) { + omap_dss_features.supported_color_modes[OMAP_DSS_GFX] = + OMAP_DSS_COLOR_CLUT1 | OMAP_DSS_COLOR_CLUT2 | + OMAP_DSS_COLOR_CLUT4 | OMAP_DSS_COLOR_CLUT8 | + OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_ARGB16 | + OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U | + OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_ARGB32 | + OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32; + + omap_dss_features.supported_color_modes[OMAP_DSS_VIDEO1] = + OMAP_DSS_COLOR_RGB24U | OMAP_DSS_COLOR_RGB24P | + OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_RGB16 | + OMAP_DSS_COLOR_YUV2 | OMAP_DSS_COLOR_UYVY; + + omap_dss_features.supported_color_modes[OMAP_DSS_VIDEO2] = + OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_ARGB16 | + OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U | + OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_YUV2 | + OMAP_DSS_COLOR_UYVY | OMAP_DSS_COLOR_ARGB32 | + OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32; + + omap_dss_features.has_feature[GLOBAL_ALPHA] = true; + + dss_add_reg_field(FIRHINC, 12, 0); + dss_add_reg_field(FIRVINC, 28, 16); + dss_add_reg_field(FIFOLOWTHRESHOLD, 11, 0); + dss_add_reg_field(FIFOHIGHTHRESHOLD, 27, 16); + dss_add_reg_field(FIFOSIZE, 10, 0); + } else { + /* cpu_is_omap24xx() */ + omap_dss_features.supported_color_modes[OMAP_DSS_GFX] = + OMAP_DSS_COLOR_CLUT1 | OMAP_DSS_COLOR_CLUT2 | + OMAP_DSS_COLOR_CLUT4 | OMAP_DSS_COLOR_CLUT8 | + OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_RGB16 | + OMAP_DSS_COLOR_RGB24U | OMAP_DSS_COLOR_RGB24P; + + omap_dss_features.supported_color_modes[OMAP_DSS_VIDEO1] = + omap_dss_features.supported_color_modes[OMAP_DSS_VIDEO2] = + OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U | + OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_YUV2 | + OMAP_DSS_COLOR_UYVY; + + omap_dss_features.has_feature[GLOBAL_ALPHA] = false; + + dss_add_reg_field(FIRHINC, 11, 0); + dss_add_reg_field(FIRVINC, 12, 0); + dss_add_reg_field(FIFOLOWTHRESHOLD, 8, 0); + dss_add_reg_field(FIFOHIGHTHRESHOLD, 24, 16); + dss_add_reg_field(FIFOSIZE, 8, 0); + } +} +EXPORT_SYMBOL(omap_dss_features_init); + +void omap_dss_features_exit(void) +{ + /* We only need to free the register field list for now */ + struct dss_reg_field *field; + + while (!list_empty(®_field_list)) { + field = list_first_entry(®_field_list, + struct dss_reg_field, list); + list_del(&field->list); + kfree(field); + } + num_reg_fields = 0; +} +EXPORT_SYMBOL(omap_dss_features_exit); diff --git a/drivers/video/omap2/dss/dss_features.h b/drivers/video/omap2/dss/dss_features.h new file mode 100644 index 0000000..e16fa07 --- /dev/null +++ b/drivers/video/omap2/dss/dss_features.h @@ -0,0 +1,48 @@ +/* + * linux/drivers/video/omap2/dss/dss_features.h + * + * Copyright (C) 2010 Texas Instruments + * Author: Archit Taneja + * + * 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 __OMAP2_DSS_FEATURES_H +#define __OMAP2_DSS_FEATURES_H + +#define MAX_DSS_MANAGERS 2 +#define MAX_DSS_OVERLAYS 3 +#define MAX_DSS_FEATURES 10 + +/* DSS has feature id */ +#define GLOBAL_ALPHA 0 +#define GLOBAL_ALPHA_VIDEO1 1 + +/* DSS register field id */ +#define FIRHINC 0 +#define FIRVINC 1 +#define FIFOHIGHTHRESHOLD 2 +#define FIFOLOWTHRESHOLD 3 +#define FIFOSIZE 4 + +/* DSS Feature Functions */ +void omap_dss_get_reg_field(int id, u8 *start, u8 *end); +int omap_dss_num_mgrs(void); +int omap_dss_num_ovls(void); +enum omap_display_type omap_dss_supported_displays(int id); +enum omap_color_mode omap_dss_supported_color_modes(int id); + +bool omap_dss_has_feature(int id); +void omap_dss_features_init(void); +void omap_dss_features_exit(void); +#endif