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

Commit 99612b27 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/tegra: Don't use modeset_lock_crtc 



Yes the help text is unhelpful, but atomic drivers should never use
this. Just grab the lock without context or anything.

Also an aside: Checking ->active like this doesn't protect against
nonblocking commits, this is rather bogus.

Cc: Thierry Reding <thierry.reding@gmail.com>
Acked-by: default avatarThierry Reding <thierry.reding@gmail.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170322215058.8671-8-daniel.vetter@ffwll.ch
parent c0411316

drivers/gpu/drm/tegra/dc.c

+4 −4
Original line number Diff line number Diff line
@@ -1382,7 +1382,7 @@ static int tegra_dc_show_regs(struct seq_file *s, void *data) 
	struct tegra_dc *dc = node->info_ent->data;

	int err = 0;



	drm_modeset_lock_crtc(&dc->base, NULL);

	drm_modeset_lock(&dc->base.mutex, NULL);



	if (!dc->base.state->active) {

		err = -EBUSY;
@@ -1609,7 +1609,7 @@ static int tegra_dc_show_regs(struct seq_file *s, void *data) 
#undef DUMP_REG



unlock:

	drm_modeset_unlock_crtc(&dc->base);

	drm_modeset_unlock(&dc->base.mutex);

	return err;

}
@@ -1620,7 +1620,7 @@ static int tegra_dc_show_crc(struct seq_file *s, void *data) 
	int err = 0;

	u32 value;



	drm_modeset_lock_crtc(&dc->base, NULL);

	drm_modeset_lock(&dc->base.mutex, NULL);



	if (!dc->base.state->active) {

		err = -EBUSY;
@@ -1640,7 +1640,7 @@ static int tegra_dc_show_crc(struct seq_file *s, void *data) 
	tegra_dc_writel(dc, 0, DC_COM_CRC_CONTROL);



unlock:

	drm_modeset_unlock_crtc(&dc->base);

	drm_modeset_unlock(&dc->base.mutex);

	return err;

}