Merge branch 'display-kernel.lnx.5.10' into display-kernel.lnx.1.0

Change-Id: I5d2b08380b6b0eb09492b950fb38cd9a0b3196c1
这个提交包含在:
Jeykumar Sankaran
2021-12-08 12:37:35 -08:00
当前提交 cf39b00660
修改 53 个文件,包含 1867 行新增334 行删除

查看文件

@@ -175,7 +175,6 @@ enum msm_mdp_crtc_property {
CRTC_PROP_ROT_CLK,
CRTC_PROP_ROI_V1,
CRTC_PROP_SECURITY_LEVEL,
CRTC_PROP_IDLE_TIMEOUT,
CRTC_PROP_DEST_SCALER,
CRTC_PROP_CAPTURE_OUTPUT,
@@ -980,6 +979,8 @@ struct msm_drm_private {
struct task_struct *pp_event_thread;
struct kthread_worker pp_event_worker;
struct kthread_work thread_priority_work;
unsigned int num_encoders;
struct drm_encoder *encoders[MAX_ENCODERS];