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

Commit 7a5bea77 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'msm-fixes-4.14-rc4' of git://people.freedesktop.org/~robclark/linux into drm-fixes 

bunch of msm fixes

* 'msm-fixes-4.14-rc4' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: fix _NO_IMPLICIT fencing case
  drm/msm: fix error path cleanup
  drm/msm/mdp5: Remove extra pm_runtime_put call in mdp5_crtc_cursor_set()
  drm/msm/dsi: Use correct pm_runtime_put variant during host_init
  drm/msm: fix return value check in _msm_gem_kernel_new()
  drm/msm: use proper memory barriers for updating tail/head
  drm/msm/mdp5: add missing max size for 8x74 v1
parents a6402e80 06451a3d

drivers/gpu/drm/msm/dsi/dsi_host.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static const struct msm_dsi_cfg_handler *dsi_get_config( 
	clk_disable_unprepare(ahb_clk);

disable_gdsc:

	regulator_disable(gdsc_reg);

	pm_runtime_put_autosuspend(dev);

	pm_runtime_put_sync(dev);

put_clk:

	clk_put(ahb_clk);

put_gdsc:

drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ const struct mdp5_cfg_hw msm8x74v1_config = { 
				  .caps = MDP_LM_CAP_WB },

			     },

		.nb_stages = 5,

		.max_width = 2048,

		.max_height = 0xFFFF,

	},

	.dspp = {

		.count = 3,

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

+0 −2
Original line number Diff line number Diff line
@@ -804,8 +804,6 @@ static int mdp5_crtc_cursor_set(struct drm_crtc *crtc, 


	spin_unlock_irqrestore(&mdp5_crtc->cursor.lock, flags);



	pm_runtime_put_autosuspend(&pdev->dev);



set_cursor:

	ret = mdp5_ctl_set_cursor(ctl, pipeline, 0, cursor_enable);

	if (ret) {

drivers/gpu/drm/msm/msm_gem.c

+2 −13
Original line number Diff line number Diff line
@@ -610,17 +610,6 @@ int msm_gem_sync_object(struct drm_gem_object *obj, 
	struct dma_fence *fence;

	int i, ret;



	if (!exclusive) {

		/* NOTE: _reserve_shared() must happen before _add_shared_fence(),

		 * which makes this a slightly strange place to call it.  OTOH this

		 * is a convenient can-fail point to hook it in.  (And similar to

		 * how etnaviv and nouveau handle this.)

		 */

		ret = reservation_object_reserve_shared(msm_obj->resv);

		if (ret)

			return ret;

	}



	fobj = reservation_object_get_list(msm_obj->resv);

	if (!fobj || (fobj->shared_count == 0)) {

		fence = reservation_object_get_excl(msm_obj->resv);
@@ -1045,10 +1034,10 @@ static void *_msm_gem_kernel_new(struct drm_device *dev, uint32_t size, 
	}



	vaddr = msm_gem_get_vaddr(obj);

	if (!vaddr) {

	if (IS_ERR(vaddr)) {

		msm_gem_put_iova(obj, aspace);

		drm_gem_object_unreference(obj);

		return ERR_PTR(-ENOMEM);

		return ERR_CAST(vaddr);

	}



	if (bo)

drivers/gpu/drm/msm/msm_gem_submit.c

+18 −6
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int submit_lock_objects(struct msm_gem_submit *submit) 
	return ret;

}



static int submit_fence_sync(struct msm_gem_submit *submit)

static int submit_fence_sync(struct msm_gem_submit *submit, bool no_implicit)

{

	int i, ret = 0;
@@ -229,6 +229,20 @@ static int submit_fence_sync(struct msm_gem_submit *submit) 
		struct msm_gem_object *msm_obj = submit->bos[i].obj;

		bool write = submit->bos[i].flags & MSM_SUBMIT_BO_WRITE;



		if (!write) {

			/* NOTE: _reserve_shared() must happen before

			 * _add_shared_fence(), which makes this a slightly

			 * strange place to call it.  OTOH this is a

			 * convenient can-fail point to hook it in.

			 */

			ret = reservation_object_reserve_shared(msm_obj->resv);

			if (ret)

				return ret;

		}



		if (no_implicit)

			continue;



		ret = msm_gem_sync_object(&msm_obj->base, submit->gpu->fctx, write);

		if (ret)

			break;
@@ -451,11 +465,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
	if (ret)

		goto out;



	if (!(args->flags & MSM_SUBMIT_NO_IMPLICIT)) {

		ret = submit_fence_sync(submit);

	ret = submit_fence_sync(submit, !!(args->flags & MSM_SUBMIT_NO_IMPLICIT));

	if (ret)

		goto out;

	}



	ret = submit_pin_objects(submit);

	if (ret)