apply.c 29.3 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

	bool irq_enabled;
109
} dss_data;
T
Tomi Valkeinen 已提交
110

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

117 118
static void dss_register_vsync_isr(void);

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

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

T
Tomi Valkeinen 已提交
129 130
void dss_apply_init(void)
{
131 132 133
	const int num_ovls = dss_feat_get_num_ovls();
	int i;

134
	spin_lock_init(&data_lock);
135 136 137 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

	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 已提交
163 164 165 166 167 168 169 170 171 172 173 174
}

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;
}

175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 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 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305
/* Check if overlay parameters are compatible with display */
static int dss_ovl_check(struct omap_overlay *ovl,
		struct omap_overlay_info *info, struct omap_dss_device *dssdev)
{
	u16 outw, outh;
	u16 dw, dh;

	if (dssdev == NULL)
		return 0;

	dssdev->driver->get_resolution(dssdev, &dw, &dh);

	if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
		outw = info->width;
		outh = info->height;
	} else {
		if (info->out_width == 0)
			outw = info->width;
		else
			outw = info->out_width;

		if (info->out_height == 0)
			outh = info->height;
		else
			outh = info->out_height;
	}

	if (dw < info->pos_x + outw) {
		DSSERR("overlay %d horizontally not inside the display area "
				"(%d + %d >= %d)\n",
				ovl->id, info->pos_x, outw, dw);
		return -EINVAL;
	}

	if (dh < info->pos_y + outh) {
		DSSERR("overlay %d vertically not inside the display area "
				"(%d + %d >= %d)\n",
				ovl->id, info->pos_y, outh, dh);
		return -EINVAL;
	}

	return 0;
}

static int dss_mgr_check_zorder(struct omap_overlay_manager *mgr,
		struct omap_overlay_info **overlay_infos)
{
	struct omap_overlay *ovl1, *ovl2;
	struct ovl_priv_data *op1, *op2;
	struct omap_overlay_info *info1, *info2;

	list_for_each_entry(ovl1, &mgr->overlays, list) {
		op1 = get_ovl_priv(ovl1);
		info1 = overlay_infos[ovl1->id];

		if (info1 == NULL)
			continue;

		list_for_each_entry(ovl2, &mgr->overlays, list) {
			if (ovl1 == ovl2)
				continue;

			op2 = get_ovl_priv(ovl2);
			info2 = overlay_infos[ovl2->id];

			if (info2 == NULL)
				continue;

			if (info1->zorder == info2->zorder) {
				DSSERR("overlays %d and %d have the same "
						"zorder %d\n",
					ovl1->id, ovl2->id, info1->zorder);
				return -EINVAL;
			}
		}
	}

	return 0;
}

static int dss_mgr_check(struct omap_overlay_manager *mgr,
		struct omap_dss_device *dssdev,
		struct omap_overlay_manager_info *info,
		struct omap_overlay_info **overlay_infos)
{
	struct omap_overlay *ovl;
	int r;

	if (dss_has_feature(FEAT_ALPHA_FREE_ZORDER)) {
		r = dss_mgr_check_zorder(mgr, overlay_infos);
		if (r)
			return r;
	}

	list_for_each_entry(ovl, &mgr->overlays, list) {
		struct omap_overlay_info *oi;
		int r;

		oi = overlay_infos[ovl->id];

		if (oi == NULL)
			continue;

		r = dss_ovl_check(ovl, oi, dssdev);
		if (r)
			return r;
	}

	return 0;
}
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 已提交
306
		if (!op->enabled && !op->enabling)
307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337
			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);
}

338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353
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 已提交
354 355 356 357 358 359 360 361
		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;
362

T
Tomi Valkeinen 已提交
363
			/* to write new values to registers */
364
			if (mp->info_dirty)
T
Tomi Valkeinen 已提交
365
				return true;
366

T
Tomi Valkeinen 已提交
367 368 369 370
			/* to set GO bit */
			if (mp->shadow_info_dirty)
				return true;

T
Tomi Valkeinen 已提交
371 372
			list_for_each_entry(ovl, &mgr->overlays, list) {
				struct ovl_priv_data *op;
373

T
Tomi Valkeinen 已提交
374
				op = get_ovl_priv(ovl);
375

T
Tomi Valkeinen 已提交
376 377 378 379 380 381 382 383 384 385 386 387 388 389
				/*
				 * 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 已提交
390 391
				if (!op->enabled)
					continue;
392

T
Tomi Valkeinen 已提交
393
				/* to write new values to registers */
T
Tomi Valkeinen 已提交
394 395 396 397 398
				if (op->info_dirty)
					return true;

				/* to set GO bit */
				if (op->shadow_info_dirty)
T
Tomi Valkeinen 已提交
399 400
					return true;
			}
401 402 403 404 405 406 407 408 409 410 411 412 413 414
		}
	}

	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);

415
	if (mp->shadow_info_dirty)
416 417 418 419
		return true;

	list_for_each_entry(ovl, &mgr->overlays, list) {
		op = get_ovl_priv(ovl);
420
		if (op->shadow_info_dirty || op->shadow_extra_info_dirty)
421 422 423 424 425 426
			return true;
	}

	return false;
}

427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444
/* 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);

		mp = get_mgr_priv(ovl->manager);

		if (!mp->enabled)
			continue;

445
		if (!mp->updating)
446 447
			continue;

448 449
		if (op->extra_info_dirty || op->shadow_extra_info_dirty)
			return true;
450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482
	}

	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;

	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);
	wait_for_completion_timeout(&extra_updated_completion, t);

	updating = extra_info_update_ongoing();

	WARN_ON(updating);
}

T
Tomi Valkeinen 已提交
483 484 485
int dss_mgr_wait_for_go(struct omap_overlay_manager *mgr)
{
	unsigned long timeout = msecs_to_jiffies(500);
486
	struct mgr_priv_data *mp;
T
Tomi Valkeinen 已提交
487 488 489 490 491 492 493 494 495 496 497
	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;

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

500
	mp = get_mgr_priv(mgr);
T
Tomi Valkeinen 已提交
501 502 503 504 505
	i = 0;
	while (1) {
		unsigned long flags;
		bool shadow_dirty, dirty;

506
		spin_lock_irqsave(&data_lock, flags);
507 508
		dirty = mp->info_dirty;
		shadow_dirty = mp->shadow_info_dirty;
509
		spin_unlock_irqrestore(&data_lock, flags);
T
Tomi Valkeinen 已提交
510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543

		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;
		}
	}

	return r;
}

int dss_mgr_wait_for_go_ovl(struct omap_overlay *ovl)
{
	unsigned long timeout = msecs_to_jiffies(500);
544
	struct ovl_priv_data *op;
T
Tomi Valkeinen 已提交
545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560
	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;

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

563
	op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
564 565 566 567 568
	i = 0;
	while (1) {
		unsigned long flags;
		bool shadow_dirty, dirty;

569
		spin_lock_irqsave(&data_lock, flags);
570 571
		dirty = op->info_dirty;
		shadow_dirty = op->shadow_info_dirty;
572
		spin_unlock_irqrestore(&data_lock, flags);
T
Tomi Valkeinen 已提交
573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603

		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;
		}
	}

	return r;
}

604
static void dss_ovl_write_regs(struct omap_overlay *ovl)
T
Tomi Valkeinen 已提交
605
{
606
	struct ovl_priv_data *op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
607 608
	struct omap_overlay_info *oi;
	bool ilace, replication;
T
Tomi Valkeinen 已提交
609
	struct mgr_priv_data *mp;
T
Tomi Valkeinen 已提交
610 611
	int r;

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

614
	if (!op->enabled || !op->info_dirty)
615
		return;
T
Tomi Valkeinen 已提交
616

617
	oi = &op->info;
T
Tomi Valkeinen 已提交
618 619 620 621 622

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

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

623
	r = dispc_ovl_setup(ovl->id, oi, ilace, replication);
T
Tomi Valkeinen 已提交
624
	if (r) {
625 626 627 628
		/*
		 * We can't do much here, as this function can be called from
		 * vsync interrupt.
		 */
629
		DSSERR("dispc_ovl_setup failed for ovl %d\n", ovl->id);
630 631 632 633 634

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

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

639
	op->info_dirty = false;
T
Tomi Valkeinen 已提交
640
	if (mp->updating)
641
		op->shadow_info_dirty = true;
T
Tomi Valkeinen 已提交
642 643
}

644 645 646
static void dss_ovl_write_regs_extra(struct omap_overlay *ovl)
{
	struct ovl_priv_data *op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
647
	struct mgr_priv_data *mp;
648 649 650

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

651 652 653
	if (!op->extra_info_dirty)
		return;

654 655 656 657
	/* note: write also when op->enabled == false, so that the ovl gets
	 * disabled */

	dispc_ovl_enable(ovl->id, op->enabled);
658
	dispc_ovl_set_channel_out(ovl->id, op->channel);
659
	dispc_ovl_set_fifo_threshold(ovl->id, op->fifo_low, op->fifo_high);
660

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

663
	op->extra_info_dirty = false;
T
Tomi Valkeinen 已提交
664 665
	if (mp->updating)
		op->shadow_extra_info_dirty = true;
666 667
}

668
static void dss_mgr_write_regs(struct omap_overlay_manager *mgr)
T
Tomi Valkeinen 已提交
669
{
670 671
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
	struct omap_overlay *ovl;
T
Tomi Valkeinen 已提交
672

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

675 676
	if (!mp->enabled)
		return;
T
Tomi Valkeinen 已提交
677

678
	WARN_ON(mp->busy);
T
Tomi Valkeinen 已提交
679 680

	/* Commit overlay settings */
681 682
	list_for_each_entry(ovl, &mgr->overlays, list) {
		dss_ovl_write_regs(ovl);
683 684 685
		dss_ovl_write_regs_extra(ovl);
	}

686
	if (mp->info_dirty) {
687
		dispc_mgr_setup(mgr->id, &mp->info);
T
Tomi Valkeinen 已提交
688

689
		mp->info_dirty = false;
T
Tomi Valkeinen 已提交
690
		if (mp->updating)
691
			mp->shadow_info_dirty = true;
T
Tomi Valkeinen 已提交
692
	}
693 694 695 696 697 698
}

static void dss_write_regs(void)
{
	const int num_mgrs = omap_dss_get_num_overlay_managers();
	int i;
T
Tomi Valkeinen 已提交
699 700

	for (i = 0; i < num_mgrs; ++i) {
701 702
		struct omap_overlay_manager *mgr;
		struct mgr_priv_data *mp;
703
		int r;
704

705 706
		mgr = omap_dss_get_overlay_manager(i);
		mp = get_mgr_priv(mgr);
T
Tomi Valkeinen 已提交
707

708
		if (!mp->enabled || mgr_manual_update(mgr) || mp->busy)
T
Tomi Valkeinen 已提交
709 710
			continue;

711 712 713 714 715 716 717
		r = dss_check_settings(mgr, mgr->device);
		if (r) {
			DSSERR("cannot write registers for manager %s: "
					"illegal configuration\n", mgr->name);
			continue;
		}

718
		dss_mgr_write_regs(mgr);
719 720
	}
}
721

722 723 724 725
static void dss_set_go_bits(void)
{
	const int num_mgrs = omap_dss_get_num_overlay_managers();
	int i;
T
Tomi Valkeinen 已提交
726

727 728 729
	for (i = 0; i < num_mgrs; ++i) {
		struct omap_overlay_manager *mgr;
		struct mgr_priv_data *mp;
T
Tomi Valkeinen 已提交
730

731 732 733 734 735 736 737 738 739 740 741 742 743 744 745
		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);
746
	}
747

T
Tomi Valkeinen 已提交
748 749 750 751
}

void dss_mgr_start_update(struct omap_overlay_manager *mgr)
{
752
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
753
	unsigned long flags;
754
	int r;
755 756

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

T
Tomi Valkeinen 已提交
758 759
	WARN_ON(mp->updating);

760 761 762 763 764 765 766
	r = dss_check_settings(mgr, mgr->device);
	if (r) {
		DSSERR("cannot start manual update: illegal configuration\n");
		spin_unlock_irqrestore(&data_lock, flags);
		return;
	}

767
	dss_mgr_write_regs(mgr);
T
Tomi Valkeinen 已提交
768

T
Tomi Valkeinen 已提交
769
	mp->updating = true;
T
Tomi Valkeinen 已提交
770

T
Tomi Valkeinen 已提交
771 772
	if (!dss_data.irq_enabled && need_isr())
		dss_register_vsync_isr();
T
Tomi Valkeinen 已提交
773

774
	dispc_mgr_enable(mgr->id, true);
775 776

	spin_unlock_irqrestore(&data_lock, flags);
T
Tomi Valkeinen 已提交
777 778
}

779 780 781 782
static void dss_apply_irq_handler(void *data, u32 mask);

static void dss_register_vsync_isr(void)
{
783
	const int num_mgrs = dss_feat_get_num_mgrs();
784
	u32 mask;
785
	int r, i;
786

787 788 789
	mask = 0;
	for (i = 0; i < num_mgrs; ++i)
		mask |= dispc_mgr_get_vsync_irq(i);
790

T
Tomi Valkeinen 已提交
791 792 793
	for (i = 0; i < num_mgrs; ++i)
		mask |= dispc_mgr_get_framedone_irq(i);

794 795 796
	r = omap_dispc_register_isr(dss_apply_irq_handler, NULL, mask);
	WARN_ON(r);

797
	dss_data.irq_enabled = true;
798 799 800 801
}

static void dss_unregister_vsync_isr(void)
{
802
	const int num_mgrs = dss_feat_get_num_mgrs();
803
	u32 mask;
804
	int r, i;
805

806 807 808
	mask = 0;
	for (i = 0; i < num_mgrs; ++i)
		mask |= dispc_mgr_get_vsync_irq(i);
809

T
Tomi Valkeinen 已提交
810 811 812
	for (i = 0; i < num_mgrs; ++i)
		mask |= dispc_mgr_get_framedone_irq(i);

813 814 815
	r = omap_dispc_unregister_isr(dss_apply_irq_handler, NULL, mask);
	WARN_ON(r);

816
	dss_data.irq_enabled = false;
817 818
}

819
static void mgr_clear_shadow_dirty(struct omap_overlay_manager *mgr)
T
Tomi Valkeinen 已提交
820
{
821
	struct omap_overlay *ovl;
822
	struct mgr_priv_data *mp;
823
	struct ovl_priv_data *op;
824 825

	mp = get_mgr_priv(mgr);
826
	mp->shadow_info_dirty = false;
827 828 829

	list_for_each_entry(ovl, &mgr->overlays, list) {
		op = get_ovl_priv(ovl);
830
		op->shadow_info_dirty = false;
831 832 833 834 835 836
		op->shadow_extra_info_dirty = false;
	}
}

static void dss_apply_irq_handler(void *data, u32 mask)
{
T
Tomi Valkeinen 已提交
837
	const int num_mgrs = dss_feat_get_num_mgrs();
838
	int i;
839
	bool extra_updating;
T
Tomi Valkeinen 已提交
840

841
	spin_lock(&data_lock);
T
Tomi Valkeinen 已提交
842

843
	/* clear busy, updating flags, shadow_dirty flags */
844
	for (i = 0; i < num_mgrs; i++) {
845 846
		struct omap_overlay_manager *mgr;
		struct mgr_priv_data *mp;
847
		bool was_updating;
848

849 850 851
		mgr = omap_dss_get_overlay_manager(i);
		mp = get_mgr_priv(mgr);

852
		if (!mp->enabled)
853 854
			continue;

855
		was_updating = mp->updating;
856
		mp->updating = dispc_mgr_is_enabled(i);
T
Tomi Valkeinen 已提交
857

858
		if (!mgr_manual_update(mgr)) {
859
			bool was_busy = mp->busy;
860
			mp->busy = dispc_mgr_go_busy(i);
861

862
			if (was_busy && !mp->busy)
863 864
				mgr_clear_shadow_dirty(mgr);
		} else {
865
			if (was_updating && !mp->updating)
866 867
				mgr_clear_shadow_dirty(mgr);
		}
T
Tomi Valkeinen 已提交
868 869
	}

870
	dss_write_regs();
871
	dss_set_go_bits();
T
Tomi Valkeinen 已提交
872

873 874 875 876
	extra_updating = extra_info_update_ongoing();
	if (!extra_updating)
		complete_all(&extra_updated_completion);

877 878
	if (!need_isr())
		dss_unregister_vsync_isr();
T
Tomi Valkeinen 已提交
879

880
	spin_unlock(&data_lock);
T
Tomi Valkeinen 已提交
881 882
}

883
static void omap_dss_mgr_apply_ovl(struct omap_overlay *ovl)
T
Tomi Valkeinen 已提交
884
{
885
	struct ovl_priv_data *op;
T
Tomi Valkeinen 已提交
886

887
	op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
888

889
	if (!op->user_info_dirty)
890
		return;
T
Tomi Valkeinen 已提交
891

892
	op->user_info_dirty = false;
893
	op->info_dirty = true;
894
	op->info = op->user_info;
T
Tomi Valkeinen 已提交
895 896 897 898
}

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

901
	mp = get_mgr_priv(mgr);
T
Tomi Valkeinen 已提交
902

903
	if (!mp->user_info_dirty)
T
Tomi Valkeinen 已提交
904 905
		return;

906
	mp->user_info_dirty = false;
907
	mp->info_dirty = true;
908
	mp->info = mp->user_info;
T
Tomi Valkeinen 已提交
909 910
}

911
int omap_dss_mgr_apply(struct omap_overlay_manager *mgr)
T
Tomi Valkeinen 已提交
912
{
913 914
	unsigned long flags;
	struct omap_overlay *ovl;
915
	int r;
916 917 918 919 920

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

	spin_lock_irqsave(&data_lock, flags);

921 922 923 924 925 926 927
	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;
	}

928 929 930 931 932 933 934 935
	/* 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();
936
	dss_set_go_bits();
937 938 939

	spin_unlock_irqrestore(&data_lock, flags);

940
	return 0;
941 942
}

943 944 945 946 947 948 949 950 951 952 953 954 955
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;
}

956 957 958
static void dss_ovl_setup_fifo(struct omap_overlay *ovl)
{
	struct ovl_priv_data *op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
959 960
	struct omap_dss_device *dssdev;
	u32 size, burst_size;
961
	u32 fifo_low, fifo_high;
T
Tomi Valkeinen 已提交
962 963 964 965 966 967 968 969 970 971 972 973 974 975

	dssdev = ovl->manager->device;

	size = dispc_ovl_get_fifo_size(ovl->id);

	burst_size = dispc_ovl_get_burst_size(ovl->id);

	switch (dssdev->type) {
	case OMAP_DISPLAY_TYPE_DPI:
	case OMAP_DISPLAY_TYPE_DBI:
	case OMAP_DISPLAY_TYPE_SDI:
	case OMAP_DISPLAY_TYPE_VENC:
	case OMAP_DISPLAY_TYPE_HDMI:
		default_get_overlay_fifo_thresholds(ovl->id, size,
976
				burst_size, &fifo_low, &fifo_high);
T
Tomi Valkeinen 已提交
977 978 979 980
		break;
#ifdef CONFIG_OMAP2_DSS_DSI
	case OMAP_DISPLAY_TYPE_DSI:
		dsi_get_overlay_fifo_thresholds(ovl->id, size,
981
				burst_size, &fifo_low, &fifo_high);
T
Tomi Valkeinen 已提交
982 983 984 985 986
		break;
#endif
	default:
		BUG();
	}
987 988 989 990

	op->fifo_low = fifo_low;
	op->fifo_high = fifo_high;
	op->extra_info_dirty = true;
T
Tomi Valkeinen 已提交
991 992
}

993
static void dss_mgr_setup_fifos(struct omap_overlay_manager *mgr)
T
Tomi Valkeinen 已提交
994
{
995
	struct omap_overlay *ovl;
996 997
	struct ovl_priv_data *op;
	struct mgr_priv_data *mp;
T
Tomi Valkeinen 已提交
998

999
	mp = get_mgr_priv(mgr);
T
Tomi Valkeinen 已提交
1000

1001 1002
	if (!mp->enabled)
		return;
T
Tomi Valkeinen 已提交
1003

1004 1005
	list_for_each_entry(ovl, &mgr->overlays, list) {
		op = get_ovl_priv(ovl);
T
Tomi Valkeinen 已提交
1006

T
Tomi Valkeinen 已提交
1007
		if (!op->enabled && !op->enabling)
1008
			continue;
T
Tomi Valkeinen 已提交
1009

1010 1011
		dss_ovl_setup_fifo(ovl);
	}
T
Tomi Valkeinen 已提交
1012 1013
}

1014
int dss_mgr_enable(struct omap_overlay_manager *mgr)
1015
{
1016 1017
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
	unsigned long flags;
1018
	int r;
1019

T
Tomi Valkeinen 已提交
1020 1021
	mutex_lock(&apply_lock);

1022 1023 1024
	if (mp->enabled)
		goto out;

1025 1026
	spin_lock_irqsave(&data_lock, flags);

1027 1028 1029 1030 1031 1032
	mp->enabled = true;
	r = dss_check_settings(mgr, mgr->device);
	mp->enabled = false;
	if (r) {
		DSSERR("failed to enable manager %d: check_settings failed\n",
				mgr->id);
1033
		goto err;
1034 1035
	}

1036 1037
	mp->enabled = true;

1038 1039
	dss_mgr_setup_fifos(mgr);

1040
	dss_write_regs();
1041
	dss_set_go_bits();
1042

T
Tomi Valkeinen 已提交
1043 1044 1045
	if (!mgr_manual_update(mgr))
		mp->updating = true;

1046
	spin_unlock_irqrestore(&data_lock, flags);
T
Tomi Valkeinen 已提交
1047

1048 1049 1050
	if (!mgr_manual_update(mgr))
		dispc_mgr_enable(mgr->id, true);

1051
out:
T
Tomi Valkeinen 已提交
1052
	mutex_unlock(&apply_lock);
1053 1054 1055 1056 1057 1058 1059

	return 0;

err:
	spin_unlock_irqrestore(&data_lock, flags);
	mutex_unlock(&apply_lock);
	return r;
1060 1061 1062 1063
}

void dss_mgr_disable(struct omap_overlay_manager *mgr)
{
1064 1065 1066
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
	unsigned long flags;

T
Tomi Valkeinen 已提交
1067 1068
	mutex_lock(&apply_lock);

1069 1070 1071
	if (!mp->enabled)
		goto out;

1072 1073
	if (!mgr_manual_update(mgr))
		dispc_mgr_enable(mgr->id, false);
1074 1075 1076

	spin_lock_irqsave(&data_lock, flags);

T
Tomi Valkeinen 已提交
1077
	mp->updating = false;
1078 1079 1080
	mp->enabled = false;

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

1082
out:
T
Tomi Valkeinen 已提交
1083
	mutex_unlock(&apply_lock);
1084 1085
}

1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104
static int dss_mgr_simple_check(struct omap_overlay_manager *mgr,
		const struct omap_overlay_manager_info *info)
{
	if (dss_has_feature(FEAT_ALPHA_FIXED_ZORDER)) {
		/*
		 * OMAP3 supports only graphics source transparency color key
		 * and alpha blending simultaneously. See TRM 15.4.2.4.2.2
		 * Alpha Mode.
		 */
		if (info->partial_alpha_enabled && info->trans_enabled
			&& info->trans_key_type != OMAP_DSS_COLOR_KEY_GFX_DST) {
			DSSERR("check_manager: illegal transparency key\n");
			return -EINVAL;
		}
	}

	return 0;
}

1105 1106 1107
int dss_mgr_set_info(struct omap_overlay_manager *mgr,
		struct omap_overlay_manager_info *info)
{
1108
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
1109
	unsigned long flags;
1110 1111 1112 1113 1114
	int r;

	r = dss_mgr_simple_check(mgr, info);
	if (r)
		return r;
1115 1116 1117

	spin_lock_irqsave(&data_lock, flags);

1118 1119
	mp->user_info = *info;
	mp->user_info_dirty = true;
1120

1121 1122
	spin_unlock_irqrestore(&data_lock, flags);

1123 1124 1125 1126 1127 1128
	return 0;
}

void dss_mgr_get_info(struct omap_overlay_manager *mgr,
		struct omap_overlay_manager_info *info)
{
1129
	struct mgr_priv_data *mp = get_mgr_priv(mgr);
1130 1131 1132 1133
	unsigned long flags;

	spin_lock_irqsave(&data_lock, flags);

1134
	*info = mp->user_info;
1135 1136

	spin_unlock_irqrestore(&data_lock, flags);
1137 1138 1139 1140 1141 1142 1143
}

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

T
Tomi Valkeinen 已提交
1144 1145
	mutex_lock(&apply_lock);

1146 1147 1148
	if (dssdev->manager) {
		DSSERR("display '%s' already has a manager '%s'\n",
			       dssdev->name, dssdev->manager->name);
T
Tomi Valkeinen 已提交
1149 1150
		r = -EINVAL;
		goto err;
1151 1152 1153 1154 1155
	}

	if ((mgr->supported_displays & dssdev->type) == 0) {
		DSSERR("display '%s' does not support manager '%s'\n",
			       dssdev->name, mgr->name);
T
Tomi Valkeinen 已提交
1156 1157
		r = -EINVAL;
		goto err;
1158 1159 1160 1161 1162
	}

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

T
Tomi Valkeinen 已提交
1163 1164
	mutex_unlock(&apply_lock);

1165
	return 0;
T
Tomi Valkeinen 已提交
1166 1167 1168
err:
	mutex_unlock(&apply_lock);
	return r;
1169 1170 1171 1172
}

int dss_mgr_unset_device(struct omap_overlay_manager *mgr)
{
T
Tomi Valkeinen 已提交
1173 1174 1175 1176
	int r;

	mutex_lock(&apply_lock);

1177 1178
	if (!mgr->device) {
		DSSERR("failed to unset display, display not set.\n");
T
Tomi Valkeinen 已提交
1179 1180
		r = -EINVAL;
		goto err;
1181 1182 1183 1184 1185 1186
	}

	/*
	 * Don't allow currently enabled displays to have the overlay manager
	 * pulled out from underneath them
	 */
T
Tomi Valkeinen 已提交
1187 1188 1189 1190
	if (mgr->device->state != OMAP_DSS_DISPLAY_DISABLED) {
		r = -EINVAL;
		goto err;
	}
1191 1192 1193 1194

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

T
Tomi Valkeinen 已提交
1195 1196
	mutex_unlock(&apply_lock);

1197
	return 0;
T
Tomi Valkeinen 已提交
1198 1199 1200
err:
	mutex_unlock(&apply_lock);
	return r;
1201 1202 1203
}


1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238
static int dss_ovl_simple_check(struct omap_overlay *ovl,
		const struct omap_overlay_info *info)
{
	if (info->paddr == 0) {
		DSSERR("check_overlay: paddr cannot be 0\n");
		return -EINVAL;
	}

	if ((ovl->caps & OMAP_DSS_OVL_CAP_SCALE) == 0) {
		if (info->out_width != 0 && info->width != info->out_width) {
			DSSERR("check_overlay: overlay %d doesn't support "
					"scaling\n", ovl->id);
			return -EINVAL;
		}

		if (info->out_height != 0 && info->height != info->out_height) {
			DSSERR("check_overlay: overlay %d doesn't support "
					"scaling\n", ovl->id);
			return -EINVAL;
		}
	}

	if ((ovl->supported_modes & info->color_mode) == 0) {
		DSSERR("check_overlay: overlay %d doesn't support mode %d\n",
				ovl->id, info->color_mode);
		return -EINVAL;
	}

	if (info->zorder >= omap_dss_get_num_overlays()) {
		DSSERR("check_overlay: zorder %d too high\n", info->zorder);
		return -EINVAL;
	}

	return 0;
}
1239

1240 1241 1242
int dss_ovl_set_info(struct omap_overlay *ovl,
		struct omap_overlay_info *info)
{
1243
	struct ovl_priv_data *op = get_ovl_priv(ovl);
1244
	unsigned long flags;
1245 1246 1247 1248 1249
	int r;

	r = dss_ovl_simple_check(ovl, info);
	if (r)
		return r;
1250 1251 1252

	spin_lock_irqsave(&data_lock, flags);

1253 1254
	op->user_info = *info;
	op->user_info_dirty = true;
1255

1256 1257
	spin_unlock_irqrestore(&data_lock, flags);

1258 1259 1260 1261 1262 1263
	return 0;
}

void dss_ovl_get_info(struct omap_overlay *ovl,
		struct omap_overlay_info *info)
{
1264
	struct ovl_priv_data *op = get_ovl_priv(ovl);
1265 1266 1267 1268
	unsigned long flags;

	spin_lock_irqsave(&data_lock, flags);

1269
	*info = op->user_info;
1270 1271

	spin_unlock_irqrestore(&data_lock, flags);
1272 1273 1274 1275 1276
}

int dss_ovl_set_manager(struct omap_overlay *ovl,
		struct omap_overlay_manager *mgr)
{
1277 1278
	struct ovl_priv_data *op = get_ovl_priv(ovl);
	unsigned long flags;
T
Tomi Valkeinen 已提交
1279 1280
	int r;

1281 1282 1283
	if (!mgr)
		return -EINVAL;

T
Tomi Valkeinen 已提交
1284 1285
	mutex_lock(&apply_lock);

1286 1287 1288
	if (ovl->manager) {
		DSSERR("overlay '%s' already has a manager '%s'\n",
				ovl->name, ovl->manager->name);
T
Tomi Valkeinen 已提交
1289 1290
		r = -EINVAL;
		goto err;
1291 1292
	}

1293 1294 1295 1296
	spin_lock_irqsave(&data_lock, flags);

	if (op->enabled) {
		spin_unlock_irqrestore(&data_lock, flags);
1297
		DSSERR("overlay has to be disabled to change the manager\n");
T
Tomi Valkeinen 已提交
1298 1299
		r = -EINVAL;
		goto err;
1300 1301
	}

1302 1303 1304
	op->channel = mgr->id;
	op->extra_info_dirty = true;

1305 1306 1307
	ovl->manager = mgr;
	list_add_tail(&ovl->list, &mgr->overlays);

1308 1309
	spin_unlock_irqrestore(&data_lock, flags);

1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322
	/* 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 已提交
1323 1324
	mutex_unlock(&apply_lock);

1325
	return 0;
T
Tomi Valkeinen 已提交
1326 1327 1328
err:
	mutex_unlock(&apply_lock);
	return r;
1329 1330 1331 1332
}

int dss_ovl_unset_manager(struct omap_overlay *ovl)
{
1333 1334
	struct ovl_priv_data *op = get_ovl_priv(ovl);
	unsigned long flags;
T
Tomi Valkeinen 已提交
1335 1336 1337 1338
	int r;

	mutex_lock(&apply_lock);

1339 1340
	if (!ovl->manager) {
		DSSERR("failed to detach overlay: manager not set\n");
T
Tomi Valkeinen 已提交
1341 1342
		r = -EINVAL;
		goto err;
1343 1344
	}

1345 1346 1347 1348
	spin_lock_irqsave(&data_lock, flags);

	if (op->enabled) {
		spin_unlock_irqrestore(&data_lock, flags);
1349
		DSSERR("overlay has to be disabled to unset the manager\n");
T
Tomi Valkeinen 已提交
1350 1351
		r = -EINVAL;
		goto err;
1352 1353
	}

1354 1355
	op->channel = -1;

1356 1357 1358
	ovl->manager = NULL;
	list_del(&ovl->list);

1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391
	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;
	int r;

	mutex_lock(&apply_lock);

1392 1393
	if (op->enabled) {
		r = 0;
1394
		goto err1;
1395 1396
	}

1397 1398
	if (ovl->manager == NULL || ovl->manager->device == NULL) {
		r = -EINVAL;
1399
		goto err1;
1400 1401 1402 1403
	}

	spin_lock_irqsave(&data_lock, flags);

T
Tomi Valkeinen 已提交
1404 1405
	op->enabling = true;

1406 1407 1408 1409 1410 1411 1412
	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;
	}

1413 1414
	dss_ovl_setup_fifo(ovl);

T
Tomi Valkeinen 已提交
1415 1416 1417
	op->enabling = false;
	dss_apply_ovl_enable(ovl, true);

1418
	dss_write_regs();
1419
	dss_set_go_bits();
1420

1421 1422 1423 1424 1425
	spin_unlock_irqrestore(&data_lock, flags);

	mutex_unlock(&apply_lock);

	return 0;
1426
err2:
T
Tomi Valkeinen 已提交
1427
	op->enabling = false;
1428 1429
	spin_unlock_irqrestore(&data_lock, flags);
err1:
1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441
	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;
	int r;

	mutex_lock(&apply_lock);

1442 1443 1444 1445 1446
	if (!op->enabled) {
		r = 0;
		goto err;
	}

1447 1448 1449 1450 1451 1452 1453
	if (ovl->manager == NULL || ovl->manager->device == NULL) {
		r = -EINVAL;
		goto err;
	}

	spin_lock_irqsave(&data_lock, flags);

1454
	dss_apply_ovl_enable(ovl, false);
1455
	dss_write_regs();
1456
	dss_set_go_bits();
1457

1458 1459
	spin_unlock_irqrestore(&data_lock, flags);

T
Tomi Valkeinen 已提交
1460 1461
	mutex_unlock(&apply_lock);

1462
	return 0;
1463

T
Tomi Valkeinen 已提交
1464 1465 1466
err:
	mutex_unlock(&apply_lock);
	return r;
1467 1468
}