Pārlūkot izejas kodu

Merge "disp: msm: sde: check for hardware ownership before histogram read"

qctecmdr 2 gadi atpakaļ
vecāks
revīzija
dc5a69d265
1 mainītis faili ar 9 papildinājumiem un 0 dzēšanām
  1. 9 0
      msm/sde/sde_color_processing.c

+ 9 - 0
msm/sde/sde_color_processing.c

@@ -19,6 +19,7 @@
 #include "sde_core_irq.h"
 #include "dsi_panel.h"
 #include "sde_hw_color_proc_common_v4.h"
+#include "sde_vm.h"
 
 struct sde_cp_node {
 	u32 property_id;
@@ -3923,6 +3924,14 @@ static void _sde_cp_notify_hist_event(struct drm_crtc *crtc_drm, void *arg)
 		return;
 	}
 
+	sde_vm_lock(kms);
+	if (!sde_vm_owns_hw(kms)) {
+		SDE_DEBUG("op not supported due to HW unavailability\n");
+		sde_vm_unlock(kms);
+		return;
+	}
+	sde_vm_unlock(kms);
+
 	/* disable histogram irq */
 	spin_lock_irqsave(&crtc->spin_lock, flags);
 	node = _sde_cp_get_intr_node(DRM_EVENT_HISTOGRAM, crtc);