Merge "disp: msm: sde: convert ubwc stats roi into blob property"

This commit is contained in:
qctecmdr
2022-08-14 00:30:30 -07:00
gecommit door Gerrit - the friendly Code Review server
bovenliggende c525494531 eab3fd66db
commit 50420e8d17
3 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen

Bestand weergeven

@@ -117,6 +117,7 @@ enum msm_mdp_plane_property {
PLANE_PROP_DMA_GC,
PLANE_PROP_FP16_GC,
PLANE_PROP_FP16_CSC,
PLANE_PROP_UBWC_STATS_ROI,
/* # of blob properties */
PLANE_PROP_BLOBCOUNT,
@@ -140,7 +141,6 @@ enum msm_mdp_plane_property {
PLANE_PROP_INVERSE_PMA,
PLANE_PROP_FP16_IGC,
PLANE_PROP_FP16_UNMULT,
PLANE_PROP_UBWC_STATS_ROI,
/* enum/bitmask properties */
PLANE_PROP_BLEND_OP,

Bestand weergeven

@@ -2764,7 +2764,7 @@ void sde_crtc_get_frame_data(struct drm_crtc *crtc)
/* Collect plane specific data */
drm_for_each_plane_mask(plane, crtc->dev, sde_crtc->plane_mask_old)
sde_plane_get_frame_data(plane, &data->plane_frame_data[i]);
sde_plane_get_frame_data(plane, &data->plane_frame_data[i++]);
if (frame_data->cnt)
_sde_crtc_frame_data_notify(crtc, data);

Bestand weergeven

@@ -3992,8 +3992,8 @@ static void _sde_plane_install_properties(struct drm_plane *plane,
PLANE_PROP_FB_TRANSLATION_MODE);
if (psde->pipe_hw->ops.set_ubwc_stats_roi)
msm_property_install_range(&psde->property_info, "ubwc_stats_roi",
0, 0, 0xFFFFFFFF, 0, PLANE_PROP_UBWC_STATS_ROI);
msm_property_install_volatile_range(&psde->property_info, "ubwc_stats_roi",
0, 0, ~0, 0, PLANE_PROP_UBWC_STATS_ROI);
vfree(info);
}