samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "disp: msm: sde: update rc checks for mask configuration"

Browse Source
This commit is contained in:
qctecmdr
2021-10-25 22:07:45 -07:00
committed by Gerrit - the friendly Code Review server
parent 5f5525b418 51de59d06b
commit 195bb007d8
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/display/drm/msm_drm_pp.h
View File

@@ -681,6 +681,8 @@ struct drm_msm_rc_mask_cfg {
__u64 cfg_param_07; __u64 cfg_param_07;
__u32 cfg_param_08; __u32 cfg_param_08;
__u64 cfg_param_09[RC_DATA_SIZE_MAX]; __u64 cfg_param_09[RC_DATA_SIZE_MAX];
__u32 height;
__u32 width;
}; };
#define FP16_SUPPORTED #define FP16_SUPPORTED

10
msm/sde/sde_hw_rc.c
View File

@@ -588,6 +588,13 @@ static int sde_hw_rc_check_mask_cfg(
return -EINVAL; return -EINVAL;
} }
if (hw_cfg->panel_height != rc_mask_cfg->height ||
rc_mask_cfg->width != hw_cfg->panel_width) {
SDE_ERROR("RC mask Layer: h %d w %d panel: h %d w %d mismatch\n",
rc_mask_cfg->height, rc_mask_cfg->width,
hw_cfg->panel_height, hw_cfg->panel_width);
return -EINVAL;
}
flags = rc_mask_cfg->flags; flags = rc_mask_cfg->flags;
cfg_param_01 = rc_mask_cfg->cfg_param_01; cfg_param_01 = rc_mask_cfg->cfg_param_01;
cfg_param_02 = rc_mask_cfg->cfg_param_02; cfg_param_02 = rc_mask_cfg->cfg_param_02;
@@ -728,7 +735,8 @@ int sde_hw_rc_check_mask(struct sde_hw_dspp *hw_dspp, void *cfg)
if (hw_cfg->len != sizeof(struct drm_msm_rc_mask_cfg) || if (hw_cfg->len != sizeof(struct drm_msm_rc_mask_cfg) ||
!hw_cfg->payload) { !hw_cfg->payload) {
SDE_ERROR("invalid payload\n"); SDE_ERROR("invalid payload len %d exp %zd\n", hw_cfg->len,
sizeof(struct drm_msm_rc_mask_cfg));
return -EINVAL; return -EINVAL;
} }