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

Commit ada3dbfc authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "drm/msm: Clean up dangling atomic_wq""

parents 342e88fe e594e3f1

drivers/gpu/drm/msm/msm_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -301,6 +301,9 @@ static int msm_drm_uninit(struct device *dev) 
	flush_workqueue(priv->wq);

	destroy_workqueue(priv->wq);



	flush_workqueue(priv->atomic_wq);

	destroy_workqueue(priv->atomic_wq);



	if (kms && kms->funcs)

		kms->funcs->destroy(kms);
@@ -446,6 +449,7 @@ static int msm_drm_init(struct device *dev, struct drm_driver *drv) 
	mdss = priv->mdss;



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

	priv->atomic_wq = alloc_ordered_workqueue("msm:atomic", 0);



	INIT_LIST_HEAD(&priv->inactive_list);

	INIT_LIST_HEAD(&priv->vblank_ctrl.event_list);

drivers/gpu/drm/msm/msm_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct msm_drm_private { 
	struct list_head inactive_list;



	struct workqueue_struct *wq;

	struct workqueue_struct *atomic_wq;



	unsigned int num_planes;

	struct drm_plane *planes[MAX_PLANES];