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 | * +--------------------+ |
Tomi Valkeinen | d09c7aa | 2011-11-15 12:04:43 +0200 | [diff] [blame] | 41 | * | info | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 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 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 66 | struct omap_overlay_info info; |
| 67 | |
| 68 | enum omap_channel channel; |
| 69 | |
| 70 | u32 fifo_low; |
| 71 | u32 fifo_high; |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 72 | |
| 73 | bool extra_info_dirty; |
| 74 | bool shadow_extra_info_dirty; |
| 75 | |
| 76 | bool enabled; |
| 77 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 78 | }; |
| 79 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 80 | struct mgr_priv_data { |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 81 | /* If true, cache changed, but not written to shadow registers. Set |
| 82 | * in apply(), cleared when registers written. */ |
| 83 | bool dirty; |
| 84 | /* If true, shadow registers contain changed values not yet in real |
| 85 | * registers. Set when writing to shadow registers, cleared at |
| 86 | * VSYNC/EVSYNC */ |
| 87 | bool shadow_dirty; |
| 88 | |
| 89 | struct omap_overlay_manager_info info; |
| 90 | |
Tomi Valkeinen | 43a972d | 2011-11-15 15:04:25 +0200 | [diff] [blame] | 91 | /* If true, GO bit is up and shadow registers cannot be written. |
| 92 | * Never true for manual update displays */ |
| 93 | bool busy; |
| 94 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 95 | /* If true, dispc output is enabled */ |
| 96 | bool updating; |
| 97 | |
Tomi Valkeinen | bf21352 | 2011-11-15 14:43:53 +0200 | [diff] [blame] | 98 | /* If true, a display is enabled using this manager */ |
| 99 | bool enabled; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 100 | }; |
| 101 | |
| 102 | static struct { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 103 | struct ovl_priv_data ovl_priv_data_array[MAX_DSS_OVERLAYS]; |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 104 | struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS]; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 105 | |
| 106 | bool irq_enabled; |
Tomi Valkeinen | d09c7aa | 2011-11-15 12:04:43 +0200 | [diff] [blame] | 107 | } dss_data; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 108 | |
Tomi Valkeinen | d09c7aa | 2011-11-15 12:04:43 +0200 | [diff] [blame] | 109 | /* protects dss_data */ |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 110 | static spinlock_t data_lock; |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 111 | /* lock for blocking functions */ |
| 112 | static DEFINE_MUTEX(apply_lock); |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 113 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 114 | static void dss_register_vsync_isr(void); |
| 115 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 116 | static struct ovl_priv_data *get_ovl_priv(struct omap_overlay *ovl) |
| 117 | { |
Tomi Valkeinen | d09c7aa | 2011-11-15 12:04:43 +0200 | [diff] [blame] | 118 | return &dss_data.ovl_priv_data_array[ovl->id]; |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 119 | } |
| 120 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 121 | static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr) |
| 122 | { |
Tomi Valkeinen | d09c7aa | 2011-11-15 12:04:43 +0200 | [diff] [blame] | 123 | return &dss_data.mgr_priv_data_array[mgr->id]; |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 124 | } |
| 125 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 126 | void dss_apply_init(void) |
| 127 | { |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 128 | spin_lock_init(&data_lock); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 129 | } |
| 130 | |
| 131 | static bool ovl_manual_update(struct omap_overlay *ovl) |
| 132 | { |
| 133 | return ovl->manager->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE; |
| 134 | } |
| 135 | |
| 136 | static bool mgr_manual_update(struct omap_overlay_manager *mgr) |
| 137 | { |
| 138 | return mgr->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE; |
| 139 | } |
| 140 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 141 | static bool need_isr(void) |
| 142 | { |
| 143 | const int num_mgrs = dss_feat_get_num_mgrs(); |
| 144 | int i; |
| 145 | |
| 146 | for (i = 0; i < num_mgrs; ++i) { |
| 147 | struct omap_overlay_manager *mgr; |
| 148 | struct mgr_priv_data *mp; |
| 149 | struct omap_overlay *ovl; |
| 150 | |
| 151 | mgr = omap_dss_get_overlay_manager(i); |
| 152 | mp = get_mgr_priv(mgr); |
| 153 | |
| 154 | if (!mp->enabled) |
| 155 | continue; |
| 156 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 157 | if (mgr_manual_update(mgr)) { |
| 158 | /* to catch FRAMEDONE */ |
| 159 | if (mp->updating) |
| 160 | return true; |
| 161 | } else { |
| 162 | /* to catch GO bit going down */ |
| 163 | if (mp->busy) |
| 164 | return true; |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 165 | |
| 166 | /* to write new values to registers */ |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 167 | if (mp->dirty) |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 168 | return true; |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 169 | |
| 170 | list_for_each_entry(ovl, &mgr->overlays, list) { |
| 171 | struct ovl_priv_data *op; |
| 172 | |
| 173 | op = get_ovl_priv(ovl); |
| 174 | |
| 175 | if (!op->enabled) |
| 176 | continue; |
| 177 | |
| 178 | /* to write new values to registers */ |
| 179 | if (op->dirty || op->extra_info_dirty) |
| 180 | return true; |
| 181 | } |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 182 | } |
| 183 | } |
| 184 | |
| 185 | return false; |
| 186 | } |
| 187 | |
| 188 | static bool need_go(struct omap_overlay_manager *mgr) |
| 189 | { |
| 190 | struct omap_overlay *ovl; |
| 191 | struct mgr_priv_data *mp; |
| 192 | struct ovl_priv_data *op; |
| 193 | |
| 194 | mp = get_mgr_priv(mgr); |
| 195 | |
| 196 | if (mp->shadow_dirty) |
| 197 | return true; |
| 198 | |
| 199 | list_for_each_entry(ovl, &mgr->overlays, list) { |
| 200 | op = get_ovl_priv(ovl); |
| 201 | if (op->shadow_dirty || op->shadow_extra_info_dirty) |
| 202 | return true; |
| 203 | } |
| 204 | |
| 205 | return false; |
| 206 | } |
| 207 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 208 | int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr) |
| 209 | { |
| 210 | unsigned long timeout = msecs_to_jiffies(500); |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 211 | struct mgr_priv_data *mp; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 212 | u32 irq; |
| 213 | int r; |
| 214 | int i; |
| 215 | struct omap_dss_device *dssdev = mgr->device; |
| 216 | |
| 217 | if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) |
| 218 | return 0; |
| 219 | |
| 220 | if (mgr_manual_update(mgr)) |
| 221 | return 0; |
| 222 | |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 223 | irq = dispc_mgr_get_vsync_irq(mgr->id); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 224 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 225 | mp = get_mgr_priv(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 226 | i = 0; |
| 227 | while (1) { |
| 228 | unsigned long flags; |
| 229 | bool shadow_dirty, dirty; |
| 230 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 231 | spin_lock_irqsave(&data_lock, flags); |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 232 | dirty = mp->dirty; |
| 233 | shadow_dirty = mp->shadow_dirty; |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 234 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 235 | |
| 236 | if (!dirty && !shadow_dirty) { |
| 237 | r = 0; |
| 238 | break; |
| 239 | } |
| 240 | |
| 241 | /* 4 iterations is the worst case: |
| 242 | * 1 - initial iteration, dirty = true (between VFP and VSYNC) |
| 243 | * 2 - first VSYNC, dirty = true |
| 244 | * 3 - dirty = false, shadow_dirty = true |
| 245 | * 4 - shadow_dirty = false */ |
| 246 | if (i++ == 3) { |
| 247 | DSSERR("mgr(%d)->wait_for_go() not finishing\n", |
| 248 | mgr->id); |
| 249 | r = 0; |
| 250 | break; |
| 251 | } |
| 252 | |
| 253 | r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout); |
| 254 | if (r == -ERESTARTSYS) |
| 255 | break; |
| 256 | |
| 257 | if (r) { |
| 258 | DSSERR("mgr(%d)->wait_for_go() timeout\n", mgr->id); |
| 259 | break; |
| 260 | } |
| 261 | } |
| 262 | |
| 263 | return r; |
| 264 | } |
| 265 | |
| 266 | int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl) |
| 267 | { |
| 268 | unsigned long timeout = msecs_to_jiffies(500); |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 269 | struct ovl_priv_data *op; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 270 | struct omap_dss_device *dssdev; |
| 271 | u32 irq; |
| 272 | int r; |
| 273 | int i; |
| 274 | |
| 275 | if (!ovl->manager) |
| 276 | return 0; |
| 277 | |
| 278 | dssdev = ovl->manager->device; |
| 279 | |
| 280 | if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE) |
| 281 | return 0; |
| 282 | |
| 283 | if (ovl_manual_update(ovl)) |
| 284 | return 0; |
| 285 | |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 286 | irq = dispc_mgr_get_vsync_irq(ovl->manager->id); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 287 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 288 | op = get_ovl_priv(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 289 | i = 0; |
| 290 | while (1) { |
| 291 | unsigned long flags; |
| 292 | bool shadow_dirty, dirty; |
| 293 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 294 | spin_lock_irqsave(&data_lock, flags); |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 295 | dirty = op->dirty; |
| 296 | shadow_dirty = op->shadow_dirty; |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 297 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 298 | |
| 299 | if (!dirty && !shadow_dirty) { |
| 300 | r = 0; |
| 301 | break; |
| 302 | } |
| 303 | |
| 304 | /* 4 iterations is the worst case: |
| 305 | * 1 - initial iteration, dirty = true (between VFP and VSYNC) |
| 306 | * 2 - first VSYNC, dirty = true |
| 307 | * 3 - dirty = false, shadow_dirty = true |
| 308 | * 4 - shadow_dirty = false */ |
| 309 | if (i++ == 3) { |
| 310 | DSSERR("ovl(%d)->wait_for_go() not finishing\n", |
| 311 | ovl->id); |
| 312 | r = 0; |
| 313 | break; |
| 314 | } |
| 315 | |
| 316 | r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout); |
| 317 | if (r == -ERESTARTSYS) |
| 318 | break; |
| 319 | |
| 320 | if (r) { |
| 321 | DSSERR("ovl(%d)->wait_for_go() timeout\n", ovl->id); |
| 322 | break; |
| 323 | } |
| 324 | } |
| 325 | |
| 326 | return r; |
| 327 | } |
| 328 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 329 | static void dss_ovl_write_regs(struct omap_overlay *ovl) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 330 | { |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 331 | struct ovl_priv_data *op = get_ovl_priv(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 332 | struct omap_overlay_info *oi; |
| 333 | bool ilace, replication; |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 334 | struct mgr_priv_data *mp; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 335 | int r; |
| 336 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 337 | DSSDBGF("%d", ovl->id); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 338 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 339 | if (!op->enabled || !op->dirty) |
| 340 | return; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 341 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 342 | oi = &op->info; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 343 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 344 | replication = dss_use_replication(ovl->manager->device, oi->color_mode); |
| 345 | |
| 346 | ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC; |
| 347 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 348 | dispc_ovl_set_channel_out(ovl->id, op->channel); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 349 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 350 | r = dispc_ovl_setup(ovl->id, oi, ilace, replication); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 351 | if (r) { |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 352 | /* |
| 353 | * We can't do much here, as this function can be called from |
| 354 | * vsync interrupt. |
| 355 | */ |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 356 | DSSERR("dispc_ovl_setup failed for ovl %d\n", ovl->id); |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 357 | |
| 358 | /* This will leave fifo configurations in a nonoptimal state */ |
| 359 | op->enabled = false; |
| 360 | dispc_ovl_enable(ovl->id, false); |
| 361 | return; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 362 | } |
| 363 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 364 | 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] | 365 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 366 | mp = get_mgr_priv(ovl->manager); |
| 367 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 368 | op->dirty = false; |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 369 | if (mp->updating) |
| 370 | op->shadow_dirty = true; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 371 | } |
| 372 | |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 373 | static void dss_ovl_write_regs_extra(struct omap_overlay *ovl) |
| 374 | { |
| 375 | struct ovl_priv_data *op = get_ovl_priv(ovl); |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 376 | struct mgr_priv_data *mp; |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 377 | |
| 378 | DSSDBGF("%d", ovl->id); |
| 379 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 380 | if (!op->extra_info_dirty) |
| 381 | return; |
| 382 | |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 383 | /* note: write also when op->enabled == false, so that the ovl gets |
| 384 | * disabled */ |
| 385 | |
| 386 | dispc_ovl_enable(ovl->id, op->enabled); |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 387 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 388 | mp = get_mgr_priv(ovl->manager); |
| 389 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 390 | op->extra_info_dirty = false; |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 391 | if (mp->updating) |
| 392 | op->shadow_extra_info_dirty = true; |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 393 | } |
| 394 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 395 | static void dss_mgr_write_regs(struct omap_overlay_manager *mgr) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 396 | { |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 397 | struct mgr_priv_data *mp = get_mgr_priv(mgr); |
| 398 | struct omap_overlay *ovl; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 399 | |
Tomi Valkeinen | f6a5e08 | 2011-11-15 11:47:39 +0200 | [diff] [blame] | 400 | DSSDBGF("%d", mgr->id); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 401 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 402 | if (!mp->enabled) |
| 403 | return; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 404 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 405 | WARN_ON(mp->busy); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 406 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 407 | /* Commit overlay settings */ |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 408 | list_for_each_entry(ovl, &mgr->overlays, list) { |
| 409 | dss_ovl_write_regs(ovl); |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 410 | dss_ovl_write_regs_extra(ovl); |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 411 | } |
| 412 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 413 | if (mp->dirty) { |
| 414 | dispc_mgr_setup(mgr->id, &mp->info); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 415 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 416 | mp->dirty = false; |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 417 | if (mp->updating) |
| 418 | mp->shadow_dirty = true; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 419 | } |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 420 | } |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 421 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 422 | static void dss_write_regs(void) |
| 423 | { |
| 424 | const int num_mgrs = omap_dss_get_num_overlay_managers(); |
| 425 | int i; |
| 426 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 427 | for (i = 0; i < num_mgrs; ++i) { |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 428 | struct omap_overlay_manager *mgr; |
| 429 | struct mgr_priv_data *mp; |
| 430 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 431 | mgr = omap_dss_get_overlay_manager(i); |
| 432 | mp = get_mgr_priv(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 433 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 434 | if (!mp->enabled || mgr_manual_update(mgr) || mp->busy) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 435 | continue; |
| 436 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 437 | dss_mgr_write_regs(mgr); |
| 438 | |
| 439 | if (need_go(mgr)) { |
Tomi Valkeinen | 43a972d | 2011-11-15 15:04:25 +0200 | [diff] [blame] | 440 | mp->busy = true; |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 441 | |
| 442 | if (!dss_data.irq_enabled && need_isr()) |
| 443 | dss_register_vsync_isr(); |
| 444 | |
| 445 | dispc_mgr_go(mgr->id); |
Tomi Valkeinen | 43a972d | 2011-11-15 15:04:25 +0200 | [diff] [blame] | 446 | } |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 447 | } |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 448 | } |
| 449 | |
| 450 | void dss_mgr_start_update(struct omap_overlay_manager *mgr) |
| 451 | { |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 452 | struct mgr_priv_data *mp = get_mgr_priv(mgr); |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 453 | unsigned long flags; |
| 454 | |
| 455 | spin_lock_irqsave(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 456 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 457 | WARN_ON(mp->updating); |
| 458 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 459 | dss_mgr_write_regs(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 460 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 461 | mp->updating = true; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 462 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 463 | if (!dss_data.irq_enabled && need_isr()) |
| 464 | dss_register_vsync_isr(); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 465 | |
Tomi Valkeinen | 7797c6d | 2011-11-04 10:22:46 +0200 | [diff] [blame] | 466 | dispc_mgr_enable(mgr->id, true); |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 467 | |
| 468 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 469 | } |
| 470 | |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 471 | static void dss_apply_irq_handler(void *data, u32 mask); |
| 472 | |
| 473 | static void dss_register_vsync_isr(void) |
| 474 | { |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 475 | const int num_mgrs = dss_feat_get_num_mgrs(); |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 476 | u32 mask; |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 477 | int r, i; |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 478 | |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 479 | mask = 0; |
| 480 | for (i = 0; i < num_mgrs; ++i) |
| 481 | mask |= dispc_mgr_get_vsync_irq(i); |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 482 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 483 | for (i = 0; i < num_mgrs; ++i) |
| 484 | mask |= dispc_mgr_get_framedone_irq(i); |
| 485 | |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 486 | r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask); |
| 487 | WARN_ON(r); |
| 488 | |
Tomi Valkeinen | d09c7aa | 2011-11-15 12:04:43 +0200 | [diff] [blame] | 489 | dss_data.irq_enabled = true; |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 490 | } |
| 491 | |
| 492 | static void dss_unregister_vsync_isr(void) |
| 493 | { |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 494 | const int num_mgrs = dss_feat_get_num_mgrs(); |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 495 | u32 mask; |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 496 | int r, i; |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 497 | |
Tomi Valkeinen | bc1a951 | 2011-11-15 11:20:13 +0200 | [diff] [blame] | 498 | mask = 0; |
| 499 | for (i = 0; i < num_mgrs; ++i) |
| 500 | mask |= dispc_mgr_get_vsync_irq(i); |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 501 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 502 | for (i = 0; i < num_mgrs; ++i) |
| 503 | mask |= dispc_mgr_get_framedone_irq(i); |
| 504 | |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 505 | r = omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, mask); |
| 506 | WARN_ON(r); |
| 507 | |
Tomi Valkeinen | d09c7aa | 2011-11-15 12:04:43 +0200 | [diff] [blame] | 508 | dss_data.irq_enabled = false; |
Tomi Valkeinen | dbce016 | 2011-11-15 11:18:12 +0200 | [diff] [blame] | 509 | } |
| 510 | |
Tomi Valkeinen | 7609893 | 2011-11-16 12:03:22 +0200 | [diff] [blame^] | 511 | static void mgr_clear_shadow_dirty(struct omap_overlay_manager *mgr) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 512 | { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 513 | struct omap_overlay *ovl; |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 514 | struct mgr_priv_data *mp; |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 515 | struct ovl_priv_data *op; |
Tomi Valkeinen | 7609893 | 2011-11-16 12:03:22 +0200 | [diff] [blame^] | 516 | |
| 517 | mp = get_mgr_priv(mgr); |
| 518 | mp->shadow_dirty = false; |
| 519 | |
| 520 | list_for_each_entry(ovl, &mgr->overlays, list) { |
| 521 | op = get_ovl_priv(ovl); |
| 522 | op->shadow_dirty = false; |
| 523 | op->shadow_extra_info_dirty = false; |
| 524 | } |
| 525 | } |
| 526 | |
| 527 | static void dss_apply_irq_handler(void *data, u32 mask) |
| 528 | { |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 529 | const int num_mgrs = dss_feat_get_num_mgrs(); |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 530 | int i; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 531 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 532 | spin_lock(&data_lock); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 533 | |
Tomi Valkeinen | 7609893 | 2011-11-16 12:03:22 +0200 | [diff] [blame^] | 534 | /* clear busy, updating flags, shadow_dirty flags */ |
Tomi Valkeinen | 43a972d | 2011-11-15 15:04:25 +0200 | [diff] [blame] | 535 | for (i = 0; i < num_mgrs; i++) { |
Tomi Valkeinen | 7609893 | 2011-11-16 12:03:22 +0200 | [diff] [blame^] | 536 | struct omap_overlay_manager *mgr; |
| 537 | struct mgr_priv_data *mp; |
| 538 | |
Tomi Valkeinen | 43a972d | 2011-11-15 15:04:25 +0200 | [diff] [blame] | 539 | mgr = omap_dss_get_overlay_manager(i); |
| 540 | mp = get_mgr_priv(mgr); |
| 541 | |
Tomi Valkeinen | 7609893 | 2011-11-16 12:03:22 +0200 | [diff] [blame^] | 542 | if (!mp->enabled) |
Tomi Valkeinen | 43a972d | 2011-11-15 15:04:25 +0200 | [diff] [blame] | 543 | continue; |
| 544 | |
Tomi Valkeinen | 7609893 | 2011-11-16 12:03:22 +0200 | [diff] [blame^] | 545 | mp->updating = dispc_mgr_is_enabled(i); |
Tomi Valkeinen | 43a972d | 2011-11-15 15:04:25 +0200 | [diff] [blame] | 546 | |
Tomi Valkeinen | 7609893 | 2011-11-16 12:03:22 +0200 | [diff] [blame^] | 547 | if (!mgr_manual_update(mgr)) { |
| 548 | mp->busy = dispc_mgr_go_busy(i); |
| 549 | |
| 550 | if (!mp->busy) |
| 551 | mgr_clear_shadow_dirty(mgr); |
| 552 | } else { |
| 553 | if (!mp->updating) |
| 554 | mgr_clear_shadow_dirty(mgr); |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 555 | } |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 556 | } |
| 557 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 558 | dss_write_regs(); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 559 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 560 | if (!need_isr()) |
| 561 | dss_unregister_vsync_isr(); |
Tomi Valkeinen | 43a972d | 2011-11-15 15:04:25 +0200 | [diff] [blame] | 562 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 563 | spin_unlock(&data_lock); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 564 | } |
| 565 | |
Tomi Valkeinen | 5738b63 | 2011-11-15 13:37:33 +0200 | [diff] [blame] | 566 | static void omap_dss_mgr_apply_ovl(struct omap_overlay *ovl) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 567 | { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 568 | struct ovl_priv_data *op; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 569 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 570 | op = get_ovl_priv(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 571 | |
| 572 | if (ovl->manager_changed) { |
| 573 | ovl->manager_changed = false; |
| 574 | ovl->info_dirty = true; |
| 575 | } |
| 576 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 577 | if (!ovl->info_dirty) |
Tomi Valkeinen | 5738b63 | 2011-11-15 13:37:33 +0200 | [diff] [blame] | 578 | return; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 579 | |
| 580 | ovl->info_dirty = false; |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 581 | op->dirty = true; |
| 582 | op->info = ovl->info; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 583 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 584 | op->channel = ovl->manager->id; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 585 | } |
| 586 | |
| 587 | static void omap_dss_mgr_apply_mgr(struct omap_overlay_manager *mgr) |
| 588 | { |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 589 | struct mgr_priv_data *mp; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 590 | |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 591 | mp = get_mgr_priv(mgr); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 592 | |
| 593 | if (mgr->device_changed) { |
| 594 | mgr->device_changed = false; |
| 595 | mgr->info_dirty = true; |
| 596 | } |
| 597 | |
| 598 | if (!mgr->info_dirty) |
| 599 | return; |
| 600 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 601 | mgr->info_dirty = false; |
Tomi Valkeinen | af3d64b | 2011-11-15 12:02:03 +0200 | [diff] [blame] | 602 | mp->dirty = true; |
| 603 | mp->info = mgr->info; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 604 | } |
| 605 | |
| 606 | static void omap_dss_mgr_apply_ovl_fifos(struct omap_overlay *ovl) |
| 607 | { |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 608 | struct ovl_priv_data *op; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 609 | struct omap_dss_device *dssdev; |
| 610 | u32 size, burst_size; |
| 611 | |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 612 | op = get_ovl_priv(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 613 | |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 614 | dssdev = ovl->manager->device; |
| 615 | |
| 616 | size = dispc_ovl_get_fifo_size(ovl->id); |
| 617 | |
| 618 | burst_size = dispc_ovl_get_burst_size(ovl->id); |
| 619 | |
| 620 | switch (dssdev->type) { |
| 621 | case OMAP_DISPLAY_TYPE_DPI: |
| 622 | case OMAP_DISPLAY_TYPE_DBI: |
| 623 | case OMAP_DISPLAY_TYPE_SDI: |
| 624 | case OMAP_DISPLAY_TYPE_VENC: |
| 625 | case OMAP_DISPLAY_TYPE_HDMI: |
| 626 | default_get_overlay_fifo_thresholds(ovl->id, size, |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 627 | burst_size, &op->fifo_low, |
| 628 | &op->fifo_high); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 629 | break; |
| 630 | #ifdef CONFIG_OMAP2_DSS_DSI |
| 631 | case OMAP_DISPLAY_TYPE_DSI: |
| 632 | dsi_get_overlay_fifo_thresholds(ovl->id, size, |
Tomi Valkeinen | c10c6f0 | 2011-11-15 11:56:57 +0200 | [diff] [blame] | 633 | burst_size, &op->fifo_low, |
| 634 | &op->fifo_high); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 635 | break; |
| 636 | #endif |
| 637 | default: |
| 638 | BUG(); |
| 639 | } |
| 640 | } |
| 641 | |
| 642 | int omap_dss_mgr_apply(struct omap_overlay_manager *mgr) |
| 643 | { |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 644 | int r; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 645 | unsigned long flags; |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 646 | struct omap_overlay *ovl; |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 647 | |
| 648 | DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name); |
| 649 | |
| 650 | r = dispc_runtime_get(); |
| 651 | if (r) |
| 652 | return r; |
| 653 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 654 | spin_lock_irqsave(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 655 | |
| 656 | /* Configure overlays */ |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 657 | list_for_each_entry(ovl, &mgr->overlays, list) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 658 | omap_dss_mgr_apply_ovl(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 659 | |
| 660 | /* Configure manager */ |
| 661 | omap_dss_mgr_apply_mgr(mgr); |
| 662 | |
| 663 | /* Configure overlay fifos */ |
Tomi Valkeinen | 07e327c | 2011-11-05 10:59:59 +0200 | [diff] [blame] | 664 | list_for_each_entry(ovl, &mgr->overlays, list) |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 665 | omap_dss_mgr_apply_ovl_fifos(ovl); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 666 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 667 | dss_write_regs(); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 668 | |
Tomi Valkeinen | 063fd70 | 2011-11-15 12:04:10 +0200 | [diff] [blame] | 669 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | 58f25548 | 2011-11-04 09:48:54 +0200 | [diff] [blame] | 670 | |
| 671 | dispc_runtime_put(); |
| 672 | |
| 673 | return r; |
| 674 | } |
| 675 | |
Tomi Valkeinen | 7797c6d | 2011-11-04 10:22:46 +0200 | [diff] [blame] | 676 | void dss_mgr_enable(struct omap_overlay_manager *mgr) |
| 677 | { |
Tomi Valkeinen | bf21352 | 2011-11-15 14:43:53 +0200 | [diff] [blame] | 678 | struct mgr_priv_data *mp = get_mgr_priv(mgr); |
| 679 | unsigned long flags; |
| 680 | |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 681 | mutex_lock(&apply_lock); |
| 682 | |
Tomi Valkeinen | bf21352 | 2011-11-15 14:43:53 +0200 | [diff] [blame] | 683 | spin_lock_irqsave(&data_lock, flags); |
| 684 | |
| 685 | mp->enabled = true; |
| 686 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 687 | dss_write_regs(); |
| 688 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 689 | if (!mgr_manual_update(mgr)) |
| 690 | mp->updating = true; |
| 691 | |
Tomi Valkeinen | bf21352 | 2011-11-15 14:43:53 +0200 | [diff] [blame] | 692 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 693 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 694 | if (!mgr_manual_update(mgr)) |
| 695 | dispc_mgr_enable(mgr->id, true); |
| 696 | |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 697 | mutex_unlock(&apply_lock); |
Tomi Valkeinen | 7797c6d | 2011-11-04 10:22:46 +0200 | [diff] [blame] | 698 | } |
| 699 | |
| 700 | void dss_mgr_disable(struct omap_overlay_manager *mgr) |
| 701 | { |
Tomi Valkeinen | bf21352 | 2011-11-15 14:43:53 +0200 | [diff] [blame] | 702 | struct mgr_priv_data *mp = get_mgr_priv(mgr); |
| 703 | unsigned long flags; |
| 704 | |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 705 | mutex_lock(&apply_lock); |
| 706 | |
Tomi Valkeinen | 9a147a6 | 2011-11-09 15:30:11 +0200 | [diff] [blame] | 707 | if (!mgr_manual_update(mgr)) |
| 708 | dispc_mgr_enable(mgr->id, false); |
Tomi Valkeinen | bf21352 | 2011-11-15 14:43:53 +0200 | [diff] [blame] | 709 | |
| 710 | spin_lock_irqsave(&data_lock, flags); |
| 711 | |
Tomi Valkeinen | 3486137 | 2011-11-18 15:43:29 +0200 | [diff] [blame] | 712 | mp->updating = false; |
Tomi Valkeinen | bf21352 | 2011-11-15 14:43:53 +0200 | [diff] [blame] | 713 | mp->enabled = false; |
| 714 | |
| 715 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 716 | |
| 717 | mutex_unlock(&apply_lock); |
Tomi Valkeinen | 7797c6d | 2011-11-04 10:22:46 +0200 | [diff] [blame] | 718 | } |
| 719 | |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 720 | int dss_mgr_set_info(struct omap_overlay_manager *mgr, |
| 721 | struct omap_overlay_manager_info *info) |
| 722 | { |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 723 | unsigned long flags; |
| 724 | |
| 725 | spin_lock_irqsave(&data_lock, flags); |
| 726 | |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 727 | mgr->info = *info; |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 728 | mgr->info_dirty = true; |
| 729 | |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 730 | spin_unlock_irqrestore(&data_lock, flags); |
| 731 | |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 732 | return 0; |
| 733 | } |
| 734 | |
| 735 | void dss_mgr_get_info(struct omap_overlay_manager *mgr, |
| 736 | struct omap_overlay_manager_info *info) |
| 737 | { |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 738 | unsigned long flags; |
| 739 | |
| 740 | spin_lock_irqsave(&data_lock, flags); |
| 741 | |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 742 | *info = mgr->info; |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 743 | |
| 744 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 745 | } |
| 746 | |
| 747 | int dss_mgr_set_device(struct omap_overlay_manager *mgr, |
| 748 | struct omap_dss_device *dssdev) |
| 749 | { |
| 750 | int r; |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 751 | |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 752 | mutex_lock(&apply_lock); |
| 753 | |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 754 | if (dssdev->manager) { |
| 755 | DSSERR("display '%s' already has a manager '%s'\n", |
| 756 | dssdev->name, dssdev->manager->name); |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 757 | r = -EINVAL; |
| 758 | goto err; |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 759 | } |
| 760 | |
| 761 | if ((mgr->supported_displays & dssdev->type) == 0) { |
| 762 | DSSERR("display '%s' does not support manager '%s'\n", |
| 763 | dssdev->name, mgr->name); |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 764 | r = -EINVAL; |
| 765 | goto err; |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 766 | } |
| 767 | |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 768 | dssdev->manager = mgr; |
| 769 | mgr->device = dssdev; |
| 770 | mgr->device_changed = true; |
| 771 | |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 772 | mutex_unlock(&apply_lock); |
| 773 | |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 774 | return 0; |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 775 | err: |
| 776 | mutex_unlock(&apply_lock); |
| 777 | return r; |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 778 | } |
| 779 | |
| 780 | int dss_mgr_unset_device(struct omap_overlay_manager *mgr) |
| 781 | { |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 782 | int r; |
| 783 | |
| 784 | mutex_lock(&apply_lock); |
| 785 | |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 786 | if (!mgr->device) { |
| 787 | DSSERR("failed to unset display, display not set.\n"); |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 788 | r = -EINVAL; |
| 789 | goto err; |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 790 | } |
| 791 | |
| 792 | /* |
| 793 | * Don't allow currently enabled displays to have the overlay manager |
| 794 | * pulled out from underneath them |
| 795 | */ |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 796 | if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED) { |
| 797 | r = -EINVAL; |
| 798 | goto err; |
| 799 | } |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 800 | |
| 801 | mgr->device->manager = NULL; |
| 802 | mgr->device = NULL; |
| 803 | mgr->device_changed = true; |
| 804 | |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 805 | mutex_unlock(&apply_lock); |
| 806 | |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 807 | return 0; |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 808 | err: |
| 809 | mutex_unlock(&apply_lock); |
| 810 | return r; |
Tomi Valkeinen | eb70d73 | 2011-11-15 12:15:18 +0200 | [diff] [blame] | 811 | } |
| 812 | |
| 813 | |
| 814 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 815 | int dss_ovl_set_info(struct omap_overlay *ovl, |
| 816 | struct omap_overlay_info *info) |
| 817 | { |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 818 | unsigned long flags; |
| 819 | |
| 820 | spin_lock_irqsave(&data_lock, flags); |
| 821 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 822 | ovl->info = *info; |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 823 | ovl->info_dirty = true; |
| 824 | |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 825 | spin_unlock_irqrestore(&data_lock, flags); |
| 826 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 827 | return 0; |
| 828 | } |
| 829 | |
| 830 | void dss_ovl_get_info(struct omap_overlay *ovl, |
| 831 | struct omap_overlay_info *info) |
| 832 | { |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 833 | unsigned long flags; |
| 834 | |
| 835 | spin_lock_irqsave(&data_lock, flags); |
| 836 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 837 | *info = ovl->info; |
Tomi Valkeinen | e0a2aa5b | 2011-11-15 14:32:57 +0200 | [diff] [blame] | 838 | |
| 839 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 840 | } |
| 841 | |
| 842 | int dss_ovl_set_manager(struct omap_overlay *ovl, |
| 843 | struct omap_overlay_manager *mgr) |
| 844 | { |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 845 | struct ovl_priv_data *op = get_ovl_priv(ovl); |
| 846 | unsigned long flags; |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 847 | int r; |
| 848 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 849 | if (!mgr) |
| 850 | return -EINVAL; |
| 851 | |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 852 | mutex_lock(&apply_lock); |
| 853 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 854 | if (ovl->manager) { |
| 855 | DSSERR("overlay '%s' already has a manager '%s'\n", |
| 856 | ovl->name, ovl->manager->name); |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 857 | r = -EINVAL; |
| 858 | goto err; |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 859 | } |
| 860 | |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 861 | spin_lock_irqsave(&data_lock, flags); |
| 862 | |
| 863 | if (op->enabled) { |
| 864 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 865 | DSSERR("overlay has to be disabled to change the manager\n"); |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 866 | r = -EINVAL; |
| 867 | goto err; |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 868 | } |
| 869 | |
| 870 | ovl->manager = mgr; |
| 871 | list_add_tail(&ovl->list, &mgr->overlays); |
| 872 | ovl->manager_changed = true; |
| 873 | |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 874 | spin_unlock_irqrestore(&data_lock, flags); |
| 875 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 876 | /* XXX: When there is an overlay on a DSI manual update display, and |
| 877 | * the overlay is first disabled, then moved to tv, and enabled, we |
| 878 | * seem to get SYNC_LOST_DIGIT error. |
| 879 | * |
| 880 | * Waiting doesn't seem to help, but updating the manual update display |
| 881 | * after disabling the overlay seems to fix this. This hints that the |
| 882 | * overlay is perhaps somehow tied to the LCD output until the output |
| 883 | * is updated. |
| 884 | * |
| 885 | * Userspace workaround for this is to update the LCD after disabling |
| 886 | * the overlay, but before moving the overlay to TV. |
| 887 | */ |
| 888 | |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 889 | mutex_unlock(&apply_lock); |
| 890 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 891 | return 0; |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 892 | err: |
| 893 | mutex_unlock(&apply_lock); |
| 894 | return r; |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 895 | } |
| 896 | |
| 897 | int dss_ovl_unset_manager(struct omap_overlay *ovl) |
| 898 | { |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 899 | struct ovl_priv_data *op = get_ovl_priv(ovl); |
| 900 | unsigned long flags; |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 901 | int r; |
| 902 | |
| 903 | mutex_lock(&apply_lock); |
| 904 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 905 | if (!ovl->manager) { |
| 906 | DSSERR("failed to detach overlay: manager not set\n"); |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 907 | r = -EINVAL; |
| 908 | goto err; |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 909 | } |
| 910 | |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 911 | spin_lock_irqsave(&data_lock, flags); |
| 912 | |
| 913 | if (op->enabled) { |
| 914 | spin_unlock_irqrestore(&data_lock, flags); |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 915 | DSSERR("overlay has to be disabled to unset the manager\n"); |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 916 | r = -EINVAL; |
| 917 | goto err; |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 918 | } |
| 919 | |
| 920 | ovl->manager = NULL; |
| 921 | list_del(&ovl->list); |
| 922 | ovl->manager_changed = true; |
| 923 | |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 924 | spin_unlock_irqrestore(&data_lock, flags); |
| 925 | |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 926 | mutex_unlock(&apply_lock); |
| 927 | |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 928 | return 0; |
Tomi Valkeinen | 5558db3 | 2011-11-15 14:28:48 +0200 | [diff] [blame] | 929 | err: |
| 930 | mutex_unlock(&apply_lock); |
| 931 | return r; |
Tomi Valkeinen | f77b307 | 2011-11-15 12:11:11 +0200 | [diff] [blame] | 932 | } |
| 933 | |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 934 | bool dss_ovl_is_enabled(struct omap_overlay *ovl) |
| 935 | { |
| 936 | struct ovl_priv_data *op = get_ovl_priv(ovl); |
| 937 | unsigned long flags; |
| 938 | bool e; |
| 939 | |
| 940 | spin_lock_irqsave(&data_lock, flags); |
| 941 | |
| 942 | e = op->enabled; |
| 943 | |
| 944 | spin_unlock_irqrestore(&data_lock, flags); |
| 945 | |
| 946 | return e; |
| 947 | } |
| 948 | |
| 949 | int dss_ovl_enable(struct omap_overlay *ovl) |
| 950 | { |
| 951 | struct ovl_priv_data *op = get_ovl_priv(ovl); |
| 952 | unsigned long flags; |
| 953 | int r; |
| 954 | |
| 955 | mutex_lock(&apply_lock); |
| 956 | |
| 957 | if (ovl->manager == NULL || ovl->manager->device == NULL) { |
| 958 | r = -EINVAL; |
| 959 | goto err; |
| 960 | } |
| 961 | |
| 962 | spin_lock_irqsave(&data_lock, flags); |
| 963 | |
| 964 | op->enabled = true; |
| 965 | op->extra_info_dirty = true; |
| 966 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 967 | dss_write_regs(); |
| 968 | |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 969 | spin_unlock_irqrestore(&data_lock, flags); |
| 970 | |
| 971 | mutex_unlock(&apply_lock); |
| 972 | |
| 973 | return 0; |
| 974 | err: |
| 975 | mutex_unlock(&apply_lock); |
| 976 | return r; |
| 977 | } |
| 978 | |
| 979 | int dss_ovl_disable(struct omap_overlay *ovl) |
| 980 | { |
| 981 | struct ovl_priv_data *op = get_ovl_priv(ovl); |
| 982 | unsigned long flags; |
| 983 | int r; |
| 984 | |
| 985 | mutex_lock(&apply_lock); |
| 986 | |
| 987 | if (ovl->manager == NULL || ovl->manager->device == NULL) { |
| 988 | r = -EINVAL; |
| 989 | goto err; |
| 990 | } |
| 991 | |
| 992 | spin_lock_irqsave(&data_lock, flags); |
| 993 | |
| 994 | op->enabled = false; |
| 995 | op->extra_info_dirty = true; |
| 996 | |
Tomi Valkeinen | 75c9496 | 2011-11-15 18:25:23 +0200 | [diff] [blame] | 997 | dss_write_regs(); |
| 998 | |
Tomi Valkeinen | aaa874a | 2011-11-15 16:37:53 +0200 | [diff] [blame] | 999 | spin_unlock_irqrestore(&data_lock, flags); |
| 1000 | |
| 1001 | mutex_unlock(&apply_lock); |
| 1002 | |
| 1003 | return 0; |
| 1004 | |
| 1005 | err: |
| 1006 | mutex_unlock(&apply_lock); |
| 1007 | return r; |
| 1008 | } |
| 1009 | |