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

Commit 68ce0598 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: enable dp cec for QCS605"

parents 7a1d1f0c bfa138e7

arch/arm64/configs/sdm670-perf_defconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -396,6 +396,7 @@ CONFIG_DVB_MPQ_DEMUX=m 
CONFIG_DVB_MPQ_SW=y

CONFIG_DVB_MPQ_SW=y

CONFIG_QCOM_KGSL=y

CONFIG_QCOM_KGSL=y

CONFIG_DRM=y

CONFIG_DRM=y

CONFIG_DRM_DP_CEC=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y

CONFIG_DRM_SDE_RSC=y

CONFIG_DRM_SDE_RSC=y

CONFIG_DRM_LT_LT9611=y

CONFIG_DRM_LT_LT9611=y
@@ -486,6 +487,8 @@ CONFIG_QCOM_GPI_DMA=y 
CONFIG_UIO=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_STAGING=y

CONFIG_STAGING_MEDIA=y

CONFIG_MEDIA_CEC=y

CONFIG_ASHMEM=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_ION=y

arch/arm64/configs/sdm670_defconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -404,6 +404,7 @@ CONFIG_DVB_MPQ_DEMUX=m 
CONFIG_DVB_MPQ_SW=y

CONFIG_DVB_MPQ_SW=y

CONFIG_QCOM_KGSL=y

CONFIG_QCOM_KGSL=y

CONFIG_DRM=y

CONFIG_DRM=y

CONFIG_DRM_DP_CEC=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y

CONFIG_DRM_SDE_EVTLOG_DEBUG=y

CONFIG_DRM_SDE_RSC=y

CONFIG_DRM_SDE_RSC=y

CONFIG_DRM_LT_LT9611=y

CONFIG_DRM_LT_LT9611=y
@@ -499,6 +500,8 @@ CONFIG_QCOM_GPI_DMA_DEBUG=y 
CONFIG_UIO=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_STAGING=y

CONFIG_STAGING_MEDIA=y

CONFIG_MEDIA_CEC=y

CONFIG_ASHMEM=y

CONFIG_ASHMEM=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ANDROID_LOW_MEMORY_KILLER=y

CONFIG_ION=y

CONFIG_ION=y

drivers/gpu/drm/drm_dp_cec.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -289,7 +289,7 @@ static void drm_dp_cec_unregister_work(struct work_struct *work) 
 */

 */

void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid)

void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid)

{

{

	u32 cec_caps = CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD;

	u32 cec_caps = CEC_CAP_DEFAULTS;

	unsigned int num_las = 1;

	unsigned int num_las = 1;

	u8 cap;

	u8 cap;
@@ -335,12 +335,12 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid) 
	/* Create a new adapter */

	/* Create a new adapter */

	aux->cec.adap = cec_allocate_adapter(&drm_dp_cec_adap_ops,

	aux->cec.adap = cec_allocate_adapter(&drm_dp_cec_adap_ops,

					     aux, aux->cec.name, cec_caps,

					     aux, aux->cec.name, cec_caps,

					     num_las);

					     num_las, aux->cec.parent);

	if (IS_ERR(aux->cec.adap)) {

	if (IS_ERR(aux->cec.adap)) {

		aux->cec.adap = NULL;

		aux->cec.adap = NULL;

		goto unlock;

		goto unlock;

	}

	}

	if (cec_register_adapter(aux->cec.adap, aux->cec.parent)) {

	if (cec_register_adapter(aux->cec.adap)) {

		cec_delete_adapter(aux->cec.adap);

		cec_delete_adapter(aux->cec.adap);

		aux->cec.adap = NULL;

		aux->cec.adap = NULL;

	} else {

	} else {
@@ -403,7 +403,10 @@ EXPORT_SYMBOL(drm_dp_cec_unset_edid); 
void drm_dp_cec_register_connector(struct drm_dp_aux *aux, const char *name,

void drm_dp_cec_register_connector(struct drm_dp_aux *aux, const char *name,

				   struct device *parent)

				   struct device *parent)

{

{

	if (aux->cec.adap) {

		WARN_ON(aux->cec.adap);

		WARN_ON(aux->cec.adap);

		return;

	}

	aux->cec.name = name;

	aux->cec.name = name;

	aux->cec.parent = parent;

	aux->cec.parent = parent;

	INIT_DELAYED_WORK(&aux->cec.unregister_work,

	INIT_DELAYED_WORK(&aux->cec.unregister_work,