Skip to content

Commit 2180627

Browse files
committed
Revert "kcal: color control: upon config change force reprocessing"
This reverts commit 99a2ea8.
1 parent 8f2b825 commit 2180627

3 files changed

Lines changed: 0 additions & 39 deletions

File tree

drivers/gpu/drm/msm/sde/sde_color_processing.c

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
#include "sde_plane.h"
2828
#include "dsi_panel.h"
2929

30-
#ifdef CONFIG_DRM_MSM_KCAL_CTRL
31-
#include "sde_hw_kcal_ctrl.h"
32-
#endif
33-
3430
struct sde_cp_node {
3531
u32 property_id;
3632
u32 prop_flags;
@@ -1033,12 +1029,6 @@ void sde_cp_crtc_install_properties(struct drm_crtc *crtc)
10331029

10341030
}
10351031

1036-
#ifdef CONFIG_DRM_MSM_KCAL_CTRL
1037-
struct drm_crtc *g_pcc_crtc;
1038-
struct drm_property *g_pcc_property;
1039-
uint64_t g_pcc_val;
1040-
#endif
1041-
10421032
int sde_cp_crtc_set_property(struct drm_crtc *crtc,
10431033
struct drm_property *property,
10441034
uint64_t val)
@@ -1072,15 +1062,6 @@ int sde_cp_crtc_set_property(struct drm_crtc *crtc,
10721062
goto exit;
10731063
}
10741064

1075-
#ifdef CONFIG_DRM_MSM_KCAL_CTRL
1076-
if (prop_node->feature == SDE_CP_CRTC_DSPP_PCC) {
1077-
pr_info("%s pcc kad kcal\n",__func__);
1078-
g_pcc_crtc = crtc;
1079-
g_pcc_property = property;
1080-
g_pcc_val = val;
1081-
}
1082-
#endif
1083-
10841065
/**
10851066
* sde_crtc is virtual ensure that hardware has been attached to the
10861067
* crtc. Check LM and dspp counts based on whether feature is a
@@ -1141,16 +1122,6 @@ int sde_cp_crtc_set_property(struct drm_crtc *crtc,
11411122
return ret;
11421123
}
11431124

1144-
#ifdef CONFIG_DRM_MSM_KCAL_CTRL
1145-
void kcal_force_update(void) {
1146-
if (g_pcc_crtc) {
1147-
pr_info("%s force kad kcal\n",__func__);
1148-
sde_cp_crtc_set_property(g_pcc_crtc, g_pcc_property, g_pcc_val);
1149-
}
1150-
}
1151-
EXPORT_SYMBOL(kcal_force_update);
1152-
#endif
1153-
11541125
int sde_cp_crtc_get_property(struct drm_crtc *crtc,
11551126
struct drm_property *property, uint64_t *val)
11561127
{

drivers/gpu/drm/msm/sde/sde_hw_kcal_ctrl.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ static ssize_t store_##node(struct device *dev, \
9191
\
9292
kcal_lut_data.object = val; \
9393
\
94-
kcal_force_update(); \
95-
\
9694
return count; \
9795
} \
9896
\
@@ -127,8 +125,6 @@ static ssize_t store_kcal(struct device *dev,
127125
pcc->green = max(kcal_g, kcal_lut_data.min_value);
128126
pcc->blue = max(kcal_b, kcal_lut_data.min_value);
129127

130-
kcal_force_update();
131-
132128
return count;
133129
}
134130

drivers/gpu/drm/msm/sde/sde_hw_kcal_ctrl.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@ struct drm_msm_pa_hsic sde_hw_kcal_hsic_struct(void);
6363
* @plane: index of pcc color plane.
6464
*/
6565
void sde_hw_kcal_pcc_adjust(u32 *data, int plane);
66-
67-
/**
68-
* kcal_force_update() - force reprocessing on config change.
69-
*/
70-
void kcal_force_update(void);
71-
7266
#else
7367
static inline struct sde_hw_kcal sde_hw_kcal_get(void)
7468
{

0 commit comments

Comments
 (0)