apply.c 29.8 KB
Newer Older
T
Tomi Valkeinen 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
/*
 * Copyright (C) 2011 Texas Instruments
 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
 *
 * 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 <http://www.gnu.org/licenses/>.
 */

#define DSS_SUBSYS_NAME "APPLY"

#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/jiffies.h>

#include <video/omapdss.h>

#include "dss.h"
#include "dss_features.h"

/*
 * We have 4 levels of cache for the dispc settings. First two are in SW and
 * the latter two in HW.
 *
34 35
 *       set_info()
 *          v
T
Tomi Valkeinen 已提交
36
 * +--------------------+
37
 * |     user_info      |
T
Tomi Valkeinen 已提交
38 39 40 41 42
 * +--------------------+
 *          v
 *        apply()
 *          v
 * +--------------------+
43
 * |       info         |
T
Tomi Valkeinen 已提交
44 45
 * +--------------------+
 *          v
46
 *      write_regs()
T
Tomi Valkeinen 已提交
47 48 49 50 51 52 53 54 55 56 57 58
 *          v
 * +--------------------+
 * |  shadow registers  |
 * +--------------------+
 *          v
 * VFP or lcd/digit_enable
 *          v
 * +--------------------+
 * |      registers     |
 * +--------------------+
 */

59
struct ovl_priv_data {
60 61 62 63

	bool user_info_dirty;
	struct omap_overlay_info user_info;

64
	bool info_dirty;
T
Tomi Valkeinen 已提交
65 66
	struct omap_overlay_info info;

67 68
	bool shadow_info_dirty;

69 70 71 72
	bool extra_info_dirty;
	bool shadow_extra_info_dirty;

	bool enabled;
73
	enum omap_channel channel;
74
	u32 fifo_low, fifo_high;
T
Tomi Valkeinen 已提交
75 76 77 78 79 80

	/*
	 * True if overlay is to be enabled. Used to check and calculate configs
	 * for the overlay before it is enabled in the HW.
	 */
	bool enabling;
T
Tomi Valkeinen 已提交
81 82
};

83
struct mgr_priv_data {
84 85 86 87

	bool user_info_dirty;
	struct omap_overlay_manager_info user_info;

88
	bool info_dirty;
T
Tomi Valkeinen 已提交
89 90
	struct omap_overlay_manager_info info;

91 92
	bool shadow_info_dirty;

93 94 95 96
	/* If true, GO bit is up and shadow registers cannot be written.
	 * Never true for manual update displays */
	bool busy;

T
Tomi Valkeinen 已提交
97 98 99
	/* If true, dispc output is enabled */
	bool updating;

100 101
	/* If true, a display is enabled using this manager */
	bool enabled;
T
Tomi Valkeinen 已提交
102 103 104
};

static struct {
105
	struct ovl_priv_data ovl_priv_data_array[MAX_DSS_OVERLAYS];
106
	struct mgr_priv_data mgr_priv_data_array[MAX_DSS_MANAGERS];
T
Tomi Valkeinen 已提交
107

108 109 110
	bool fifo_merge_dirty;
	bool fifo_merge;

T
Tomi Valkeinen 已提交
111
	bool irq_enabled;
112
} dss_data;
T
Tomi Valkeinen 已提交
113

114
/* protects dss_data */
115
static spinlock_t data_lock;
T
Tomi Valkeinen 已提交
116 117
/* lock for blocking functions */
static DEFINE_MUTEX(apply_lock);
118
static DECLARE_COMPLETION(extra_updated_completion);
119

120 121
static void dss_register_vsync_isr(void);

122 123
static struct ovl_priv_data *get_ovl_priv(struct omap_overlay *ovl)
{
124
	return &dss_data.ovl_priv_data_array[ovl->id];
125 126
}

127 128
static struct mgr_priv_data *get_mgr_priv(struct omap_overlay_manager *mgr)
{
129
	return &dss_data.mgr_priv_data_array[mgr->id];
130 131
}

T
Tomi Valkeinen 已提交
132 133
void dss_apply_init(void)
{
134 135 136
	const int num_ovls = dss_feat_get_num_ovls();
	int i;

137
	spin_lock_init(&data_lock);
138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165

	for (i = 0; i < num_ovls; ++i) {
		struct ovl_priv_data *op;

		op = &dss_data.ovl_priv_data_array[i];

		op->info.global_alpha = 255;

		switch (i) {
		case 0:
			op->info.zorder = 0;
			break;
		case 1:
			op->info.zorder =
				dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 3 : 0;
			break;
		case 2:
			op->info.zorder =
				dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 2 : 0;
			break;
		case 3:
			op->info.zorder =
				dss_has_feature(FEAT_ALPHA_FREE_ZORDER) ? 1 : 0;
			break;
		}

		op->user_info = op->info;
	}
T
Tomi Valkeinen 已提交
166 167 168 169 170 171 172 173 174 175 176 177
}

static bool ovl_manual_update(struct omap_overlay *ovl)
{
	return ovl->manager->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
}

static bool mgr_manual_update(struct omap_overlay_manager *mgr)
{
	return mgr->device->caps & OMAP_DSS_DISPLAY_CAP_MANUAL_UPDATE;
}

178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198
static int dss_check_settings_low(struct omap_overlay_manager *mgr,
		struct omap_dss_device *dssdev, bool applying)
{
	struct omap_overlay_info *oi;
	struct omap_overlay_manager_info *mi;
	struct omap_overlay *ovl;
	struct omap_overlay_info *ois[MAX_DSS_OVERLAYS];
	struct ovl_priv_data *op;
	struct mgr_priv_data *mp;

	mp = get_mgr_priv(mgr);

	if (applying && mp->user_info_dirty)
		mi = &mp->user_info;
	else
		mi = &mp->info;

	/* collect the infos to be tested into the array */
	list_for_each_entry(ovl, &mgr->overlays, list) {
		op = get_ovl_priv(ovl);

T
Tomi Valkeinen 已提交
199
		if (!op->enabled && !op->enabling)
200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230
			oi = NULL;
		else if (applying && op->user_info_dirty)
			oi = &op->user_info;
		else
			oi = &op->info;

		ois[ovl->id] = oi;
	}

	return dss_mgr_check(mgr, dssdev, mi, ois);
}

/*
 * check manager and overlay settings using overlay_info from data->info
 */
static int dss_check_settings(struct omap_overlay_manager *mgr,
		struct omap_dss_device *dssdev)
{
	return dss_check_settings_low(mgr, dssdev, false);
}

/*
 * check manager and overlay settings using overlay_info from ovl->info if
 * dirty and from data->info otherwise
 */
static int dss_check_settings_apply(struct omap_overlay_manager *mgr,
		struct omap_dss_device *dssdev)
{
	return dss_check_settings_low(mgr, dssdev, true);
}

231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246
static bool need_isr(void)
{
	const int num_mgrs = dss_feat_get_num_mgrs();
	int i;

	for (i = 0; i < num_mgrs; ++i) {
		struct omap_overlay_manager *mgr;
		struct mgr_priv_data *mp;
		struct omap_overlay *ovl;

		mgr = omap_dss_get_overlay_manager(i);
		mp = get_mgr_priv(mgr);

		if (!mp->enabled)
			continue;

T
Tomi Valkeinen 已提交
247 248 249 250 251 252 253 254
		if (mgr_manual_update(mgr)) {
			/* to catch FRAMEDONE */
			if (mp->updating)
				return true;
		} else {
			/* to catch GO bit going down */
			if (mp->busy)
				return true;
255

T
Tomi Valkeinen 已提交
256
			/* to write new values to registers */
257
			if (mp->info_dirty)
T
Tomi Valkeinen 已提交
258
				return true;
259

T
Tomi Valkeinen 已提交
260 261 262 263
			/* to set GO bit */
			if (mp->shadow_info_dirty)
				return true;

T
Tomi Valkeinen 已提交
264 265
			list_for_each_entry(ovl, &mgr->overlays, list) {
				struct ovl_priv_data *op;
266

T
Tomi Valkeinen 已提交
267
				op = get_ovl_priv(ovl);
268

T
Tomi Valkeinen 已提交
269 270 271 272 273 274 275 276 277 278 279 280 281 282
				/*
				 * NOTE: we check extra_info flags even for
				 * disabled overlays, as extra_infos need to be
				 * always written.
				 */

				/* to write new values to registers */
				if (op->extra_info_dirty)
					return true;

				/* to set GO bit */
				if (op->shadow_extra_info_dirty)
					return true;

T
Tomi Valkeinen 已提交
283 284
				if (!op->enabled)
					continue;
285

T
Tomi Valkeinen 已提交
286
				/* to write new values to registers */
T
Tomi Valkeinen 已提交
287 288 289 290 291
				if (op->info_dirty)
					return true;

				/* to set GO bit */
				if (op->shadow_info_dirty)
T
Tomi Valkeinen 已提交
292 293
					return true;
			}
294 295 296 297 298 299 300 301 302 303 304 305 306 307
		}
	}

	return false;
}

static bool need_go(struct omap_overlay_manager *mgr)
{
	struct omap_overlay *ovl;
	struct mgr_priv_data *mp;
	struct ovl_priv_data *op;

	mp = get_mgr_priv(mgr);

308
	if (mp->shadow_info_dirty)
309 310 311 312
		return true;

	list_for_each_entry(ovl, &mgr->overlays, list) {
		op = get_ovl_priv(ovl);
313
		if (op->shadow_info_dirty || op->shadow_extra_info_dirty)
314 315 316 317 318 319
			return true;
	}

	return false;
}

320 321 322 323 324 325 326 327 328 329 330 331 332
/* returns true if an extra_info field is currently being updated */
static bool extra_info_update_ongoing(void)
{
	const int num_ovls = omap_dss_get_num_overlays();
	struct ovl_priv_data *op;
	struct omap_overlay *ovl;
	struct mgr_priv_data *mp;
	int i;

	for (i = 0; i < num_ovls; ++i) {
		ovl = omap_dss_get_overlay(i);
		op = get_ovl_priv(ovl);

333 334 335
		if (!ovl->manager)
			continue;

336 337 338 339 340
		mp = get_mgr_priv(ovl->manager);

		if (!mp->enabled)
			continue;

341
		if (!mp->updating)
342 343
			continue;

344 345
		if (op->extra_info_dirty || op->shadow_extra_info_dirty)
			return true;
346 347 348 349 350 351 352 353 354 355 356
	}

	return false;
}

/* wait until no extra_info updates are pending */
static void wait_pending_extra_info_updates(void)
{
	bool updating;
	unsigned long flags;
	unsigned long t;
357
	int r;
358 359 360 361 362 363 364 365 366 367 368 369 370 371 372

	spin_lock_irqsave(&data_lock, flags);

	updating = extra_info_update_ongoing();

	if (!updating) {
		spin_unlock_irqrestore(&data_lock, flags);
		return;
	}

	init_completion(&extra_updated_completion);

	spin_unlock_irqrestore(&data_lock, flags);

	t = msecs_to_jiffies(500);
373 374 375 376 377
	r = wait_for_completion_timeout(&extra_updated_completion, t);
	if (r == 0)
		DSSWARN("timeout in wait_pending_extra_info_updates\n");
	else if (r < 0)
		DSSERR("wait_pending_extra_info_updates failed: %d\n", r);
378 379
}

T
Tomi Valkeinen 已提交
380 381 382
int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
{
	unsigned long timeout = msecs_to_jiffies(500);
383
	struct mgr_priv_data *mp;
T
Tomi Valkeinen 已提交
384 385 386 387 388 389 390 391 392 393 394
	u32 irq;
	int r;
	int i;
	struct omap_dss_device *dssdev = mgr->device;

	if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
		return 0;

	if (mgr_manual_update(mgr))
		return 0;

395 396 397 398
	r = dispc_runtime_get();
	if (r)
		return r;

399
	irq = dispc_mgr_get_vsync_irq(mgr->id);
T
Tomi Valkeinen 已提交
400

401
	mp = get_mgr_priv(mgr);
T
Tomi Valkeinen 已提交
402 403 404 405 406
	i = 0;
	while (1) {
		unsigned long flags;
		bool shadow_dirty, dirty;

407
		spin_lock_irqsave(&data_lock, flags);
408 409
		dirty = mp->info_dirty;
		shadow_dirty = mp->shadow_info_dirty;
410
		spin_unlock_irqrestore(&data_lock, flags);
T
Tomi Valkeinen 已提交
411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438

		if (!dirty && !shadow_dirty) {
			r = 0;
			break;
		}

		/* 4 iterations is the worst case:
		 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
		 * 2 - first VSYNC, dirty = true
		 * 3 - dirty = false, shadow_dirty = true
		 * 4 - shadow_dirty = false */
		if (i++ == 3) {
			DSSERR("mgr(%d)->wait_for_go() not finishing\n",
					mgr->id);
			r = 0;
			break;
		}

		r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
		if (r == -ERESTARTSYS)
			break;

		if (r) {
			DSSERR("mgr(%d)->wait_for_go() timeout\n", mgr->id);
			break;
		}
	}

439 440
	dispc_runtime_put();

T
Tomi Valkeinen 已提交
441 442 443 444 445 446
	return r;
}

int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
{
	unsigned long timeout = msecs_to_jiffies(500);
447
	struct ovl_priv_data *op;
T
Tomi Valkeinen 已提交
448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463
	struct omap_dss_device *dssdev;
	u32 irq;
	int r;
	int i;

	if (!ovl->manager)
		return 0;

	dssdev = ovl->manager->device;

	if (!dssdev || dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
		return 0;

	if (ovl_manual_update(ovl))
		return 0;

464 465 466 467
	r = dispc_runtime_get();
	if (r)
		return r;

468
	irq = dispc_mgr_get_vsync_irq(ovl->manager->id);
T
Tomi Valkeinen 已提交
469

470
	op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
471 472 473 474 475
	i = 0;
	while (1) {
		unsigned long flags;
		bool shadow_dirty, dirty;

476
		spin_lock_irqsave(&data_lock, flags);
477 478
		dirty = op->info_dirty;
		shadow_dirty = op->shadow_info_dirty;
479
		spin_unlock_irqrestore(&data_lock, flags);
T
Tomi Valkeinen 已提交
480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507

		if (!dirty && !shadow_dirty) {
			r = 0;
			break;
		}

		/* 4 iterations is the worst case:
		 * 1 - initial iteration, dirty = true (between VFP and VSYNC)
		 * 2 - first VSYNC, dirty = true
		 * 3 - dirty = false, shadow_dirty = true
		 * 4 - shadow_dirty = false */
		if (i++ == 3) {
			DSSERR("ovl(%d)->wait_for_go() not finishing\n",
					ovl->id);
			r = 0;
			break;
		}

		r = omap_dispc_wait_for_irq_interruptible_timeout(irq, timeout);
		if (r == -ERESTARTSYS)
			break;

		if (r) {
			DSSERR("ovl(%d)->wait_for_go() timeout\n", ovl->id);
			break;
		}
	}

508 509
	dispc_runtime_put();

T
Tomi Valkeinen 已提交
510 511 512
	return r;
}

513
static void dss_ovl_write_regs(struct omap_overlay *ovl)
T
Tomi Valkeinen 已提交
514
{
515
	struct ovl_priv_data *op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
516 517
	struct omap_overlay_info *oi;
	bool ilace, replication;
T
Tomi Valkeinen 已提交
518
	struct mgr_priv_data *mp;
T
Tomi Valkeinen 已提交
519 520
	int r;

521
	DSSDBGF("%d", ovl->id);
T
Tomi Valkeinen 已提交
522

523
	if (!op->enabled || !op->info_dirty)
524
		return;
T
Tomi Valkeinen 已提交
525

526
	oi = &op->info;
T
Tomi Valkeinen 已提交
527 528 529 530 531

	replication = dss_use_replication(ovl->manager->device, oi->color_mode);

	ilace = ovl->manager->device->type == OMAP_DISPLAY_TYPE_VENC;

532
	r = dispc_ovl_setup(ovl->id, oi, ilace, replication);
T
Tomi Valkeinen 已提交
533
	if (r) {
534 535 536 537
		/*
		 * We can't do much here, as this function can be called from
		 * vsync interrupt.
		 */
538
		DSSERR("dispc_ovl_setup failed for ovl %d\n", ovl->id);
539 540 541 542 543

		/* This will leave fifo configurations in a nonoptimal state */
		op->enabled = false;
		dispc_ovl_enable(ovl->id, false);
		return;
T
Tomi Valkeinen 已提交
544 545
	}

T
Tomi Valkeinen 已提交
546 547
	mp = get_mgr_priv(ovl->manager);

548
	op->info_dirty = false;
T
Tomi Valkeinen 已提交
549
	if (mp->updating)
550
		op->shadow_info_dirty = true;
T
Tomi Valkeinen 已提交
551 552
}

553 554 555
static void dss_ovl_write_regs_extra(struct omap_overlay *ovl)
{
	struct ovl_priv_data *op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
556
	struct mgr_priv_data *mp;
557 558 559

	DSSDBGF("%d", ovl->id);

560 561 562
	if (!op->extra_info_dirty)
		return;

563 564 565 566
	/* note: write also when op->enabled == false, so that the ovl gets
	 * disabled */

	dispc_ovl_enable(ovl->id, op->enabled);
567
	dispc_ovl_set_channel_out(ovl->id, op->channel);
568
	dispc_ovl_set_fifo_threshold(ovl->id, op->fifo_low, op->fifo_high);
569

T
Tomi Valkeinen 已提交
570 571
	mp = get_mgr_priv(ovl->manager);

572
	op->extra_info_dirty = false;
T
Tomi Valkeinen 已提交
573 574
	if (mp->updating)
		op->shadow_extra_info_dirty = true;
575 576
}

577
static void dss_mgr_write_regs(struct omap_overlay_manager *mgr)
T
Tomi Valkeinen 已提交
578
{
579 580
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
	struct omap_overlay *ovl;
T
Tomi Valkeinen 已提交
581

582
	DSSDBGF("%d", mgr->id);
T
Tomi Valkeinen 已提交
583

584 585
	if (!mp->enabled)
		return;
T
Tomi Valkeinen 已提交
586

587
	WARN_ON(mp->busy);
T
Tomi Valkeinen 已提交
588 589

	/* Commit overlay settings */
590 591
	list_for_each_entry(ovl, &mgr->overlays, list) {
		dss_ovl_write_regs(ovl);
592 593 594
		dss_ovl_write_regs_extra(ovl);
	}

595
	if (mp->info_dirty) {
596
		dispc_mgr_setup(mgr->id, &mp->info);
T
Tomi Valkeinen 已提交
597

598
		mp->info_dirty = false;
T
Tomi Valkeinen 已提交
599
		if (mp->updating)
600
			mp->shadow_info_dirty = true;
T
Tomi Valkeinen 已提交
601
	}
602 603
}

604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630
static void dss_write_regs_common(void)
{
	const int num_mgrs = omap_dss_get_num_overlay_managers();
	int i;

	if (!dss_data.fifo_merge_dirty)
		return;

	for (i = 0; i < num_mgrs; ++i) {
		struct omap_overlay_manager *mgr;
		struct mgr_priv_data *mp;

		mgr = omap_dss_get_overlay_manager(i);
		mp = get_mgr_priv(mgr);

		if (mp->enabled) {
			if (dss_data.fifo_merge_dirty) {
				dispc_enable_fifomerge(dss_data.fifo_merge);
				dss_data.fifo_merge_dirty = false;
			}

			if (mp->updating)
				mp->shadow_info_dirty = true;
		}
	}
}

631 632 633 634
static void dss_write_regs(void)
{
	const int num_mgrs = omap_dss_get_num_overlay_managers();
	int i;
T
Tomi Valkeinen 已提交
635

636 637
	dss_write_regs_common();

T
Tomi Valkeinen 已提交
638
	for (i = 0; i < num_mgrs; ++i) {
639 640
		struct omap_overlay_manager *mgr;
		struct mgr_priv_data *mp;
641
		int r;
642

643 644
		mgr = omap_dss_get_overlay_manager(i);
		mp = get_mgr_priv(mgr);
T
Tomi Valkeinen 已提交
645

646
		if (!mp->enabled || mgr_manual_update(mgr) || mp->busy)
T
Tomi Valkeinen 已提交
647 648
			continue;

649 650 651 652 653 654 655
		r = dss_check_settings(mgr, mgr->device);
		if (r) {
			DSSERR("cannot write registers for manager %s: "
					"illegal configuration\n", mgr->name);
			continue;
		}

656
		dss_mgr_write_regs(mgr);
657 658
	}
}
659

660 661 662 663
static void dss_set_go_bits(void)
{
	const int num_mgrs = omap_dss_get_num_overlay_managers();
	int i;
T
Tomi Valkeinen 已提交
664

665 666 667
	for (i = 0; i < num_mgrs; ++i) {
		struct omap_overlay_manager *mgr;
		struct mgr_priv_data *mp;
T
Tomi Valkeinen 已提交
668

669 670 671 672 673 674 675 676 677 678 679 680 681 682 683
		mgr = omap_dss_get_overlay_manager(i);
		mp = get_mgr_priv(mgr);

		if (!mp->enabled || mgr_manual_update(mgr) || mp->busy)
			continue;

		if (!need_go(mgr))
			continue;

		mp->busy = true;

		if (!dss_data.irq_enabled && need_isr())
			dss_register_vsync_isr();

		dispc_mgr_go(mgr->id);
684
	}
685

T
Tomi Valkeinen 已提交
686 687
}

688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703
static void mgr_clear_shadow_dirty(struct omap_overlay_manager *mgr)
{
	struct omap_overlay *ovl;
	struct mgr_priv_data *mp;
	struct ovl_priv_data *op;

	mp = get_mgr_priv(mgr);
	mp->shadow_info_dirty = false;

	list_for_each_entry(ovl, &mgr->overlays, list) {
		op = get_ovl_priv(ovl);
		op->shadow_info_dirty = false;
		op->shadow_extra_info_dirty = false;
	}
}

T
Tomi Valkeinen 已提交
704 705
void dss_mgr_start_update(struct omap_overlay_manager *mgr)
{
706
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
707
	unsigned long flags;
708
	int r;
709 710

	spin_lock_irqsave(&data_lock, flags);
T
Tomi Valkeinen 已提交
711

T
Tomi Valkeinen 已提交
712 713
	WARN_ON(mp->updating);

714 715 716 717 718 719 720
	r = dss_check_settings(mgr, mgr->device);
	if (r) {
		DSSERR("cannot start manual update: illegal configuration\n");
		spin_unlock_irqrestore(&data_lock, flags);
		return;
	}

721
	dss_mgr_write_regs(mgr);
T
Tomi Valkeinen 已提交
722

723 724
	dss_write_regs_common();

T
Tomi Valkeinen 已提交
725
	mp->updating = true;
T
Tomi Valkeinen 已提交
726

T
Tomi Valkeinen 已提交
727 728
	if (!dss_data.irq_enabled && need_isr())
		dss_register_vsync_isr();
T
Tomi Valkeinen 已提交
729

730
	dispc_mgr_enable(mgr->id, true);
731

732 733
	mgr_clear_shadow_dirty(mgr);

734
	spin_unlock_irqrestore(&data_lock, flags);
T
Tomi Valkeinen 已提交
735 736
}

737 738 739 740
static void dss_apply_irq_handler(void *data, u32 mask);

static void dss_register_vsync_isr(void)
{
741
	const int num_mgrs = dss_feat_get_num_mgrs();
742
	u32 mask;
743
	int r, i;
744

745 746 747
	mask = 0;
	for (i = 0; i < num_mgrs; ++i)
		mask |= dispc_mgr_get_vsync_irq(i);
748

T
Tomi Valkeinen 已提交
749 750 751
	for (i = 0; i < num_mgrs; ++i)
		mask |= dispc_mgr_get_framedone_irq(i);

752 753 754
	r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask);
	WARN_ON(r);

755
	dss_data.irq_enabled = true;
756 757 758 759
}

static void dss_unregister_vsync_isr(void)
{
760
	const int num_mgrs = dss_feat_get_num_mgrs();
761
	u32 mask;
762
	int r, i;
763

764 765 766
	mask = 0;
	for (i = 0; i < num_mgrs; ++i)
		mask |= dispc_mgr_get_vsync_irq(i);
767

T
Tomi Valkeinen 已提交
768 769 770
	for (i = 0; i < num_mgrs; ++i)
		mask |= dispc_mgr_get_framedone_irq(i);

771 772 773
	r = omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, mask);
	WARN_ON(r);

774
	dss_data.irq_enabled = false;
775 776
}

777 778
static void dss_apply_irq_handler(void *data, u32 mask)
{
T
Tomi Valkeinen 已提交
779
	const int num_mgrs = dss_feat_get_num_mgrs();
780
	int i;
781
	bool extra_updating;
T
Tomi Valkeinen 已提交
782

783
	spin_lock(&data_lock);
T
Tomi Valkeinen 已提交
784

785
	/* clear busy, updating flags, shadow_dirty flags */
786
	for (i = 0; i < num_mgrs; i++) {
787 788
		struct omap_overlay_manager *mgr;
		struct mgr_priv_data *mp;
789
		bool was_updating;
790

791 792 793
		mgr = omap_dss_get_overlay_manager(i);
		mp = get_mgr_priv(mgr);

794
		if (!mp->enabled)
795 796
			continue;

797
		was_updating = mp->updating;
798
		mp->updating = dispc_mgr_is_enabled(i);
T
Tomi Valkeinen 已提交
799

800
		if (!mgr_manual_update(mgr)) {
801
			bool was_busy = mp->busy;
802
			mp->busy = dispc_mgr_go_busy(i);
803

804
			if (was_busy && !mp->busy)
805 806
				mgr_clear_shadow_dirty(mgr);
		}
T
Tomi Valkeinen 已提交
807 808
	}

809
	dss_write_regs();
810
	dss_set_go_bits();
T
Tomi Valkeinen 已提交
811

812 813 814 815
	extra_updating = extra_info_update_ongoing();
	if (!extra_updating)
		complete_all(&extra_updated_completion);

816 817
	if (!need_isr())
		dss_unregister_vsync_isr();
T
Tomi Valkeinen 已提交
818

819
	spin_unlock(&data_lock);
T
Tomi Valkeinen 已提交
820 821
}

822
static void omap_dss_mgr_apply_ovl(struct omap_overlay *ovl)
T
Tomi Valkeinen 已提交
823
{
824
	struct ovl_priv_data *op;
T
Tomi Valkeinen 已提交
825

826
	op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
827

828
	if (!op->user_info_dirty)
829
		return;
T
Tomi Valkeinen 已提交
830

831
	op->user_info_dirty = false;
832
	op->info_dirty = true;
833
	op->info = op->user_info;
T
Tomi Valkeinen 已提交
834 835 836 837
}

static void omap_dss_mgr_apply_mgr(struct omap_overlay_manager *mgr)
{
838
	struct mgr_priv_data *mp;
T
Tomi Valkeinen 已提交
839

840
	mp = get_mgr_priv(mgr);
T
Tomi Valkeinen 已提交
841

842
	if (!mp->user_info_dirty)
T
Tomi Valkeinen 已提交
843 844
		return;

845
	mp->user_info_dirty = false;
846
	mp->info_dirty = true;
847
	mp->info = mp->user_info;
T
Tomi Valkeinen 已提交
848 849
}

850
int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
T
Tomi Valkeinen 已提交
851
{
852 853
	unsigned long flags;
	struct omap_overlay *ovl;
854
	int r;
855 856 857 858 859

	DSSDBG("omap_dss_mgr_apply(%s)\n", mgr->name);

	spin_lock_irqsave(&data_lock, flags);

860 861 862 863 864 865 866
	r = dss_check_settings_apply(mgr, mgr->device);
	if (r) {
		spin_unlock_irqrestore(&data_lock, flags);
		DSSERR("failed to apply settings: illegal configuration.\n");
		return r;
	}

867 868 869 870 871 872 873 874
	/* Configure overlays */
	list_for_each_entry(ovl, &mgr->overlays, list)
		omap_dss_mgr_apply_ovl(ovl);

	/* Configure manager */
	omap_dss_mgr_apply_mgr(mgr);

	dss_write_regs();
875
	dss_set_go_bits();
876 877 878

	spin_unlock_irqrestore(&data_lock, flags);

879
	return 0;
880 881
}

882 883 884 885 886 887 888 889 890 891 892 893 894
static void dss_apply_ovl_enable(struct omap_overlay *ovl, bool enable)
{
	struct ovl_priv_data *op;

	op = get_ovl_priv(ovl);

	if (op->enabled == enable)
		return;

	op->enabled = enable;
	op->extra_info_dirty = true;
}

895 896 897 898 899 900 901 902 903 904 905 906 907
static void dss_apply_ovl_fifo_thresholds(struct omap_overlay *ovl,
		u32 fifo_low, u32 fifo_high)
{
	struct ovl_priv_data *op = get_ovl_priv(ovl);

	if (op->fifo_low == fifo_low && op->fifo_high == fifo_high)
		return;

	op->fifo_low = fifo_low;
	op->fifo_high = fifo_high;
	op->extra_info_dirty = true;
}

908 909 910 911 912 913 914 915 916
static void dss_apply_fifo_merge(bool use_fifo_merge)
{
	if (dss_data.fifo_merge == use_fifo_merge)
		return;

	dss_data.fifo_merge = use_fifo_merge;
	dss_data.fifo_merge_dirty = true;
}

917 918
static void dss_ovl_setup_fifo(struct omap_overlay *ovl,
		bool use_fifo_merge)
919 920
{
	struct ovl_priv_data *op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
921
	struct omap_dss_device *dssdev;
922
	u32 fifo_low, fifo_high;
T
Tomi Valkeinen 已提交
923

924 925 926
	if (!op->enabled && !op->enabling)
		return;

T
Tomi Valkeinen 已提交
927 928
	dssdev = ovl->manager->device;

929 930
	dispc_ovl_compute_fifo_thresholds(ovl->id, &fifo_low, &fifo_high,
			use_fifo_merge);
931

932
	dss_apply_ovl_fifo_thresholds(ovl, fifo_low, fifo_high);
T
Tomi Valkeinen 已提交
933 934
}

935 936
static void dss_mgr_setup_fifos(struct omap_overlay_manager *mgr,
		bool use_fifo_merge)
T
Tomi Valkeinen 已提交
937
{
938
	struct omap_overlay *ovl;
939
	struct mgr_priv_data *mp;
T
Tomi Valkeinen 已提交
940

941
	mp = get_mgr_priv(mgr);
T
Tomi Valkeinen 已提交
942

943 944
	if (!mp->enabled)
		return;
T
Tomi Valkeinen 已提交
945

946
	list_for_each_entry(ovl, &mgr->overlays, list)
947
		dss_ovl_setup_fifo(ovl, use_fifo_merge);
948
}
T
Tomi Valkeinen 已提交
949

950
static void dss_setup_fifos(bool use_fifo_merge)
951 952 953 954
{
	const int num_mgrs = omap_dss_get_num_overlay_managers();
	struct omap_overlay_manager *mgr;
	int i;
T
Tomi Valkeinen 已提交
955

956 957
	for (i = 0; i < num_mgrs; ++i) {
		mgr = omap_dss_get_overlay_manager(i);
958
		dss_mgr_setup_fifos(mgr, use_fifo_merge);
959
	}
T
Tomi Valkeinen 已提交
960 961
}

962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036
static int get_num_used_managers(void)
{
	const int num_mgrs = omap_dss_get_num_overlay_managers();
	struct omap_overlay_manager *mgr;
	struct mgr_priv_data *mp;
	int i;
	int enabled_mgrs;

	enabled_mgrs = 0;

	for (i = 0; i < num_mgrs; ++i) {
		mgr = omap_dss_get_overlay_manager(i);
		mp = get_mgr_priv(mgr);

		if (!mp->enabled)
			continue;

		enabled_mgrs++;
	}

	return enabled_mgrs;
}

static int get_num_used_overlays(void)
{
	const int num_ovls = omap_dss_get_num_overlays();
	struct omap_overlay *ovl;
	struct ovl_priv_data *op;
	struct mgr_priv_data *mp;
	int i;
	int enabled_ovls;

	enabled_ovls = 0;

	for (i = 0; i < num_ovls; ++i) {
		ovl = omap_dss_get_overlay(i);
		op = get_ovl_priv(ovl);

		if (!op->enabled && !op->enabling)
			continue;

		mp = get_mgr_priv(ovl->manager);

		if (!mp->enabled)
			continue;

		enabled_ovls++;
	}

	return enabled_ovls;
}

static bool get_use_fifo_merge(void)
{
	int enabled_mgrs = get_num_used_managers();
	int enabled_ovls = get_num_used_overlays();

	if (!dss_has_feature(FEAT_FIFO_MERGE))
		return false;

	/*
	 * In theory the only requirement for fifomerge is enabled_ovls <= 1.
	 * However, if we have two managers enabled and set/unset the fifomerge,
	 * we need to set the GO bits in particular sequence for the managers,
	 * and wait in between.
	 *
	 * This is rather difficult as new apply calls can happen at any time,
	 * so we simplify the problem by requiring also that enabled_mgrs <= 1.
	 * In practice this shouldn't matter, because when only one overlay is
	 * enabled, most likely only one output is enabled.
	 */

	return enabled_mgrs <= 1 && enabled_ovls <= 1;
}

1037
int dss_mgr_enable(struct omap_overlay_manager *mgr)
1038
{
1039 1040
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
	unsigned long flags;
1041
	int r;
1042
	bool fifo_merge;
1043

T
Tomi Valkeinen 已提交
1044 1045
	mutex_lock(&apply_lock);

1046 1047 1048
	if (mp->enabled)
		goto out;

1049 1050
	spin_lock_irqsave(&data_lock, flags);

1051
	mp->enabled = true;
1052

1053 1054 1055 1056
	r = dss_check_settings(mgr, mgr->device);
	if (r) {
		DSSERR("failed to enable manager %d: check_settings failed\n",
				mgr->id);
1057
		goto err;
1058 1059
	}

1060 1061 1062 1063 1064
	/* step 1: setup fifos/fifomerge before enabling the manager */

	fifo_merge = get_use_fifo_merge();
	dss_setup_fifos(fifo_merge);
	dss_apply_fifo_merge(fifo_merge);
1065

1066
	dss_write_regs();
1067
	dss_set_go_bits();
1068

1069 1070 1071 1072 1073 1074 1075 1076
	spin_unlock_irqrestore(&data_lock, flags);

	/* wait until fifo config is in */
	wait_pending_extra_info_updates();

	/* step 2: enable the manager */
	spin_lock_irqsave(&data_lock, flags);

T
Tomi Valkeinen 已提交
1077 1078 1079
	if (!mgr_manual_update(mgr))
		mp->updating = true;

1080
	spin_unlock_irqrestore(&data_lock, flags);
T
Tomi Valkeinen 已提交
1081

1082 1083 1084
	if (!mgr_manual_update(mgr))
		dispc_mgr_enable(mgr->id, true);

1085
out:
T
Tomi Valkeinen 已提交
1086
	mutex_unlock(&apply_lock);
1087 1088 1089 1090

	return 0;

err:
1091
	mp->enabled = false;
1092 1093 1094
	spin_unlock_irqrestore(&data_lock, flags);
	mutex_unlock(&apply_lock);
	return r;
1095 1096 1097 1098
}

void dss_mgr_disable(struct omap_overlay_manager *mgr)
{
1099 1100
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
	unsigned long flags;
1101
	bool fifo_merge;
1102

T
Tomi Valkeinen 已提交
1103 1104
	mutex_lock(&apply_lock);

1105 1106 1107
	if (!mp->enabled)
		goto out;

1108 1109
	if (!mgr_manual_update(mgr))
		dispc_mgr_enable(mgr->id, false);
1110 1111 1112

	spin_lock_irqsave(&data_lock, flags);

T
Tomi Valkeinen 已提交
1113
	mp->updating = false;
1114 1115
	mp->enabled = false;

1116 1117 1118 1119 1120 1121 1122
	fifo_merge = get_use_fifo_merge();
	dss_setup_fifos(fifo_merge);
	dss_apply_fifo_merge(fifo_merge);

	dss_write_regs();
	dss_set_go_bits();

1123
	spin_unlock_irqrestore(&data_lock, flags);
T
Tomi Valkeinen 已提交
1124

1125
	wait_pending_extra_info_updates();
1126
out:
T
Tomi Valkeinen 已提交
1127
	mutex_unlock(&apply_lock);
1128 1129
}

1130 1131 1132
int dss_mgr_set_info(struct omap_overlay_manager *mgr,
		struct omap_overlay_manager_info *info)
{
1133
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
1134
	unsigned long flags;
1135 1136 1137 1138 1139
	int r;

	r = dss_mgr_simple_check(mgr, info);
	if (r)
		return r;
1140 1141 1142

	spin_lock_irqsave(&data_lock, flags);

1143 1144
	mp->user_info = *info;
	mp->user_info_dirty = true;
1145

1146 1147
	spin_unlock_irqrestore(&data_lock, flags);

1148 1149 1150 1151 1152 1153
	return 0;
}

void dss_mgr_get_info(struct omap_overlay_manager *mgr,
		struct omap_overlay_manager_info *info)
{
1154
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
1155 1156 1157 1158
	unsigned long flags;

	spin_lock_irqsave(&data_lock, flags);

1159
	*info = mp->user_info;
1160 1161

	spin_unlock_irqrestore(&data_lock, flags);
1162 1163 1164 1165 1166 1167 1168
}

int dss_mgr_set_device(struct omap_overlay_manager *mgr,
		struct omap_dss_device *dssdev)
{
	int r;

T
Tomi Valkeinen 已提交
1169 1170
	mutex_lock(&apply_lock);

1171 1172 1173
	if (dssdev->manager) {
		DSSERR("display '%s' already has a manager '%s'\n",
			       dssdev->name, dssdev->manager->name);
T
Tomi Valkeinen 已提交
1174 1175
		r = -EINVAL;
		goto err;
1176 1177 1178 1179 1180
	}

	if ((mgr->supported_displays & dssdev->type) == 0) {
		DSSERR("display '%s' does not support manager '%s'\n",
			       dssdev->name, mgr->name);
T
Tomi Valkeinen 已提交
1181 1182
		r = -EINVAL;
		goto err;
1183 1184 1185 1186 1187
	}

	dssdev->manager = mgr;
	mgr->device = dssdev;

T
Tomi Valkeinen 已提交
1188 1189
	mutex_unlock(&apply_lock);

1190
	return 0;
T
Tomi Valkeinen 已提交
1191 1192 1193
err:
	mutex_unlock(&apply_lock);
	return r;
1194 1195 1196 1197
}

int dss_mgr_unset_device(struct omap_overlay_manager *mgr)
{
T
Tomi Valkeinen 已提交
1198 1199 1200 1201
	int r;

	mutex_lock(&apply_lock);

1202 1203
	if (!mgr->device) {
		DSSERR("failed to unset display, display not set.\n");
T
Tomi Valkeinen 已提交
1204 1205
		r = -EINVAL;
		goto err;
1206 1207 1208 1209 1210 1211
	}

	/*
	 * Don't allow currently enabled displays to have the overlay manager
	 * pulled out from underneath them
	 */
T
Tomi Valkeinen 已提交
1212 1213 1214 1215
	if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED) {
		r = -EINVAL;
		goto err;
	}
1216 1217 1218 1219

	mgr->device->manager = NULL;
	mgr->device = NULL;

T
Tomi Valkeinen 已提交
1220 1221
	mutex_unlock(&apply_lock);

1222
	return 0;
T
Tomi Valkeinen 已提交
1223 1224 1225
err:
	mutex_unlock(&apply_lock);
	return r;
1226 1227 1228
}


1229 1230 1231
int dss_ovl_set_info(struct omap_overlay *ovl,
		struct omap_overlay_info *info)
{
1232
	struct ovl_priv_data *op = get_ovl_priv(ovl);
1233
	unsigned long flags;
1234 1235 1236 1237 1238
	int r;

	r = dss_ovl_simple_check(ovl, info);
	if (r)
		return r;
1239 1240 1241

	spin_lock_irqsave(&data_lock, flags);

1242 1243
	op->user_info = *info;
	op->user_info_dirty = true;
1244

1245 1246
	spin_unlock_irqrestore(&data_lock, flags);

1247 1248 1249 1250 1251 1252
	return 0;
}

void dss_ovl_get_info(struct omap_overlay *ovl,
		struct omap_overlay_info *info)
{
1253
	struct ovl_priv_data *op = get_ovl_priv(ovl);
1254 1255 1256 1257
	unsigned long flags;

	spin_lock_irqsave(&data_lock, flags);

1258
	*info = op->user_info;
1259 1260

	spin_unlock_irqrestore(&data_lock, flags);
1261 1262 1263 1264 1265
}

int dss_ovl_set_manager(struct omap_overlay *ovl,
		struct omap_overlay_manager *mgr)
{
1266 1267
	struct ovl_priv_data *op = get_ovl_priv(ovl);
	unsigned long flags;
T
Tomi Valkeinen 已提交
1268 1269
	int r;

1270 1271 1272
	if (!mgr)
		return -EINVAL;

T
Tomi Valkeinen 已提交
1273 1274
	mutex_lock(&apply_lock);

1275 1276 1277
	if (ovl->manager) {
		DSSERR("overlay '%s' already has a manager '%s'\n",
				ovl->name, ovl->manager->name);
T
Tomi Valkeinen 已提交
1278 1279
		r = -EINVAL;
		goto err;
1280 1281
	}

1282 1283 1284 1285
	spin_lock_irqsave(&data_lock, flags);

	if (op->enabled) {
		spin_unlock_irqrestore(&data_lock, flags);
1286
		DSSERR("overlay has to be disabled to change the manager\n");
T
Tomi Valkeinen 已提交
1287 1288
		r = -EINVAL;
		goto err;
1289 1290
	}

1291 1292 1293
	op->channel = mgr->id;
	op->extra_info_dirty = true;

1294 1295 1296
	ovl->manager = mgr;
	list_add_tail(&ovl->list, &mgr->overlays);

1297 1298
	spin_unlock_irqrestore(&data_lock, flags);

1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311
	/* XXX: When there is an overlay on a DSI manual update display, and
	 * the overlay is first disabled, then moved to tv, and enabled, we
	 * seem to get SYNC_LOST_DIGIT error.
	 *
	 * Waiting doesn't seem to help, but updating the manual update display
	 * after disabling the overlay seems to fix this. This hints that the
	 * overlay is perhaps somehow tied to the LCD output until the output
	 * is updated.
	 *
	 * Userspace workaround for this is to update the LCD after disabling
	 * the overlay, but before moving the overlay to TV.
	 */

T
Tomi Valkeinen 已提交
1312 1313
	mutex_unlock(&apply_lock);

1314
	return 0;
T
Tomi Valkeinen 已提交
1315 1316 1317
err:
	mutex_unlock(&apply_lock);
	return r;
1318 1319 1320 1321
}

int dss_ovl_unset_manager(struct omap_overlay *ovl)
{
1322 1323
	struct ovl_priv_data *op = get_ovl_priv(ovl);
	unsigned long flags;
T
Tomi Valkeinen 已提交
1324 1325 1326 1327
	int r;

	mutex_lock(&apply_lock);

1328 1329
	if (!ovl->manager) {
		DSSERR("failed to detach overlay: manager not set\n");
T
Tomi Valkeinen 已提交
1330 1331
		r = -EINVAL;
		goto err;
1332 1333
	}

1334 1335 1336 1337
	spin_lock_irqsave(&data_lock, flags);

	if (op->enabled) {
		spin_unlock_irqrestore(&data_lock, flags);
1338
		DSSERR("overlay has to be disabled to unset the manager\n");
T
Tomi Valkeinen 已提交
1339 1340
		r = -EINVAL;
		goto err;
1341 1342
	}

1343 1344
	op->channel = -1;

1345 1346 1347
	ovl->manager = NULL;
	list_del(&ovl->list);

1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376
	spin_unlock_irqrestore(&data_lock, flags);

	mutex_unlock(&apply_lock);

	return 0;
err:
	mutex_unlock(&apply_lock);
	return r;
}

bool dss_ovl_is_enabled(struct omap_overlay *ovl)
{
	struct ovl_priv_data *op = get_ovl_priv(ovl);
	unsigned long flags;
	bool e;

	spin_lock_irqsave(&data_lock, flags);

	e = op->enabled;

	spin_unlock_irqrestore(&data_lock, flags);

	return e;
}

int dss_ovl_enable(struct omap_overlay *ovl)
{
	struct ovl_priv_data *op = get_ovl_priv(ovl);
	unsigned long flags;
1377
	bool fifo_merge;
1378 1379 1380 1381
	int r;

	mutex_lock(&apply_lock);

1382 1383
	if (op->enabled) {
		r = 0;
1384
		goto err1;
1385 1386
	}

1387 1388
	if (ovl->manager == NULL || ovl->manager->device == NULL) {
		r = -EINVAL;
1389
		goto err1;
1390 1391 1392 1393
	}

	spin_lock_irqsave(&data_lock, flags);

T
Tomi Valkeinen 已提交
1394 1395
	op->enabling = true;

1396 1397 1398 1399 1400 1401 1402
	r = dss_check_settings(ovl->manager, ovl->manager->device);
	if (r) {
		DSSERR("failed to enable overlay %d: check_settings failed\n",
				ovl->id);
		goto err2;
	}

1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418
	/* step 1: configure fifos/fifomerge for currently enabled ovls */

	fifo_merge = get_use_fifo_merge();
	dss_setup_fifos(fifo_merge);
	dss_apply_fifo_merge(fifo_merge);

	dss_write_regs();
	dss_set_go_bits();

	spin_unlock_irqrestore(&data_lock, flags);

	/* wait for fifo configs to go in */
	wait_pending_extra_info_updates();

	/* step 2: enable the overlay */
	spin_lock_irqsave(&data_lock, flags);
1419

T
Tomi Valkeinen 已提交
1420 1421 1422
	op->enabling = false;
	dss_apply_ovl_enable(ovl, true);

1423
	dss_write_regs();
1424
	dss_set_go_bits();
1425

1426 1427
	spin_unlock_irqrestore(&data_lock, flags);

1428 1429 1430
	/* wait for overlay to be enabled */
	wait_pending_extra_info_updates();

1431 1432 1433
	mutex_unlock(&apply_lock);

	return 0;
1434
err2:
T
Tomi Valkeinen 已提交
1435
	op->enabling = false;
1436 1437
	spin_unlock_irqrestore(&data_lock, flags);
err1:
1438 1439 1440 1441 1442 1443 1444 1445
	mutex_unlock(&apply_lock);
	return r;
}

int dss_ovl_disable(struct omap_overlay *ovl)
{
	struct ovl_priv_data *op = get_ovl_priv(ovl);
	unsigned long flags;
1446
	bool fifo_merge;
1447 1448 1449 1450
	int r;

	mutex_lock(&apply_lock);

1451 1452 1453 1454 1455
	if (!op->enabled) {
		r = 0;
		goto err;
	}

1456 1457 1458 1459 1460
	if (ovl->manager == NULL || ovl->manager->device == NULL) {
		r = -EINVAL;
		goto err;
	}

1461
	/* step 1: disable the overlay */
1462 1463
	spin_lock_irqsave(&data_lock, flags);

1464
	dss_apply_ovl_enable(ovl, false);
1465

1466
	dss_write_regs();
1467
	dss_set_go_bits();
1468

1469 1470
	spin_unlock_irqrestore(&data_lock, flags);

1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488
	/* wait for the overlay to be disabled */
	wait_pending_extra_info_updates();

	/* step 2: configure fifos/fifomerge */
	spin_lock_irqsave(&data_lock, flags);

	fifo_merge = get_use_fifo_merge();
	dss_setup_fifos(fifo_merge);
	dss_apply_fifo_merge(fifo_merge);

	dss_write_regs();
	dss_set_go_bits();

	spin_unlock_irqrestore(&data_lock, flags);

	/* wait for fifo config to go in */
	wait_pending_extra_info_updates();

T
Tomi Valkeinen 已提交
1489 1490
	mutex_unlock(&apply_lock);

1491
	return 0;
1492

T
Tomi Valkeinen 已提交
1493 1494 1495
err:
	mutex_unlock(&apply_lock);
	return r;
1496 1497
}