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

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

Merge "drm/msm/sde: fix IRQ callback list adding issue"

parents f1b7826e 37752284

drivers/gpu/drm/msm/sde/sde_color_processing.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1445,7 +1445,6 @@ int sde_cp_ad_interrupt(struct drm_crtc *crtc_drm, bool en, 
		goto exit;

		goto exit;

	}

	}





	INIT_LIST_HEAD(&ad_irq->list);

	ad_irq->arg = crtc;

	ad_irq->arg = crtc;

	ad_irq->func = sde_cp_ad_interrupt_cb;

	ad_irq->func = sde_cp_ad_interrupt_cb;

	ret = sde_core_irq_register_callback(kms, irq_idx, ad_irq);

	ret = sde_core_irq_register_callback(kms, irq_idx, ad_irq);

drivers/gpu/drm/msm/sde/sde_crtc.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -4705,6 +4705,7 @@ static int _sde_crtc_event_enable(struct sde_kms *kms, 
	if (crtc_drm->enabled) {

	if (crtc_drm->enabled) {

		sde_power_resource_enable(&priv->phandle, kms->core_client,

		sde_power_resource_enable(&priv->phandle, kms->core_client,

				true);

				true);

		INIT_LIST_HEAD(&node->irq.list);

		ret = node->func(crtc_drm, true, &node->irq);

		ret = node->func(crtc_drm, true, &node->irq);

		sde_power_resource_enable(&priv->phandle, kms->core_client,

		sde_power_resource_enable(&priv->phandle, kms->core_client,

				false);

				false);