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

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

Merge "disp: msm: sde: add vig formats before qseed and csc initializations"

parents 88abc2fa fb72c8fa

msm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -132,3 +132,5 @@ msm_drm-$(CONFIG_DRM_MSM) += \ 
msm_drm-$(CONFIG_HDCP_QSEECOM) += ../hdcp/msm_hdcp.o \



obj-$(CONFIG_DISPLAY_BUILD)	+= msm_drm.o



obj-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o

msm/msm_gem.c

+4 −6
Original line number Diff line number Diff line
@@ -449,7 +449,8 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj, 
			if (IS_ERR(obj->import_attach)) {

				DRM_ERROR("dma_buf_attach failure, err=%ld\n",

						PTR_ERR(obj->import_attach));

				goto unlock;

				ret = PTR_ERR(obj->import_attach);

				return ret;

			}

			msm_obj->obj_dirty = false;

			reattach = true;
@@ -462,14 +463,14 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj, 
			if (ret) {

				DRM_ERROR("delayed dma-buf import failed %d\n",

						ret);

				goto unlock;

				return ret;

			}

		}



		vma = add_vma(obj, aspace);

		if (IS_ERR(vma)) {

			ret = PTR_ERR(vma);

			goto unlock;

			return ret;

		}



		pages = get_pages(obj);
@@ -493,13 +494,10 @@ static int msm_gem_get_iova_locked(struct drm_gem_object *obj, 
		mutex_unlock(&aspace->list_lock);

	}



	mutex_unlock(&msm_obj->lock);

	return 0;



fail:

	del_vma(vma);

unlock:

	mutex_unlock(&msm_obj->lock);

	return ret;

}

static int msm_gem_pin_iova(struct drm_gem_object *obj,

msm/sde/sde_core_perf.c

+3 −0
Original line number Diff line number Diff line
@@ -818,6 +818,9 @@ static void _sde_core_perf_crtc_update_check(struct drm_crtc *crtc, 
	struct sde_core_perf_params *new = &sde_crtc->new_perf;

	int i;



	if (!kms)

		return;



	for (i = 0; i < SDE_POWER_HANDLE_DBUS_ID_MAX; i++) {

		/*

		 * cases for bus bandwidth update.

msm/sde/sde_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static void _sde_crtc_setup_dim_layer_cfg(struct drm_crtc *crtc, 
						cstate->lm_roi[i].y;

		}



		SDE_EVT32_VERBOSE(DRMID(crtc),

		SDE_EVT32(DRMID(crtc), dim_layer->stage,

				cstate->lm_roi[i].x,

				cstate->lm_roi[i].y,

				cstate->lm_roi[i].w,

msm/sde/sde_encoder.c

+3 −1
Original line number Diff line number Diff line
@@ -2656,7 +2656,9 @@ static void sde_encoder_virt_enable(struct drm_encoder *drm_enc) 


	_sde_encoder_input_handler_register(drm_enc);



	if (!(msm_is_mode_seamless_vrr(cur_mode)

	if ((drm_enc->crtc->state->connectors_changed &&

			sde_encoder_in_clone_mode(drm_enc)) ||

			!(msm_is_mode_seamless_vrr(cur_mode)

			|| msm_is_mode_seamless_dms(cur_mode)

			|| msm_is_mode_seamless_dyn_clk(cur_mode)))

		kthread_init_delayed_work(&sde_enc->delayed_off_work,