From eab3fd66db309a5de1d321939a393ca20b9f9e1c Mon Sep 17 00:00:00 2001 From: Nilaan Gunabalachandran Date: Mon, 6 Jun 2022 10:48:57 -0400 Subject: [PATCH] disp: msm: sde: convert ubwc stats roi into blob property This change converts the ubwc stats roi into a blob property. This allows for the roi data structure to be passed into kernel. Change-Id: I4b30dcc16bcbd152428861444ff321add860942f Signed-off-by: Nilaan Gunabalachandran --- msm/msm_drv.h | 2 +- msm/sde/sde_crtc.c | 2 +- msm/sde/sde_plane.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/msm/msm_drv.h b/msm/msm_drv.h index 39f35fa078..2a7c001052 100644 --- a/msm/msm_drv.h +++ b/msm/msm_drv.h @@ -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, diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c index ae47ea51a6..e66204767c 100644 --- a/msm/sde/sde_crtc.c +++ b/msm/sde/sde_crtc.c @@ -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); diff --git a/msm/sde/sde_plane.c b/msm/sde/sde_plane.c index cb7ddb50ed..09f90d6f84 100644 --- a/msm/sde/sde_plane.c +++ b/msm/sde/sde_plane.c @@ -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); }