summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Tai <williamtai@google.com>2021-07-26 14:50:36 +0800
committerTreeHugger Robot <treehugger-gerrit@google.com>2021-07-27 10:33:57 +0000
commitc7198e16d27e171e34aeb6bb1655597b9a40a43a (patch)
tree1bb3a120c5a20f0e08b318b79487c53ae84ed8ca
parent6f682eb3e16536b07a5afd1fb2c91abe6d87e2f3 (diff)
downloaddisplay-c7198e16d27e171e34aeb6bb1655597b9a40a43a.tar.gz
panel: remove dimming and bl sync between panel and drm connector state
Drm connector commit will check dimming and bl pending_update_flags before update dimming and bl status so there is no need to keep dimming and bl sync between panel and connector state in dimming and bl update functions. Bug: 194424645 Signed-off-by: William Tai <williamtai@google.com> Change-Id: Icec501b115b7139c7b5d66978fc57c7d16b71d07
-rw-r--r--samsung/panel/panel-samsung-drv.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/samsung/panel/panel-samsung-drv.c b/samsung/panel/panel-samsung-drv.c
index aa62b99..abee3e1 100644
--- a/samsung/panel/panel-samsung-drv.c
+++ b/samsung/panel/panel-samsung-drv.c
@@ -817,7 +817,6 @@ static int exynos_update_status(struct backlight_device *bl)
const struct exynos_panel_funcs *exynos_panel_func;
int brightness = bl->props.brightness;
int min_brightness = ctx->desc->min_brightness ? : 1;
- struct drm_connector_state *conn_state;
u32 bl_range = 0;
if (!ctx->enabled || !ctx->initialized) {
@@ -835,14 +834,6 @@ static int exynos_update_status(struct backlight_device *bl)
dev_info(ctx->dev, "req: %d, br: %d\n", bl->props.brightness,
brightness);
- /* TODO(b/175121444): add drm_modeset_lock() to protect brightness sync */
- conn_state = ctx->exynos_connector.base.state;
- if (conn_state) {
- struct exynos_drm_connector_state *exynos_connector_state =
- to_exynos_connector_state(conn_state);
- exynos_connector_state->brightness_level = brightness;
- }
-
mutex_lock(&ctx->mode_lock);
exynos_panel_func = ctx->desc->exynos_panel_func;
if (exynos_panel_func && exynos_panel_func->set_brightness)
@@ -2038,8 +2029,6 @@ static ssize_t dimming_on_store(struct device *dev,
struct backlight_device *bd = to_backlight_device(dev);
struct exynos_panel *ctx = bl_get_data(bd);
const struct exynos_panel_funcs *funcs = ctx->desc->exynos_panel_func;
- struct drm_connector_state *conn_state;
- struct drm_mode_config *config;
bool dimming_on;
int ret;
@@ -2055,17 +2044,6 @@ static ssize_t dimming_on_store(struct device *dev,
}
if (funcs && funcs->set_dimming_on) {
- config = &ctx->exynos_connector.base.dev->mode_config;
-
- drm_modeset_lock(&config->connection_mutex, NULL);
- conn_state = ctx->exynos_connector.base.state;
- if (conn_state) {
- struct exynos_drm_connector_state *exynos_connector_state =
- to_exynos_connector_state(conn_state);
- exynos_connector_state->dimming_on = dimming_on;
- }
- drm_modeset_unlock(&config->connection_mutex);
-
mutex_lock(&ctx->mode_lock);
funcs->set_dimming_on(ctx, dimming_on);
mutex_unlock(&ctx->mode_lock);