Commit a2cd9947 authored by Fernando Ramos's avatar Fernando Ramos Committed by Sean Paul
Browse files

drm/tegra: cleanup: drm_modeset_lock_all() --> DRM_MODESET_LOCK_ALL_BEGIN() 



As requested in Documentation/gpu/todo.rst, replace driver calls to
drm_modeset_lock_all() with DRM_MODESET_LOCK_ALL_BEGIN() and
DRM_MODESET_LOCK_ALL_END()

Signed-off-by: default avatarFernando Ramos <greenfoo@u92.eu>
Reviewed-by: default avatarSean Paul <sean@poorly.run>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210924064324.229457-7-greenfoo@u92.eu
parent 6b92e771

drivers/gpu/drm/tegra/dsi.c

+4 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <drm/drm_mipi_dsi.h>

#include <drm/drm_panel.h>

#include <drm/drm_simple_kms_helper.h>

#include <drm/drm_drv.h>



#include "dc.h"

#include "drm.h"
@@ -202,10 +203,11 @@ static int tegra_dsi_show_regs(struct seq_file *s, void *data) 
	struct tegra_dsi *dsi = node->info_ent->data;

	struct drm_crtc *crtc = dsi->output.encoder.crtc;

	struct drm_device *drm = node->minor->dev;

	struct drm_modeset_acquire_ctx ctx;

	unsigned int i;

	int err = 0;



	drm_modeset_lock_all(drm);

	DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, err);



	if (!crtc || !crtc->state->active) {

		err = -EBUSY;
@@ -220,7 +222,7 @@ static int tegra_dsi_show_regs(struct seq_file *s, void *data) 
	}



unlock:

	drm_modeset_unlock_all(drm);

	DRM_MODESET_LOCK_ALL_END(drm, ctx, err);

	return err;

}

drivers/gpu/drm/tegra/hdmi.c

+4 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <drm/drm_fourcc.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_simple_kms_helper.h>

#include <drm/drm_drv.h>



#include "hda.h"

#include "hdmi.h"
@@ -1031,10 +1032,11 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data) 
	struct tegra_hdmi *hdmi = node->info_ent->data;

	struct drm_crtc *crtc = hdmi->output.encoder.crtc;

	struct drm_device *drm = node->minor->dev;

	struct drm_modeset_acquire_ctx ctx;

	unsigned int i;

	int err = 0;



	drm_modeset_lock_all(drm);

	DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, err);



	if (!crtc || !crtc->state->active) {

		err = -EBUSY;
@@ -1049,7 +1051,7 @@ static int tegra_hdmi_show_regs(struct seq_file *s, void *data) 
	}



unlock:

	drm_modeset_unlock_all(drm);

	DRM_MODESET_LOCK_ALL_END(drm, ctx, err);

	return err;

}

drivers/gpu/drm/tegra/sor.c

+7 −4
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <drm/drm_panel.h>

#include <drm/drm_scdc_helper.h>

#include <drm/drm_simple_kms_helper.h>

#include <drm/drm_drv.h>



#include "dc.h"

#include "dp.h"
@@ -1490,10 +1491,11 @@ static int tegra_sor_show_crc(struct seq_file *s, void *data) 
	struct tegra_sor *sor = node->info_ent->data;

	struct drm_crtc *crtc = sor->output.encoder.crtc;

	struct drm_device *drm = node->minor->dev;

	struct drm_modeset_acquire_ctx ctx;

	int err = 0;

	u32 value;



	drm_modeset_lock_all(drm);

	DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, err);



	if (!crtc || !crtc->state->active) {

		err = -EBUSY;
@@ -1522,7 +1524,7 @@ static int tegra_sor_show_crc(struct seq_file *s, void *data) 
	seq_printf(s, "%08x\n", value);



unlock:

	drm_modeset_unlock_all(drm);

	DRM_MODESET_LOCK_ALL_END(drm, ctx, err);

	return err;

}
@@ -1652,10 +1654,11 @@ static int tegra_sor_show_regs(struct seq_file *s, void *data) 
	struct tegra_sor *sor = node->info_ent->data;

	struct drm_crtc *crtc = sor->output.encoder.crtc;

	struct drm_device *drm = node->minor->dev;

	struct drm_modeset_acquire_ctx ctx;

	unsigned int i;

	int err = 0;



	drm_modeset_lock_all(drm);

	DRM_MODESET_LOCK_ALL_BEGIN(drm, ctx, 0, err);



	if (!crtc || !crtc->state->active) {

		err = -EBUSY;
@@ -1670,7 +1673,7 @@ static int tegra_sor_show_regs(struct seq_file *s, void *data) 
	}



unlock:

	drm_modeset_unlock_all(drm);

	DRM_MODESET_LOCK_ALL_END(drm, ctx, err);

	return err;

}