Prechádzať zdrojové kódy

Merge "disp: msm: sde: fix precise vsync feature check"

qctecmdr 3 rokov pred
rodič
commit
63a9b89055
2 zmenil súbory, kde vykonal 1 pridanie a 3 odobranie
  1. 1 1
      msm/sde/sde_crtc.c
  2. 0 2
      msm/sde/sde_hw_catalog.h

+ 1 - 1
msm/sde/sde_crtc.c

@@ -4971,7 +4971,7 @@ static void sde_crtc_enable(struct drm_crtc *crtc,
 		intf_mode = sde_crtc_get_intf_mode(crtc, crtc->state);
 		if ((intf_mode != INTF_MODE_WB_BLOCK) && (intf_mode != INTF_MODE_WB_LINE)) {
 			/* max possible vsync_cnt(atomic_t) soft counter */
-			if (kms->catalog->has_precise_vsync_ts)
+			if (test_bit(SDE_FEATURE_HW_VSYNC_TS, kms->catalog->features))
 				drm_crtc_set_max_vblank_count(crtc, INT_MAX);
 			drm_crtc_vblank_on(crtc);
 		}

+ 0 - 2
msm/sde/sde_hw_catalog.h

@@ -1746,7 +1746,6 @@ struct sde_perf_cfg {
  * @smart_dma_rev       smartDMA block version
  * @ctl_rev             control path block version
  * @sid_rev             SID version
- * @has_precise_vsync_ts  indicates if HW has vsyc timestamp logging capability
  * @has_reduced_ob_max indicate if DSC size is limited to 10k
  * @ts_prefill_rev      prefill traffic shaper feature revision
  * @true_inline_rot_rev inline rotator feature revision
@@ -1852,7 +1851,6 @@ struct sde_mdss_cfg {
 	u32 smart_dma_rev;
 	u32 ctl_rev;
 	u32 sid_rev;
-	bool has_precise_vsync_ts;
 	bool has_reduced_ob_max;
 	u32 ts_prefill_rev;
 	u32 true_inline_rot_rev;