Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp1159273pxb; Tue, 29 Mar 2022 19:00:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzjHHMhQFEN+9GfKvD7CJ5O9IIzQfTQS8EOlCDgrk52bPKgV3FmFYt9l8oogBYIzrUfPOvd X-Received: by 2002:a17:902:e845:b0:153:aa16:d74f with SMTP id t5-20020a170902e84500b00153aa16d74fmr33400938plg.18.1648605641097; Tue, 29 Mar 2022 19:00:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648605641; cv=none; d=google.com; s=arc-20160816; b=pDAmgvUTp5ZAhvAzWm6qaZ/lL+6H3whyc4IgB4WnwJZTIkeGHK9KgmKg2STkhDs27c ApHOydgFfPXRrybD8450I7rnfcbrFlDThrfL5SPl/2ZXS2udxSNJUAoLHpsM+/MYgjfv N1ZyfsPy8ZT4UUHvFe40/rI68BKr14b9H+CDCWk9btSFc2MIPW7qtu3HHqDb3gsbp2LO JKu7QPmPkZ9kdSvJ6vCX6MD1d6agr2yfd0oUMg+4nF6SlYH0k0V2AC9J+2TmcGytHnvL zGzs5W0xirg/I56gjGf+VLYRxvtBBjZdFcYFS/LTjRioC3I8O2WKcGQURvIktZ4rM6Ge XUnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=26rvEBCNIFiRO8lw0d4ibLwjH7rNC+2FXHQhaFfFi9E=; b=zmmQPkr2rfnY8APsmdAXkoil3s3xsG1HqjR3H1ohDczisO5DKkgeHMyZMs8M4KLlJV B3EX0FHeZ9E4cyckylFzDtUu+QZrVgVKs7op80IFAP+sNZKyFkZdiVLNp+1N3xUwgzuk B/jm3RSGZ6bkZsvnDiz1AANMgpRSXaI/X29TWtkPUmEcaJlY37W/NB6iIiJ/wiRAhhPh AK29wD5r0x+HZzhfKcWagR8tTgNxcw0jBWbHHcdG3zX9RRiLE+g09V3/cbtLy/xHRBlT mxzgcauro6N/8ORx75KX+7RsKlpk+IevxvV2/tA3TbZEMni0Gc/wR4E9e/2WASlhN7WP al/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ClXdxEY3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l8-20020a056a0016c800b004fa701bd461si22781047pfc.203.2022.03.29.19.00.27; Tue, 29 Mar 2022 19:00:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=ClXdxEY3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237718AbiC2OFp (ORCPT + 99 others); Tue, 29 Mar 2022 10:05:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237724AbiC2OFo (ORCPT ); Tue, 29 Mar 2022 10:05:44 -0400 Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EACB1D1927 for ; Tue, 29 Mar 2022 07:04:01 -0700 (PDT) Received: by mail-oi1-x22d.google.com with SMTP id e189so19112586oia.8 for ; Tue, 29 Mar 2022 07:04:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=26rvEBCNIFiRO8lw0d4ibLwjH7rNC+2FXHQhaFfFi9E=; b=ClXdxEY3sYedDz8iLRgAFKARKUjU5okvKpYyQSsMMD5NzCa+TyiWwwmHtDaV41nHtw polqdshnlc02Bto5VshYz3O083Qe3KF89GPEwcRSmrHVbAzP4lbI5029v//MLnRoMbc3 RufyhpHYcgWkp9OhHvBBICGjkylEXgbpjfXuy0I32eILASBlJe+QjntYbIC1qYBkWmTj 4uRxEbeXUB9UNVzapyDtDfVnvTouMlhB2pkCdT0AeFhkwP68tap0/47jP//V2oOvvDd1 m0VPLqILesImaHeD502rDWoZXaimIdhtfH3AxVHwVxN6xLAuWZq8SN0dPtcobFQ4ZwJh XMeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=26rvEBCNIFiRO8lw0d4ibLwjH7rNC+2FXHQhaFfFi9E=; b=uFyJAxCVOxOptkOEmHMcnrViv1CGbrbkcqDgGpal4G8LgZxSXhRl/t5SAYuYbtCaXs axk4usQoPOaVS2gL0doImHF+2KiaziR64/sP/G9j/lo4eGAhsRvamdIPmw+x1lmsmRJD J7YP1D1PCxtox2PqBbBJ/B74w/R+9TddBcGQQxOTLxTJCGKBcQ12V3lXIHA2QRXl4PxS SeNhuhmcPhrcoWs0nyuH3KSkT8qwgLD2+yp2GeQkUMdcrkNEKsRS+jRJU8I10lXa0voL S9P6J8wYjqf10prP8K07KjPxi1yhEtQglWrO7qXpeUlxm1bQWcHcvTOeosOJrOKBTThx s9wQ== X-Gm-Message-State: AOAM53106+8hfwiWrlsYKGl2KKfa7SiPazt9OsjpYAFgFCZGfdIHussQ mMWC+ie3XTjHkW5leW7hVqPbDKIzO9HARI4Qe6J1qoth4Pg= X-Received: by 2002:aca:d04:0:b0:2ef:8b45:d235 with SMTP id 4-20020aca0d04000000b002ef8b45d235mr1372144oin.253.1648562640275; Tue, 29 Mar 2022 07:04:00 -0700 (PDT) MIME-Version: 1.0 References: <20220324231000.4072275-1-tsung-hua.lin@amd.com> <20220329085239.157527-1-tsung-hua.lin@amd.com> In-Reply-To: <20220329085239.157527-1-tsung-hua.lin@amd.com> From: Alex Deucher Date: Tue, 29 Mar 2022 10:03:49 -0400 Message-ID: Subject: Re: drm/amdgpu: Disable ABM when AC mode To: Ryan Lin Cc: Randy Dunlap , Jake Wang , David Airlie , Leon.Li@amd.com, Lijo Lazar , Maling list - DRI developers , Wyatt Wood , Anthony Koo , Jack Zhang , amd-gfx list , Leo Li , Sean Paul , =?UTF-8?Q?St=C3=A9phane_Marchesin?= , Evan Quan , shaoyunl , Pratik Vishwakarma , Sathishkumar S , Qingqing Zhuo , "Pan, Xinhui" , LKML , Alex Deucher , Po-Ting Chen , =?UTF-8?Q?Christian_K=C3=B6nig?= , Hawking Zhang Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 29, 2022 at 4:56 AM Ryan Lin wrote: > > Disable ABM feature when the system is running on AC mode to get > the more perfect contrast of the display. > > v2: remove "UPSTREAM" from the subject. > > Signed-off-by: Ryan Lin > > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4 ++ > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + > drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 58 ++++++++++++------- > drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 + > 4 files changed, 42 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > index c560c1ab62ecb..bc8bb9aad2e36 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c > @@ -822,6 +822,10 @@ static int amdgpu_acpi_event(struct notifier_block *nb, > struct amdgpu_device *adev = container_of(nb, struct amdgpu_device, acpi_nb); > struct acpi_bus_event *entry = (struct acpi_bus_event *)data; > > + if (strcmp(entry->device_class, "battery") == 0) { > + adev->pm.ac_power = power_supply_is_system_supplied() > 0; > + } > + Is this change necessary? As I said before, we already update adev->pm.ac_power a few lines later in amdgpu_pm_acpi_event_handler(). If there is something wrong with that code, please adjust as necessary. Alex > if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) { > if (power_supply_is_system_supplied() > 0) > DRM_DEBUG_DRIVER("pm: AC\n"); > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index abfcc1304ba0c..3a0afe7602727 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -3454,6 +3454,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, > > adev->gfx.gfx_off_req_count = 1; > adev->pm.ac_power = power_supply_is_system_supplied() > 0; > + adev->pm.old_ac_power = true; > > atomic_set(&adev->throttling_logging_enabled, 1); > /* > diff --git a/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c b/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c > index 54a1408c8015c..478a734b66926 100644 > --- a/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c > +++ b/drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c > @@ -23,6 +23,8 @@ > * > */ > > +#include > +#include "amdgpu.h" > #include "dmub_abm.h" > #include "dce_abm.h" > #include "dc.h" > @@ -51,6 +53,7 @@ > #define DISABLE_ABM_IMMEDIATELY 255 > > > +extern uint amdgpu_dm_abm_level; > > static void dmub_abm_enable_fractional_pwm(struct dc_context *dc) > { > @@ -117,28 +120,6 @@ static void dmub_abm_init(struct abm *abm, uint32_t backlight) > dmub_abm_enable_fractional_pwm(abm->ctx); > } > > -static unsigned int dmub_abm_get_current_backlight(struct abm *abm) > -{ > - struct dce_abm *dce_abm = TO_DMUB_ABM(abm); > - unsigned int backlight = REG_READ(BL1_PWM_CURRENT_ABM_LEVEL); > - > - /* return backlight in hardware format which is unsigned 17 bits, with > - * 1 bit integer and 16 bit fractional > - */ > - return backlight; > -} > - > -static unsigned int dmub_abm_get_target_backlight(struct abm *abm) > -{ > - struct dce_abm *dce_abm = TO_DMUB_ABM(abm); > - unsigned int backlight = REG_READ(BL1_PWM_TARGET_ABM_LEVEL); > - > - /* return backlight in hardware format which is unsigned 17 bits, with > - * 1 bit integer and 16 bit fractional > - */ > - return backlight; > -} > - > static bool dmub_abm_set_level(struct abm *abm, uint32_t level) > { > union dmub_rb_cmd cmd; > @@ -148,6 +129,9 @@ static bool dmub_abm_set_level(struct abm *abm, uint32_t level) > int edp_num; > uint8_t panel_mask = 0; > > + if (power_supply_is_system_supplied() > 0) > + level = 0; > + > get_edp_links(dc->dc, edp_links, &edp_num); > > for (i = 0; i < edp_num; i++) { > @@ -170,6 +154,36 @@ static bool dmub_abm_set_level(struct abm *abm, uint32_t level) > return true; > } > > +static unsigned int dmub_abm_get_current_backlight(struct abm *abm) > +{ > + struct dce_abm *dce_abm = TO_DMUB_ABM(abm); > + unsigned int backlight = REG_READ(BL1_PWM_CURRENT_ABM_LEVEL); > + struct dc_context *dc = abm->ctx; > + struct amdgpu_device *adev = dc->driver_context; > + > + if (adev->pm.ac_power != adev->pm.old_ac_power) { > + dmub_abm_set_level(abm, amdgpu_dm_abm_level); > + adev->pm.ac_power = power_supply_is_system_supplied() > 0; > + adev->pm.old_ac_power = adev->pm.ac_power; > + } > + > + /* return backlight in hardware format which is unsigned 17 bits, with > + * 1 bit integer and 16 bit fractional > + */ > + return backlight; > +} > + > +static unsigned int dmub_abm_get_target_backlight(struct abm *abm) > +{ > + struct dce_abm *dce_abm = TO_DMUB_ABM(abm); > + unsigned int backlight = REG_READ(BL1_PWM_TARGET_ABM_LEVEL); > + > + /* return backlight in hardware format which is unsigned 17 bits, with > + * 1 bit integer and 16 bit fractional > + */ > + return backlight; > +} > + > static bool dmub_abm_init_config(struct abm *abm, > const char *src, > unsigned int bytes, > diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h > index f6e0e7d8a0077..de459411a0e83 100644 > --- a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h > +++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h > @@ -445,6 +445,7 @@ struct amdgpu_pm { > uint32_t smu_prv_buffer_size; > struct amdgpu_bo *smu_prv_buffer; > bool ac_power; > + bool old_ac_power; > /* powerplay feature */ > uint32_t pp_feature; > > -- > 2.25.1 >