Commit a409b78f authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Rob Clark
Browse files

drm/msm: move wq handling to KMS code 



The global workqueue is only used for vblanks inside KMS code. Move
allocation / flushing / deallcation of it to msm_kms.c

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/662573/


Signed-off-by: default avatarRob Clark <robin.clark@oss.qualcomm.com>
parent a452510a

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

+1 −1
Original line number Diff line number Diff line
@@ -980,7 +980,7 @@ static int dpu_encoder_resource_control(struct drm_encoder *drm_enc, 
			return 0;

		}



		queue_delayed_work(priv->wq, &dpu_enc->delayed_off_work,

		queue_delayed_work(priv->kms->wq, &dpu_enc->delayed_off_work,

				   msecs_to_jiffies(dpu_enc->idle_timeout));



		trace_dpu_enc_rc(DRMID(drm_enc), sw_event,

drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static void mdp4_crtc_vblank_irq(struct mdp_irq *irq, uint32_t irqstatus) 


	if (pending & PENDING_CURSOR) {

		update_cursor(crtc);

		drm_flip_work_commit(&mdp4_crtc->unref_cursor_work, priv->wq);

		drm_flip_work_commit(&mdp4_crtc->unref_cursor_work, priv->kms->wq);

	}

}

drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -1196,7 +1196,7 @@ static void mdp5_crtc_vblank_irq(struct mdp_irq *irq, uint32_t irqstatus) 
	}



	if (pending & PENDING_CURSOR)

		drm_flip_work_commit(&mdp5_crtc->unref_cursor_work, priv->wq);

		drm_flip_work_commit(&mdp5_crtc->unref_cursor_work, priv->kms->wq);

}



static void mdp5_crtc_err_irq(struct mdp_irq *irq, uint32_t irqstatus)

drivers/gpu/drm/msm/msm_drv.c

+2 −19
Original line number Diff line number Diff line
@@ -77,13 +77,6 @@ static int msm_drm_uninit(struct device *dev) 
			drm_atomic_helper_shutdown(ddev);

	}



	/* We must cancel and cleanup any pending vblank enable/disable

	 * work before msm_irq_uninstall() to avoid work re-enabling an

	 * irq after uninstall has disabled it.

	 */



	flush_workqueue(priv->wq);



	msm_gem_shrinker_cleanup(ddev);



	msm_perf_debugfs_cleanup(priv);
@@ -97,8 +90,6 @@ static int msm_drm_uninit(struct device *dev) 
	ddev->dev_private = NULL;

	drm_dev_put(ddev);



	destroy_workqueue(priv->wq);



	return 0;

}
@@ -119,12 +110,6 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 
	ddev->dev_private = priv;

	priv->dev = ddev;



	priv->wq = alloc_ordered_workqueue("msm", 0);

	if (!priv->wq) {

		ret = -ENOMEM;

		goto err_put_dev;

	}



	INIT_LIST_HEAD(&priv->objects);

	mutex_init(&priv->obj_lock);
@@ -149,7 +134,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 
	if (priv->kms_init) {

		ret = drmm_mode_config_init(ddev);

		if (ret)

			goto err_destroy_wq;

			goto err_put_dev;

	}



	dma_set_max_seg_size(dev, UINT_MAX);
@@ -157,7 +142,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 
	/* Bind all our sub-components: */

	ret = component_bind_all(dev, ddev);

	if (ret)

		goto err_destroy_wq;

		goto err_put_dev;



	ret = msm_gem_shrinker_init(ddev);

	if (ret)
@@ -194,8 +179,6 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) 


	return ret;



err_destroy_wq:

	destroy_workqueue(priv->wq);

err_put_dev:

	drm_dev_put(ddev);

drivers/gpu/drm/msm/msm_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -175,8 +175,6 @@ struct msm_drm_private { 
		struct mutex lock;

	} lru;



	struct workqueue_struct *wq;



	unsigned int num_crtcs;



	struct msm_drm_thread event_thread[MAX_CRTCS];