Commit abbf3108 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov
Browse files

drm/msm/dpu: drop global_state_lock 



Since the commit b962a120 ("drm/atomic: integrate modeset lock with
private objects") the DRM framework no longer requires the external
lock for private objects. Drop the lock, letting the DRM to manage
private object locking.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/570174/
Link: https://lore.kernel.org/r/20231203000532.1290480-4-dmitry.baryshkov@linaro.org
parent 49e27d3c

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c

+0 −8
Original line number Diff line number Diff line
@@ -317,11 +317,6 @@ struct dpu_global_state *dpu_kms_get_global_state(struct drm_atomic_state *s) 
	struct msm_drm_private *priv = s->dev->dev_private;

	struct dpu_kms *dpu_kms = to_dpu_kms(priv->kms);

	struct drm_private_state *priv_state;

	int ret;



	ret = drm_modeset_lock(&dpu_kms->global_state_lock, s->acquire_ctx);

	if (ret)

		return ERR_PTR(ret);



	priv_state = drm_atomic_get_private_obj_state(s,

						&dpu_kms->global_state);
@@ -362,8 +357,6 @@ static int dpu_kms_global_obj_init(struct dpu_kms *dpu_kms) 
{

	struct dpu_global_state *state;



	drm_modeset_lock_init(&dpu_kms->global_state_lock);



	state = kzalloc(sizeof(*state), GFP_KERNEL);

	if (!state)

		return -ENOMEM;
@@ -377,7 +370,6 @@ static int dpu_kms_global_obj_init(struct dpu_kms *dpu_kms) 
static void dpu_kms_global_obj_fini(struct dpu_kms *dpu_kms)

{

	drm_atomic_private_obj_fini(&dpu_kms->global_state);

	drm_modeset_lock_fini(&dpu_kms->global_state_lock);

}



static int dpu_kms_parse_data_bus_icc_path(struct dpu_kms *dpu_kms)

drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ struct dpu_kms { 
	 * Global private object state, Do not access directly, use

	 * dpu_kms_global_get_state()

	 */

	struct drm_modeset_lock global_state_lock;

	struct drm_private_obj global_state;



	struct dpu_rm rm;