From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD9B9C433E3 for ; Sun, 23 Aug 2020 10:46:22 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 93FC72072D for ; Sun, 23 Aug 2020 10:46:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IfpqUiII" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93FC72072D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ravnborg.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DF6A6E4B5; Sun, 23 Aug 2020 10:46:15 +0000 (UTC) Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 076336E4A5 for ; Sun, 23 Aug 2020 10:46:13 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id m22so6442265ljj.5 for ; Sun, 23 Aug 2020 03:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CGjyfF6xlJLEfzU1EzO7NPKZQ2d79Yj/uLVZtkQ1OHc=; b=IfpqUiII/eU5YrnJp6zTwZsD/lRj6HilZJpfUhr8Sv7816lU692mHQoqdpXKyARkYg 82gk7nNCQ0SU0ZiqB7AqSjPIiulhgex/e4OSs4HTm1h2k0RkQ5onpVLNS3w//W8I0d9B dyZvBvzs0EvCXwNTFppYx47MRFs1AYwTa5UD/U/RBbCEIZ94zx4nxHSYwP/gZCuLlQ2i e8YFLdndxNKUyDSe1bFy8T6RNJDF8fhaUuvpU7c/x+EjVXsl/cylJn/WAOALmvXG5JFe R7wAQ8U8yNY56piHNTz9+gjygNen35w1cgp8KxFJLs/YnZlQsCChT164MG7sODBT9idp Ey6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=CGjyfF6xlJLEfzU1EzO7NPKZQ2d79Yj/uLVZtkQ1OHc=; b=UPCqP76rqrSZhdo2TzOFfLfMrog3Cwf9aPBFYnUozgwFGSx2URp44m/4dKmkwnr8Gw qMLGdQONAMdHQmQjzi6uXpmwlOGDPZWYrp8VfCSsWLGl0e30esrqrZQM7yU2jpr+wV0B xDmtF9XsiKqiDUofCWcK+KJpop6jslFPhGLEEWdHB96a6xYD9GxA7k4S2bX+9ByWetC8 AIXVUaA1PS6ZLwrOjs0sy8LgQW4a9NUgRd8nk7tnGmMbH6cBaZnx7lc12UnSA22dC85f ySx3B1uJgNttjLg6f0RJ6AmcLQ7ALrQ5EU0nvCZc/YBia6g/ZLKk3EYK52uxST3drduQ U0DQ== X-Gm-Message-State: AOAM532xIlVt7Nd9IgvCkgI+i05HeC+MykvYI0GirVuKKgfSqb3EBKqC SfjIleoHftIrlGrDF0vtFUdBYn3wktQsXA== X-Google-Smtp-Source: ABdhPJwgoS7wpcUnDAOQR3clej/964RQG37/B6w7eQhCx1UWXX6aMy0piUAvXQb5OrWeODlbDxCiMg== X-Received: by 2002:a05:651c:153:: with SMTP id c19mr468172ljd.170.1598179571271; Sun, 23 Aug 2020 03:46:11 -0700 (PDT) Received: from saturn.localdomain ([2a00:fd00:805f:db00:2509:20d7:e461:9c16]) by smtp.gmail.com with ESMTPSA id h13sm1516301lji.134.2020.08.23.03.46.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 03:46:10 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Jingoo Han , Lee Jones , Daniel Thompson Subject: [PATCH v2 15/24] drm/panel: samsung-s6e3ha2: Backlight update Date: Sun, 23 Aug 2020 12:45:23 +0200 Message-Id: <20200823104532.1024798-16-sam@ravnborg.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200823104532.1024798-1-sam@ravnborg.org> References: <20200823104532.1024798-1-sam@ravnborg.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Thierry Reding , Sam Ravnborg , Hoegeun Kwon Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" - Use backlight support from drm_panel. This shifts this driver away from manually handling of power state. - Add helper function for registering backlight, like other samsung panel drivers do. - Register backlight driver after drm_panel_init - Use devm_ for backlight register thus benefit from automatic unregistering. Drop all explicit unregistering. In s6e3ha2_disable() a 40 ms delay was dropped. Using drm_panel support backlight is disabled before display is turned off, so delay after turning off the display is irrelevant. Signed-off-by: Sam Ravnborg Cc: Thierry Reding Cc: Sam Ravnborg Cc: Hoegeun Kwon Cc: Inki Dae --- drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 70 ++++++++----------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c index 36ebd5a4ac7b..563c24fcc987 100644 --- a/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c +++ b/drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c @@ -233,7 +233,6 @@ struct s6e3ha2_panel_desc { struct s6e3ha2 { struct device *dev; struct drm_panel panel; - struct backlight_device *bl_dev; struct regulator_bulk_data supplies[2]; struct gpio_desc *reset_gpio; @@ -408,15 +407,10 @@ static int s6e3ha2_gamma_update(struct s6e3ha2 *ctx) return 0; } -static int s6e3ha2_get_brightness(struct backlight_device *bl_dev) -{ - return bl_dev->props.brightness; -} - static int s6e3ha2_set_vint(struct s6e3ha2 *ctx) { - struct backlight_device *bl_dev = ctx->bl_dev; - unsigned int brightness = bl_dev->props.brightness; + struct backlight_device *bl_dev = ctx->panel.backlight; + unsigned int brightness = backlight_get_brightness(bl_dev); unsigned char data[] = { 0xf4, 0x8b, vint_table[brightness * (S6E3HA2_VINT_STATUS_MAX - 1) / S6E3HA2_MAX_BRIGHTNESS] }; @@ -432,7 +426,7 @@ static unsigned int s6e3ha2_get_brightness_index(unsigned int brightness) static int s6e3ha2_update_gamma(struct s6e3ha2 *ctx, unsigned int brightness) { - struct backlight_device *bl_dev = ctx->bl_dev; + struct backlight_device *bl_dev = ctx->panel.backlight; unsigned int index = s6e3ha2_get_brightness_index(brightness); u8 data[S6E3HA2_GAMMA_CMD_CNT + 1] = { 0xca, }; int ret; @@ -442,7 +436,7 @@ static int s6e3ha2_update_gamma(struct s6e3ha2 *ctx, unsigned int brightness) s6e3ha2_dcs_write(ctx, data, ARRAY_SIZE(data))); s6e3ha2_call_write_func(ret, s6e3ha2_gamma_update(ctx)); - bl_dev->props.brightness = brightness; + backlight_set_brightness(bl_dev, brightness); return 0; } @@ -450,18 +444,15 @@ static int s6e3ha2_update_gamma(struct s6e3ha2 *ctx, unsigned int brightness) static int s6e3ha2_set_brightness(struct backlight_device *bl_dev) { struct s6e3ha2 *ctx = bl_get_data(bl_dev); - unsigned int brightness = bl_dev->props.brightness; + unsigned int brightness = backlight_get_brightness(bl_dev); int ret; if (brightness < S6E3HA2_MIN_BRIGHTNESS || - brightness > bl_dev->props.max_brightness) { + brightness > backlight_get_max_brightness(bl_dev)) { dev_err(ctx->dev, "Invalid brightness: %u\n", brightness); return -EINVAL; } - if (bl_dev->props.power > FB_BLANK_NORMAL) - return -EPERM; - s6e3ha2_call_write_func(ret, s6e3ha2_test_key_on_f0(ctx)); s6e3ha2_call_write_func(ret, s6e3ha2_update_gamma(ctx, brightness)); s6e3ha2_call_write_func(ret, s6e3ha2_aor_control(ctx)); @@ -472,7 +463,6 @@ static int s6e3ha2_set_brightness(struct backlight_device *bl_dev) } static const struct backlight_ops s6e3ha2_bl_ops = { - .get_brightness = s6e3ha2_get_brightness, .update_status = s6e3ha2_set_brightness, }; @@ -508,9 +498,6 @@ static int s6e3ha2_disable(struct drm_panel *panel) s6e3ha2_call_write_func(ret, mipi_dsi_dcs_enter_sleep_mode(dsi)); s6e3ha2_call_write_func(ret, mipi_dsi_dcs_set_display_off(dsi)); - msleep(40); - ctx->bl_dev->props.power = FB_BLANK_NORMAL; - return 0; } @@ -555,8 +542,6 @@ static int s6e3ha2_prepare(struct drm_panel *panel) if (ret < 0) goto err; - ctx->bl_dev->props.power = FB_BLANK_NORMAL; - return 0; err: @@ -588,7 +573,7 @@ static int s6e3ha2_enable(struct drm_panel *panel) s6e3ha2_call_write_func(ret, s6e3ha2_te_start_setting(ctx)); /* brightness setting */ - s6e3ha2_call_write_func(ret, s6e3ha2_set_brightness(ctx->bl_dev)); + s6e3ha2_call_write_func(ret, s6e3ha2_set_brightness(panel->backlight)); s6e3ha2_call_write_func(ret, s6e3ha2_aor_control(ctx)); s6e3ha2_call_write_func(ret, s6e3ha2_caps_elvss_set(ctx)); s6e3ha2_call_write_func(ret, s6e3ha2_gamma_update(ctx)); @@ -602,7 +587,6 @@ static int s6e3ha2_enable(struct drm_panel *panel) s6e3ha2_call_write_func(ret, s6e3ha2_test_key_off_f0(ctx)); s6e3ha2_call_write_func(ret, mipi_dsi_dcs_set_display_on(dsi)); - ctx->bl_dev->props.power = FB_BLANK_UNBLANK; return 0; } @@ -678,6 +662,25 @@ static const struct drm_panel_funcs s6e3ha2_drm_funcs = { .get_modes = s6e3ha2_get_modes, }; +static int s6e3ha2_backlight_register(struct s6e3ha2 *ctx) +{ + DECLARE_BACKLIGHT_INIT_RAW(props, S6E3HA2_DEFAULT_BRIGHTNESS, S6E3HA2_MAX_BRIGHTNESS); + struct device *dev = ctx->dev; + struct backlight_device *bd; + int ret = 0; + + bd = devm_backlight_device_register(dev, "panel", dev, ctx, + &s6e3ha2_bl_ops, &props); + if (IS_ERR(bd)) { + ret = PTR_ERR(bd); + dev_err(dev, "error registering backlight device (%d)\n", ret); + return ret; + } + + ctx->panel.backlight = bd; + return ret; +} + static int s6e3ha2_probe(struct mipi_dsi_device *dsi) { struct device *dev = &dsi->dev; @@ -721,23 +724,16 @@ static int s6e3ha2_probe(struct mipi_dsi_device *dsi) return PTR_ERR(ctx->enable_gpio); } - ctx->bl_dev = backlight_device_register("s6e3ha2", dev, ctx, - &s6e3ha2_bl_ops, NULL); - if (IS_ERR(ctx->bl_dev)) { - dev_err(dev, "failed to register backlight device\n"); - return PTR_ERR(ctx->bl_dev); - } - - ctx->bl_dev->props.max_brightness = S6E3HA2_MAX_BRIGHTNESS; - ctx->bl_dev->props.brightness = S6E3HA2_DEFAULT_BRIGHTNESS; - ctx->bl_dev->props.power = FB_BLANK_POWERDOWN; - drm_panel_init(&ctx->panel, dev, &s6e3ha2_drm_funcs, DRM_MODE_CONNECTOR_DSI); + ret = s6e3ha2_backlight_register(ctx); + if (ret) + return ret; + ret = drm_panel_add(&ctx->panel); if (ret < 0) - goto unregister_backlight; + return ret; ret = mipi_dsi_attach(dsi); if (ret < 0) @@ -748,9 +744,6 @@ static int s6e3ha2_probe(struct mipi_dsi_device *dsi) remove_panel: drm_panel_remove(&ctx->panel); -unregister_backlight: - backlight_device_unregister(ctx->bl_dev); - return ret; } @@ -760,7 +753,6 @@ static int s6e3ha2_remove(struct mipi_dsi_device *dsi) mipi_dsi_detach(dsi); drm_panel_remove(&ctx->panel); - backlight_device_unregister(ctx->bl_dev); return 0; } -- 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel