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 BD904C433E1 for ; Sun, 23 Aug 2020 10:46:46 +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 931272072D for ; Sun, 23 Aug 2020 10:46:46 +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="cIwftmEZ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 931272072D 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 211FC6E4D2; Sun, 23 Aug 2020 10:46:37 +0000 (UTC) Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B2266E49B for ; Sun, 23 Aug 2020 10:46:17 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id i10so6452662ljn.2 for ; Sun, 23 Aug 2020 03:46:17 -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=CvdLxjXaJn11TTJtwrNCJ2FiPaDtkOV4A0DapdP967U=; b=cIwftmEZ70Z4kNecN7JtApoAOOH1GPx5ZkzjlEnh/PomRr1qCSUqPp/SZjPaD2WwOt gZMqW5v9eLKLGRVGGTL3dJiOJVypgMb3bw4tvO9Ek9ryxOBXzegdHM7nBUPNu3ZUe76/ AxbdH9ej9r2mJKpvIrx74Ql3Rk2F0604Awsw/MXFjzH7r0fKY8wqYKku489gPJkzlIrl jEDLvA3kAK3gDwFMvMvUv7uopAiBFAoKkhBh/zXXdYpqKRkJpj9+sHQ1jJMka+mM6fMX S3+ez3YENC+cw+8mThH4sQXTvcMxCWkX/5Nhd/TUgxZMDPEDsl/WbutV/dkp2O4M24T6 1VFw== 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=CvdLxjXaJn11TTJtwrNCJ2FiPaDtkOV4A0DapdP967U=; b=dBHTyiDXCReVZ809HUi0vRUSPv3CzgryF8MGwOgkt/PkWAyxs1GoiVjWcSb7fdXMgc WOx8sIVK79qpZPlogRs5UDwxNOvZkjC99nWFYAeOF/uzuIxpln10+kFGp67yuBi2DkCS woG2t9aKB/5dmglniVQus4MTnUiN9tPhvIDLiOhrC25MMfqQn/lS8CwS1eAiidrwn45b KsxCu4EmuyYBB/bjlLpjAhOiWvsPO7GDaa2wFbaVgWTfPMIWqhgaK8z46EBoNtkSVwEb evmX3A5EJYmIGR21nMJA5QIOwT0SFBdvHuHbXwbEAjud9bkULgakx8nyAd+MNlvRLDbb oqkA== X-Gm-Message-State: AOAM533TXYa3x3hZxvMyjEregs8DOXUL2fFNdlh+1yNn1PpmahCi0+jv 1txR6OeilejeJs6WHxIF/ZKdrml8/3LjNg== X-Google-Smtp-Source: ABdhPJzdLFMCus5PyE+fYm/kg+LkHD9Zljc+pxDNJoD0Jx8/HVGfZw58602RqnUASqPBsyWJIXrFng== X-Received: by 2002:a2e:9812:: with SMTP id a18mr444294ljj.25.1598179575619; Sun, 23 Aug 2020 03:46:15 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 03:46:15 -0700 (PDT) From: Sam Ravnborg To: dri-devel@lists.freedesktop.org, Jingoo Han , Lee Jones , Daniel Thompson Subject: [PATCH v2 18/24] drm/bridge: parade-ps8622: Backlight update Date: Sun, 23 Aug 2020 12:45:26 +0200 Message-Id: <20200823104532.1024798-19-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: Jernej Skrabec , Jonas Karlman , Daniel Vetter , Neil Armstrong , Andrzej Hajda , Laurent Pinchart , Sam Ravnborg Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" - Use blacklight_get_brightness() helper - Use devm_ variant to register backlight device and drop explicit unregister - Use macro for initialization Signed-off-by: Sam Ravnborg Cc: Andrzej Hajda Cc: Neil Armstrong Cc: Laurent Pinchart Cc: Jonas Karlman Cc: Jernej Skrabec --- drivers/gpu/drm/bridge/parade-ps8622.c | 43 +++++++++++++------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c index d789ea2a7fb9..a46a883e0b8c 100644 --- a/drivers/gpu/drm/bridge/parade-ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c @@ -284,8 +284,7 @@ static int ps8622_send_config(struct ps8622_bridge *ps8622) goto error; /* FFh for 100% brightness, 0h for 0% brightness */ - err = ps8622_set(cl, 0x01, 0xa7, - ps8622->bl->props.brightness); + err = ps8622_set(cl, 0x01, 0xa7, backlight_get_brightness(ps8622->bl)); if (err) goto error; } else { @@ -331,18 +330,11 @@ static int ps8622_send_config(struct ps8622_bridge *ps8622) static int ps8622_backlight_update(struct backlight_device *bl) { struct ps8622_bridge *ps8622 = dev_get_drvdata(&bl->dev); - int ret, brightness = bl->props.brightness; - - if (bl->props.power != FB_BLANK_UNBLANK || - bl->props.state & (BL_CORE_SUSPENDED | BL_CORE_FBBLANK)) - brightness = 0; if (!ps8622->enabled) return -EINVAL; - ret = ps8622_set(ps8622->client, 0x01, 0xa7, brightness); - - return ret; + return ps8622_set(ps8622->client, 0x01, 0xa7, backlight_get_brightness(bl)); } static const struct backlight_ops ps8622_backlight_ops = { @@ -521,7 +513,23 @@ static const struct drm_bridge_funcs ps8622_bridge_funcs = { .attach = ps8622_attach, }; -static const struct of_device_id ps8622_devices[] = { +static int ps8622_register_blacklight(struct device *dev, struct ps8622_bridge *ps8622) +{ + DECLARE_BACKLIGHT_INIT_RAW(props, PS8622_MAX_BRIGHTNESS, PS8622_MAX_BRIGHTNESS); + struct backlight_device *bl; + + bl = devm_backlight_device_register(dev, dev_name(dev), dev, + ps8622, &ps8622_backlight_ops, &props); + if (IS_ERR(bl)) { + DRM_ERROR("failed to register backlight\n"); + return PTR_ERR(bl); + } + + ps8622->bl = bl; + return 0; +} + +const struct of_device_id ps8622_devices[] = { {.compatible = "parade,ps8622",}, {.compatible = "parade,ps8625",}, {} @@ -581,17 +589,9 @@ static int ps8622_probe(struct i2c_client *client, } if (!of_find_property(dev->of_node, "use-external-pwm", NULL)) { - ps8622->bl = backlight_device_register("ps8622-backlight", - dev, ps8622, &ps8622_backlight_ops, - NULL); - if (IS_ERR(ps8622->bl)) { - DRM_ERROR("failed to register backlight\n"); - ret = PTR_ERR(ps8622->bl); - ps8622->bl = NULL; + ret = ps8622_register_blacklight(dev, ps8622); + if (ret) return ret; - } - ps8622->bl->props.max_brightness = PS8622_MAX_BRIGHTNESS; - ps8622->bl->props.brightness = PS8622_MAX_BRIGHTNESS; } ps8622->bridge.funcs = &ps8622_bridge_funcs; @@ -607,7 +607,6 @@ static int ps8622_remove(struct i2c_client *client) { struct ps8622_bridge *ps8622 = i2c_get_clientdata(client); - backlight_device_unregister(ps8622->bl); drm_bridge_remove(&ps8622->bridge); return 0; -- 2.25.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel