Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2011 Texas Instruments |
| 3 | * Author: Tomi Valkeinen <tomi.valkeinen@ti.com> |
| 4 | * |
| 5 | * This program is free software; you can redistribute it and/or modify it |
| 6 | * under the terms of the GNU General Public License version 2 as published by |
| 7 | * the Free Software Foundation. |
| 8 | * |
| 9 | * This program is distributed in the hope that it will be useful, but WITHOUT |
| 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
| 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
| 12 | * more details. |
| 13 | * |
| 14 | * You should have received a copy of the GNU General Public License along with |
| 15 | * this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ |
| 17 | |
| 18 | #define DSS_SUBSYS_NAME "APPLY" |
| 19 | |
| 20 | #include <linux/kernel.h> |
| 21 | #include <linux/slab.h> |
| 22 | #include <linux/spinlock.h> |
| 23 | #include <linux/jiffies.h> |
| 24 | |
| 25 | #include <video/omapdss.h> |
| 26 | |
| 27 | #include "dss.h" |
| 28 | #include "dss_features.h" |
| 29 | |
| 30 | /* |
| 31 | * We have 4 levels of cache for the dispc settings. First two are in SW and |
| 32 | * the latter two in HW. |
| 33 | * |
| 34 | * +--------------------+ |
| 35 | * |overlay/manager_info| |
| 36 | * +--------------------+ |
| 37 | * v |
| 38 | * apply() |
| 39 | * v |
| 40 | * +--------------------+ |
| 41 | * | dss_cache | |
| 42 | * +--------------------+ |
| 43 | * v |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 44 | * write_regs() |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 45 | * v |
| 46 | * +--------------------+ |
| 47 | * | shadow registers | |
| 48 | * +--------------------+ |
| 49 | * v |
| 50 | * VFP or lcd/digit_enable |
| 51 | * v |
| 52 | * +--------------------+ |
| 53 | * | registers | |
| 54 | * +--------------------+ |
| 55 | */ |
| 56 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 57 | struct ovl_priv_data { |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 58 | /* If true, cache changed, but not written to shadow registers. Set |
| 59 | * in apply(), cleared when registers written. */ |
| 60 | bool dirty; |
| 61 | /* If true, shadow registers contain changed values not yet in real |
| 62 | * registers. Set when writing to shadow registers, cleared at |
| 63 | * VSYNC/EVSYNC */ |
| 64 | bool shadow_dirty; |
| 65 | |
| 66 | bool enabled; |
| 67 | |
| 68 | struct omap_overlay_info info; |
| 69 | |
| 70 | enum omap_channel channel; |
| 71 | |
| 72 | u32 fifo_low; |
| 73 | u32 fifo_high; |
| 74 | }; |
| 75 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 76 | struct mgr_priv_data { |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 77 | /* If true, cache changed, but not written to shadow registers. Set |
| 78 | * in apply(), cleared when registers written. */ |
| 79 | bool dirty; |
| 80 | /* If true, shadow registers contain changed values not yet in real |
| 81 | * registers. Set when writing to shadow registers, cleared at |
| 82 | * VSYNC/EVSYNC */ |
| 83 | bool shadow_dirty; |
| 84 | |
| 85 | struct omap_overlay_manager_info info; |
| 86 | |
| 87 | bool manual_update; |
| 88 | bool do_manual_update; |
| 89 | }; |
| 90 | |
| 91 | static struct { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 92 | struct ovl_priv_data ovl_priv_data_array[MAX_DSS_OVERLAYS]; |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 93 | struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS]; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 94 | |
| 95 | bool irq_enabled; |
| 96 | } dss_cache; |
| 97 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 98 | /* protects dss_cache */ |
| 99 | static spinlock_t data_lock; |
| 100 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 101 | static struct ovl_priv_data *get_ovl_priv(struct omap_overlay *ovl) |
| 102 | { |
| 103 | return &dss_cache.ovl_priv_data_array[ovl->id]; |
| 104 | } |
| 105 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 106 | static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr) |
| 107 | { |
| 108 | return &dss_cache.mgr_priv_data_array[mgr->id]; |
| 109 | } |
| 110 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 111 | void dss_apply_init(void) |
| 112 | { |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 113 | spin_lock_init(&data_lock); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 114 | } |
| 115 | |
| 116 | static bool ovl_manual_update(struct omap_overlay *ovl) |
| 117 | { |
| 118 | return ovl->manager->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE; |
| 119 | } |
| 120 | |
| 121 | static bool mgr_manual_update(struct omap_overlay_manager *mgr) |
| 122 | { |
| 123 | return mgr->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE; |
| 124 | } |
| 125 | |
| 126 | static int overlay_enabled(struct omap_overlay *ovl) |
| 127 | { |
| 128 | return ovl->info.enabled && ovl->manager && ovl->manager->device; |
| 129 | } |
| 130 | |
| 131 | int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr) |
| 132 | { |
| 133 | unsigned long timeout = msecs_to_jiffies(500); |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 134 | struct mgr_priv_data *mp; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 135 | u32 irq; |
| 136 | int r; |
| 137 | int i; |
| 138 | struct omap_dss_device *dssdev = mgr->device; |
| 139 | |
| 140 | if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) |
| 141 | return 0; |
| 142 | |
| 143 | if (mgr_manual_update(mgr)) |
| 144 | return 0; |
| 145 | |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 146 | irq = dispc_mgr_get_vsync_irq(mgr->id); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 147 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 148 | mp = get_mgr_priv(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 149 | i = 0; |
| 150 | while (1) { |
| 151 | unsigned long flags; |
| 152 | bool shadow_dirty, dirty; |
| 153 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 154 | spin_lock_irqsave(&data_lock, flags); |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 155 | dirty = mp->dirty; |
| 156 | shadow_dirty = mp->shadow_dirty; |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 157 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 158 | |
| 159 | if (!dirty && !shadow_dirty) { |
| 160 | r = 0; |
| 161 | break; |
| 162 | } |
| 163 | |
| 164 | /* 4 iterations is the worst case: |
| 165 | * 1 - initial iteration, dirty = true (between VFP and VSYNC) |
| 166 | * 2 - first VSYNC, dirty = true |
| 167 | * 3 - dirty = false, shadow_dirty = true |
| 168 | * 4 - shadow_dirty = false */ |
| 169 | if (i++ == 3) { |
| 170 | DSSERR("mgr(%d)->wait_for_go() not finishing\n", |
| 171 | mgr->id); |
| 172 | r = 0; |
| 173 | break; |
| 174 | } |
| 175 | |
| 176 | r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout); |
| 177 | if (r == -ERESTARTSYS) |
| 178 | break; |
| 179 | |
| 180 | if (r) { |
| 181 | DSSERR("mgr(%d)->wait_for_go() timeout\n", mgr->id); |
| 182 | break; |
| 183 | } |
| 184 | } |
| 185 | |
| 186 | return r; |
| 187 | } |
| 188 | |
| 189 | int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl) |
| 190 | { |
| 191 | unsigned long timeout = msecs_to_jiffies(500); |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 192 | struct ovl_priv_data *op; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 193 | struct omap_dss_device *dssdev; |
| 194 | u32 irq; |
| 195 | int r; |
| 196 | int i; |
| 197 | |
| 198 | if (!ovl->manager) |
| 199 | return 0; |
| 200 | |
| 201 | dssdev = ovl->manager->device; |
| 202 | |
| 203 | if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) |
| 204 | return 0; |
| 205 | |
| 206 | if (ovl_manual_update(ovl)) |
| 207 | return 0; |
| 208 | |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 209 | irq = dispc_mgr_get_vsync_irq(ovl->manager->id); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 210 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 211 | op = get_ovl_priv(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 212 | i = 0; |
| 213 | while (1) { |
| 214 | unsigned long flags; |
| 215 | bool shadow_dirty, dirty; |
| 216 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 217 | spin_lock_irqsave(&data_lock, flags); |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 218 | dirty = op->dirty; |
| 219 | shadow_dirty = op->shadow_dirty; |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 220 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 221 | |
| 222 | if (!dirty && !shadow_dirty) { |
| 223 | r = 0; |
| 224 | break; |
| 225 | } |
| 226 | |
| 227 | /* 4 iterations is the worst case: |
| 228 | * 1 - initial iteration, dirty = true (between VFP and VSYNC) |
| 229 | * 2 - first VSYNC, dirty = true |
| 230 | * 3 - dirty = false, shadow_dirty = true |
| 231 | * 4 - shadow_dirty = false */ |
| 232 | if (i++ == 3) { |
| 233 | DSSERR("ovl(%d)->wait_for_go() not finishing\n", |
| 234 | ovl->id); |
| 235 | r = 0; |
| 236 | break; |
| 237 | } |
| 238 | |
| 239 | r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout); |
| 240 | if (r == -ERESTARTSYS) |
| 241 | break; |
| 242 | |
| 243 | if (r) { |
| 244 | DSSERR("ovl(%d)->wait_for_go() timeout\n", ovl->id); |
| 245 | break; |
| 246 | } |
| 247 | } |
| 248 | |
| 249 | return r; |
| 250 | } |
| 251 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 252 | static int dss_ovl_write_regs(struct omap_overlay *ovl) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 253 | { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 254 | struct ovl_priv_data *op; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 255 | struct omap_overlay_info *oi; |
| 256 | bool ilace, replication; |
| 257 | int r; |
| 258 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 259 | DSSDBGF("%d", ovl->id); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 260 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 261 | op = get_ovl_priv(ovl); |
| 262 | oi = &op->info; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 263 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 264 | if (!op->enabled) { |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 265 | dispc_ovl_enable(ovl->id, 0); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 266 | return 0; |
| 267 | } |
| 268 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 269 | replication = dss_use_replication(ovl->manager->device, oi->color_mode); |
| 270 | |
| 271 | ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC; |
| 272 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 273 | dispc_ovl_set_channel_out(ovl->id, op->channel); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 274 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 275 | r = dispc_ovl_setup(ovl->id, oi, ilace, replication); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 276 | if (r) { |
| 277 | /* this shouldn't happen */ |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 278 | DSSERR("dispc_ovl_setup failed for ovl %d\n", ovl->id); |
| 279 | dispc_ovl_enable(ovl->id, 0); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 280 | return r; |
| 281 | } |
| 282 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 283 | dispc_ovl_set_fifo_threshold(ovl->id, op->fifo_low, op->fifo_high); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 284 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 285 | dispc_ovl_enable(ovl->id, 1); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 286 | |
| 287 | return 0; |
| 288 | } |
| 289 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 290 | static void dss_mgr_write_regs(struct omap_overlay_manager *mgr) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 291 | { |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 292 | struct mgr_priv_data *mp; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 293 | struct omap_overlay_manager_info *mi; |
| 294 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 295 | DSSDBGF("%d", mgr->id); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 296 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 297 | mp = get_mgr_priv(mgr); |
| 298 | mi = &mp->info; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 299 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 300 | dispc_mgr_setup(mgr->id, mi); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 301 | } |
| 302 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 303 | /* dss_write_regs() tries to write values from cache to shadow registers. |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 304 | * It writes only to those managers/overlays that are not busy. |
| 305 | * returns 0 if everything could be written to shadow registers. |
| 306 | * returns 1 if not everything could be written to shadow registers. */ |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 307 | static int dss_write_regs(void) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 308 | { |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 309 | struct omap_overlay *ovl; |
| 310 | struct omap_overlay_manager *mgr; |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 311 | struct ovl_priv_data *op; |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 312 | struct mgr_priv_data *mp; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 313 | const int num_ovls = dss_feat_get_num_ovls(); |
| 314 | const int num_mgrs = dss_feat_get_num_mgrs(); |
| 315 | int i; |
| 316 | int r; |
| 317 | bool mgr_busy[MAX_DSS_MANAGERS]; |
| 318 | bool mgr_go[MAX_DSS_MANAGERS]; |
| 319 | bool busy; |
| 320 | |
| 321 | r = 0; |
| 322 | busy = false; |
| 323 | |
| 324 | for (i = 0; i < num_mgrs; i++) { |
| 325 | mgr_busy[i] = dispc_mgr_go_busy(i); |
| 326 | mgr_go[i] = false; |
| 327 | } |
| 328 | |
| 329 | /* Commit overlay settings */ |
| 330 | for (i = 0; i < num_ovls; ++i) { |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 331 | ovl = omap_dss_get_overlay(i); |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 332 | op = get_ovl_priv(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 333 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 334 | if (!op->dirty) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 335 | continue; |
| 336 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 337 | mp = get_mgr_priv(ovl->manager); |
| 338 | |
| 339 | if (mp->manual_update && !mp->do_manual_update) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 340 | continue; |
| 341 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 342 | if (mgr_busy[op->channel]) { |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 343 | busy = true; |
| 344 | continue; |
| 345 | } |
| 346 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 347 | r = dss_ovl_write_regs(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 348 | if (r) |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 349 | DSSERR("dss_ovl_write_regs %d failed\n", i); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 350 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 351 | op->dirty = false; |
| 352 | op->shadow_dirty = true; |
| 353 | mgr_go[op->channel] = true; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 354 | } |
| 355 | |
| 356 | /* Commit manager settings */ |
| 357 | for (i = 0; i < num_mgrs; ++i) { |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 358 | mgr = omap_dss_get_overlay_manager(i); |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 359 | mp = get_mgr_priv(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 360 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 361 | if (!mp->dirty) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 362 | continue; |
| 363 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 364 | if (mp->manual_update && !mp->do_manual_update) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 365 | continue; |
| 366 | |
| 367 | if (mgr_busy[i]) { |
| 368 | busy = true; |
| 369 | continue; |
| 370 | } |
| 371 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 372 | dss_mgr_write_regs(mgr); |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 373 | mp->dirty = false; |
| 374 | mp->shadow_dirty = true; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 375 | mgr_go[i] = true; |
| 376 | } |
| 377 | |
| 378 | /* set GO */ |
| 379 | for (i = 0; i < num_mgrs; ++i) { |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 380 | mgr = omap_dss_get_overlay_manager(i); |
| 381 | mp = get_mgr_priv(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 382 | |
| 383 | if (!mgr_go[i]) |
| 384 | continue; |
| 385 | |
| 386 | /* We don't need GO with manual update display. LCD iface will |
| 387 | * always be turned off after frame, and new settings will be |
| 388 | * taken in to use at next update */ |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 389 | if (!mp->manual_update) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 390 | dispc_mgr_go(i); |
| 391 | } |
| 392 | |
| 393 | if (busy) |
| 394 | r = 1; |
| 395 | else |
| 396 | r = 0; |
| 397 | |
| 398 | return r; |
| 399 | } |
| 400 | |
| 401 | void dss_mgr_start_update(struct omap_overlay_manager *mgr) |
| 402 | { |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 403 | struct mgr_priv_data *mp = get_mgr_priv(mgr); |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 404 | struct ovl_priv_data *op; |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 405 | struct omap_overlay *ovl; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 406 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 407 | mp->do_manual_update = true; |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 408 | dss_write_regs(); |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 409 | mp->do_manual_update = false; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 410 | |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 411 | list_for_each_entry(ovl, &mgr->overlays, list) { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 412 | op = get_ovl_priv(ovl); |
| 413 | op->shadow_dirty = false; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 414 | } |
| 415 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 416 | mp->shadow_dirty = false; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 417 | |
Tomi Valkeinen | 7797c6d | 2011-11-04 10:22:46 +0200 | [diff] [blame] | 418 | dispc_mgr_enable(mgr->id, true); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 419 | } |
| 420 | |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 421 | static void dss_apply_irq_handler(void *data, u32 mask); |
| 422 | |
| 423 | static void dss_register_vsync_isr(void) |
| 424 | { |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 425 | const int num_mgrs = dss_feat_get_num_mgrs(); |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 426 | u32 mask; |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 427 | int r, i; |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 428 | |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 429 | mask = 0; |
| 430 | for (i = 0; i < num_mgrs; ++i) |
| 431 | mask |= dispc_mgr_get_vsync_irq(i); |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 432 | |
| 433 | r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask); |
| 434 | WARN_ON(r); |
| 435 | |
| 436 | dss_cache.irq_enabled = true; |
| 437 | } |
| 438 | |
| 439 | static void dss_unregister_vsync_isr(void) |
| 440 | { |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 441 | const int num_mgrs = dss_feat_get_num_mgrs(); |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 442 | u32 mask; |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 443 | int r, i; |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 444 | |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 445 | mask = 0; |
| 446 | for (i = 0; i < num_mgrs; ++i) |
| 447 | mask |= dispc_mgr_get_vsync_irq(i); |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 448 | |
| 449 | r = omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, mask); |
| 450 | WARN_ON(r); |
| 451 | |
| 452 | dss_cache.irq_enabled = false; |
| 453 | } |
| 454 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 455 | static void dss_apply_irq_handler(void *data, u32 mask) |
| 456 | { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 457 | struct omap_overlay *ovl; |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 458 | struct omap_overlay_manager *mgr; |
| 459 | struct mgr_priv_data *mp; |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 460 | struct ovl_priv_data *op; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 461 | const int num_ovls = dss_feat_get_num_ovls(); |
| 462 | const int num_mgrs = dss_feat_get_num_mgrs(); |
| 463 | int i, r; |
| 464 | bool mgr_busy[MAX_DSS_MANAGERS]; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 465 | |
| 466 | for (i = 0; i < num_mgrs; i++) |
| 467 | mgr_busy[i] = dispc_mgr_go_busy(i); |
| 468 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 469 | spin_lock(&data_lock); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 470 | |
| 471 | for (i = 0; i < num_ovls; ++i) { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 472 | ovl = omap_dss_get_overlay(i); |
| 473 | op = get_ovl_priv(ovl); |
| 474 | if (!mgr_busy[op->channel]) |
| 475 | op->shadow_dirty = false; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 476 | } |
| 477 | |
| 478 | for (i = 0; i < num_mgrs; ++i) { |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 479 | mgr = omap_dss_get_overlay_manager(i); |
| 480 | mp = get_mgr_priv(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 481 | if (!mgr_busy[i]) |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 482 | mp->shadow_dirty = false; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 483 | } |
| 484 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 485 | r = dss_write_regs(); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 486 | if (r == 1) |
| 487 | goto end; |
| 488 | |
| 489 | /* re-read busy flags */ |
| 490 | for (i = 0; i < num_mgrs; i++) |
| 491 | mgr_busy[i] = dispc_mgr_go_busy(i); |
| 492 | |
| 493 | /* keep running as long as there are busy managers, so that |
| 494 | * we can collect overlay-applied information */ |
| 495 | for (i = 0; i < num_mgrs; ++i) { |
| 496 | if (mgr_busy[i]) |
| 497 | goto end; |
| 498 | } |
| 499 | |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 500 | dss_unregister_vsync_isr(); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 501 | |
| 502 | end: |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 503 | spin_unlock(&data_lock); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 504 | } |
| 505 | |
| 506 | static int omap_dss_mgr_apply_ovl(struct omap_overlay *ovl) |
| 507 | { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 508 | struct ovl_priv_data *op; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 509 | struct omap_dss_device *dssdev; |
| 510 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 511 | op = get_ovl_priv(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 512 | |
| 513 | if (ovl->manager_changed) { |
| 514 | ovl->manager_changed = false; |
| 515 | ovl->info_dirty = true; |
| 516 | } |
| 517 | |
| 518 | if (!overlay_enabled(ovl)) { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 519 | if (op->enabled) { |
| 520 | op->enabled = false; |
| 521 | op->dirty = true; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 522 | } |
| 523 | return 0; |
| 524 | } |
| 525 | |
| 526 | if (!ovl->info_dirty) |
| 527 | return 0; |
| 528 | |
| 529 | dssdev = ovl->manager->device; |
| 530 | |
| 531 | if (dss_check_overlay(ovl, dssdev)) { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 532 | if (op->enabled) { |
| 533 | op->enabled = false; |
| 534 | op->dirty = true; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 535 | } |
| 536 | return -EINVAL; |
| 537 | } |
| 538 | |
| 539 | ovl->info_dirty = false; |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 540 | op->dirty = true; |
| 541 | op->info = ovl->info; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 542 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 543 | op->channel = ovl->manager->id; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 544 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 545 | op->enabled = true; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 546 | |
| 547 | return 0; |
| 548 | } |
| 549 | |
| 550 | static void omap_dss_mgr_apply_mgr(struct omap_overlay_manager *mgr) |
| 551 | { |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 552 | struct mgr_priv_data *mp; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 553 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 554 | mp = get_mgr_priv(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 555 | |
| 556 | if (mgr->device_changed) { |
| 557 | mgr->device_changed = false; |
| 558 | mgr->info_dirty = true; |
| 559 | } |
| 560 | |
| 561 | if (!mgr->info_dirty) |
| 562 | return; |
| 563 | |
| 564 | if (!mgr->device) |
| 565 | return; |
| 566 | |
| 567 | mgr->info_dirty = false; |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 568 | mp->dirty = true; |
| 569 | mp->info = mgr->info; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 570 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 571 | mp->manual_update = mgr_manual_update(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 572 | } |
| 573 | |
| 574 | static void omap_dss_mgr_apply_ovl_fifos(struct omap_overlay *ovl) |
| 575 | { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 576 | struct ovl_priv_data *op; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 577 | struct omap_dss_device *dssdev; |
| 578 | u32 size, burst_size; |
| 579 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 580 | op = get_ovl_priv(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 581 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 582 | if (!op->enabled) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 583 | return; |
| 584 | |
| 585 | dssdev = ovl->manager->device; |
| 586 | |
| 587 | size = dispc_ovl_get_fifo_size(ovl->id); |
| 588 | |
| 589 | burst_size = dispc_ovl_get_burst_size(ovl->id); |
| 590 | |
| 591 | switch (dssdev->type) { |
| 592 | case OMAP_DISPLAY_TYPE_DPI: |
| 593 | case OMAP_DISPLAY_TYPE_DBI: |
| 594 | case OMAP_DISPLAY_TYPE_SDI: |
| 595 | case OMAP_DISPLAY_TYPE_VENC: |
| 596 | case OMAP_DISPLAY_TYPE_HDMI: |
| 597 | default_get_overlay_fifo_thresholds(ovl->id, size, |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 598 | burst_size, &op->fifo_low, |
| 599 | &op->fifo_high); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 600 | break; |
| 601 | #ifdef CONFIG_OMAP2_DSS_DSI |
| 602 | case OMAP_DISPLAY_TYPE_DSI: |
| 603 | dsi_get_overlay_fifo_thresholds(ovl->id, size, |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 604 | burst_size, &op->fifo_low, |
| 605 | &op->fifo_high); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 606 | break; |
| 607 | #endif |
| 608 | default: |
| 609 | BUG(); |
| 610 | } |
| 611 | } |
| 612 | |
| 613 | int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) |
| 614 | { |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 615 | int r; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 616 | unsigned long flags; |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 617 | struct omap_overlay *ovl; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 618 | |
| 619 | DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name); |
| 620 | |
| 621 | r = dispc_runtime_get(); |
| 622 | if (r) |
| 623 | return r; |
| 624 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 625 | spin_lock_irqsave(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 626 | |
| 627 | /* Configure overlays */ |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 628 | list_for_each_entry(ovl, &mgr->overlays, list) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 629 | omap_dss_mgr_apply_ovl(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 630 | |
| 631 | /* Configure manager */ |
| 632 | omap_dss_mgr_apply_mgr(mgr); |
| 633 | |
| 634 | /* Configure overlay fifos */ |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 635 | list_for_each_entry(ovl, &mgr->overlays, list) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 636 | omap_dss_mgr_apply_ovl_fifos(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 637 | |
| 638 | r = 0; |
Tomi Valkeinen | 04f6643 | 2011-11-07 15:04:01 +0200 | [diff] [blame] | 639 | if (mgr->enabled && !mgr_manual_update(mgr)) { |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 640 | if (!dss_cache.irq_enabled) |
| 641 | dss_register_vsync_isr(); |
Tomi Valkeinen | 18135ea | 2011-11-04 09:35:59 +0200 | [diff] [blame] | 642 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 643 | dss_write_regs(); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 644 | } |
| 645 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame^] | 646 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 647 | |
| 648 | dispc_runtime_put(); |
| 649 | |
| 650 | return r; |
| 651 | } |
| 652 | |
Tomi Valkeinen | 7797c6d | 2011-11-04 10:22:46 +0200 | [diff] [blame] | 653 | void dss_mgr_enable(struct omap_overlay_manager *mgr) |
| 654 | { |
| 655 | dispc_mgr_enable(mgr->id, true); |
Tomi Valkeinen | be72917 | 2011-11-04 10:30:47 +0200 | [diff] [blame] | 656 | mgr->enabled = true; |
Tomi Valkeinen | 7797c6d | 2011-11-04 10:22:46 +0200 | [diff] [blame] | 657 | } |
| 658 | |
| 659 | void dss_mgr_disable(struct omap_overlay_manager *mgr) |
| 660 | { |
| 661 | dispc_mgr_enable(mgr->id, false); |
Tomi Valkeinen | be72917 | 2011-11-04 10:30:47 +0200 | [diff] [blame] | 662 | mgr->enabled = false; |
Tomi Valkeinen | 7797c6d | 2011-11-04 10:22:46 +0200 | [diff] [blame] | 663 | } |
| 664 | |