Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe6b5039 authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

drm/omap: reorganize locking in mgr_fld_write 



Fix sparse warning:

drivers/gpu/drm/omapdrm/dss/dispc.c:387:9: warning: context imbalance in 'mgr_fld_write' - different lock contexts for basic block

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 663ac57b

drivers/gpu/drm/omapdrm/dss/dispc.c

+5 −5
Original line number Diff line number Diff line
@@ -396,13 +396,13 @@ static void mgr_fld_write(struct dispc_device *dispc, enum omap_channel channel, 
	const bool need_lock = rfld.reg == DISPC_CONTROL || rfld.reg == DISPC_CONFIG;

	unsigned long flags;



	if (need_lock)

	if (need_lock) {

		spin_lock_irqsave(&dispc->control_lock, flags);



		REG_FLD_MOD(dispc, rfld.reg, val, rfld.high, rfld.low);



	if (need_lock)

		spin_unlock_irqrestore(&dispc->control_lock, flags);

	} else {

		REG_FLD_MOD(dispc, rfld.reg, val, rfld.high, rfld.low);

	}

}



static int dispc_get_num_ovls(struct dispc_device *dispc)