Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <26042d92-0fb7-fadb-140e-b633f2979632@amd.com>
Date:   Fri, 25 Mar 2022 08:22:29 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
Subject: Re: [PATCH v2 3/25] drm/amdgpu: Disable ABM when AC mode
Content-Language: en-US
To:     "Lin, Tsung-hua (Ryan)" <Tsung-hua.Lin@amd.com>,
        "Wentland, Harry" <Harry.Wentland@amd.com>,
        "Li, Sun peng (Leo)" <Sunpeng.Li@amd.com>,
        "Deucher, Alexander" <Alexander.Deucher@amd.com>,
        "David1.Zhou@amd.com" <David1.Zhou@amd.com>,
        "airlied@linux.ie" <airlied@linux.ie>,
        "daniel@ffwll.ch" <daniel@ffwll.ch>,
        "seanpaul@chromium.org" <seanpaul@chromium.org>,
        "bas@basnieuwenhuizen.nl" <bas@basnieuwenhuizen.nl>,
        "Kazlauskas, Nicholas" <Nicholas.Kazlauskas@amd.com>,
        "sashal@kernel.org" <sashal@kernel.org>,
        "markyacoub@google.com" <markyacoub@google.com>,
        "victorchengchi.lu@amd.com" <victorchengchi.lu@amd.com>,
        "ching-shih.li@amd.corp-partner.google.com" 
        <ching-shih.li@amd.corp-partner.google.com>,
        "Siqueira, Rodrigo" <Rodrigo.Siqueira@amd.com>,
        "ddavenport@chromium.org" <ddavenport@chromium.org>,
        "amd-gfx@lists.freedesktop.org" <amd-gfx@lists.freedesktop.org>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "Li, Leon" <Leon.Li@amd.com>
References: <20220325040515.4073706-1-tsung-hua.lin@amd.com>
 <2125c5b2-b377-076a-4177-d5ef482eb657@amd.com>
 <DM6PR12MB44177923FF4E05331A7B727FB21A9@DM6PR12MB4417.namprd12.prod.outlook.com>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
In-Reply-To: <DM6PR12MB44177923FF4E05331A7B727FB21A9@DM6PR12MB4417.namprd12.prod.outlook.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QWhQcFFYbWJhTlNNVlhiTk5CMXVJLzVBZHRVNW1uRlB0Nzl1azdRMkM1WVhz?=
 =?utf-8?B?dGoyZ2x2clNSZmtmblJtZ2NDUXhKRHdnbDlXVnlVTGZ1d2hpLzlSZTVnNWdR?=
 =?utf-8?B?bzlObEVNaHYvcDJjUlhaUGhxVjV4Q29kcjVHVFVLcFVsQWpnWm1jU3JpYjZM?=
 =?utf-8?B?ZVlIUDRHR1BlQXFPSVNKQ243OGtNQU5XNlVsbTc3SnpvQlRHak16TS94Y3Zx?=
 =?utf-8?B?WWZLYmlvVjVWSitZenBXU2liaGd0QnZYNENhcEtra20zNlRud25tMWlYS3FN?=
 =?utf-8?B?Rm1MTzJFU2oraklDT0tQYW5BR0JPZjRSR0pPZ2NocFB6VXl1ZjlJaGFLNXJk?=
 =?utf-8?B?MGV5VDR4N3FPeDREdlkrZXp0YlZOZzg3RERqRndINFVjRElSQURwRGhzWkNa?=
 =?utf-8?B?V0U3akRjY2xkelFvUkhBcnNHdk5Nb2RncTV2RjYyRTg2Ynp4T2RkcHpRMDFo?=
 =?utf-8?B?YVRJS29MZzdzY3RYUUlyTEM5aHpyY3I1MUJmcXNDdnUrM01YWWNvd1NSZDZY?=
 =?utf-8?B?Tmc5d3RXWHFrTVNETTFieXRtcTRCUGkvSTZ1MFB6cDhCSHpPd0NJUFM3anVW?=
 =?utf-8?B?UUExUjBwZ29TUFJNYWswOVFpaG8zWkFNMEozK2RTZ3kxRkx6QnZrNkhxS1dz?=
 =?utf-8?B?WXRkbnhob1pqSDNVNStVbWt5ODBuQktUOFNQdXhzS2hYUVRZZFA4cmJaVUNK?=
 =?utf-8?B?UEREUFJoMWM3SE0vODh3UEFYdEZMN0g4VnFxdWlpR3JKM0xoMXV0MXh0aWRI?=
 =?utf-8?B?RnZSTlg4SGN1RzdRa0liZlNzeGh6S3pPbGQ5N253TUdlSUhqNGZoZ3paaFY3?=
 =?utf-8?B?eGN6KyszdGZNTXRhcEtWeHpVRTN2TDBRMEQyZmhsdkhpczl3VW1CT2thTktK?=
 =?utf-8?B?TWYrb2tIZkp1ZGNMWEZSTjBCbmFlMnpuSHB2dy9Id2FwcXVXWkxqdmpxcFlQ?=
 =?utf-8?B?QS81U1dENmlyc1lKdFBEdk5NN0daRkUwVVhrYlh6Y2tORFJ1aXpHMEpxT2xM?=
 =?utf-8?B?Y3lvdEdNa1pNc3M3Wm9wdmxKVHJnTERLTDJEN3VwdGgxWlcvQ0FkOEJUdWhI?=
 =?utf-8?B?dTZ0eHRDY2FsUGJCV0VSaEcwcU85UFYzOXJaWjhNMzZzNkVXditPUFFJcFc1?=
 =?utf-8?B?SHBGWU9XQ1ZYK21PN2NRY1cyWEpCQ2ZhTldWbjc1WmlFbU9CMDVPYUIvc3NI?=
 =?utf-8?B?bVRqOWlXUks5bnRLeG5CYjVvKzY5bHVRZk9JZnIyTnlWdjFyckhxRHYveXM1?=
 =?utf-8?B?KzRrNk9NZ0dWaUJTcFVGU1BsK09XYmJjeHVkOHd1WllSRkdXSWZYQ3gxaHVD?=
 =?utf-8?B?NHRBdWFMQ2s0a3BiN3Y2YXl6SEZzbkdWYVowVTVySDRNRGxpdjFxY1B4SGMw?=
 =?utf-8?B?YzhrcVI4NDRkTTEybzZ4L3ozaStxWHhrRjgxOGEzK2xNdGpLSmRtZ1grZTd4?=
 =?utf-8?B?OHJ5OERQYmk0ZWJKZ1NCMnBEbWdveUlEYmNPTHRmeDFNeFRuWTlKVjFsbkpq?=
 =?utf-8?B?NUR4Q2JpaUIwQUtCYUowZ2ExUXNLOERSMmp2RTBpZGw1UUp5cVo3YXpUK3c2?=
 =?utf-8?B?VXY1U3pmRzh5bUVVanNraElpcVdqZkQzbEJlT21XRWRVMzFJeGc4OExIUWho?=
 =?utf-8?B?OWFpajU3d2dDRXlYeXpFMDRKNU1Jam5CTVJPSUVqd3BvWDBUNmFYeVpzS1Ar?=
 =?utf-8?B?dzEvNks3RXJxNFpNSnRzUFl3Q3BRYVdGeWp6c01EZ09MWGVRTXM2U0dlWTJH?=
 =?utf-8?B?Y29Ob0dYSUNlRmJLanJydVVWZlByNWdhTE9TSEhPRFAzQXQ0aExKaTdQK1k2?=
 =?utf-8?B?TUZjWk9VQU5saFY2MFA1UGdCbUxkK3VnQ3VyY3ArWkNlOEZ4WHVmZTFEbTBi?=
 =?utf-8?B?L2RRT2hNWFFhVlBSbEJXKy9YMlZ0T0NXaGt1NWx1L2xkUHgveEZGM1lYaTZJ?=
 =?utf-8?Q?JUb5vX9tlpUTdGh/doffxBwjTfz2BEKr?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: b539f8ca-5d9a-44ed-420b-08da0e303f5b
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3587.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2022 07:22:41.3010
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: x9CzqGun+MuLXFuxqSRUDOuz7pBSmDDGQzuk2psj/whPbJvUvnxdTao2ZmqFw8R7
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0120
X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE,
	T_SCC_BODY_TEXT_LINE autolearn=no 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Ryan,

we should try to avoid that and if it isn't possible at least use some 
constant like ACPI_AC_CLASS.

Could be that the information isn't available otherwise. Alex should 
know more about that.

Regards,
Christian.

Am 25.03.22 um 08:09 schrieb Lin, Tsung-hua (Ryan):
> [AMD Official Use Only]
>
> Hi Christian,
>
> There is already a string comparison in the same function. I just reference that to port this solution.
>
>
>
> #define ACPI_AC_CLASS           "ac_adapter"
>
>
> static int amdgpu_acpi_event(struct notifier_block *nb,
> 			     unsigned long val,
> 			     void *data)
> {
> 	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;
> +	}
>
> 	if (strcmp(entry->device_class, ACPI_AC_CLASS) == 0) {      <-------------------here!
> 		if (power_supply_is_system_supplied() > 0)
> 			DRM_DEBUG_DRIVER("pm: AC\n");
> 		else
> 			DRM_DEBUG_DRIVER("pm: DC\n");
>
> 		amdgpu_pm_acpi_event_handler(adev);
> 	}
>
> 	/* Check for pending SBIOS requests */
> 	return amdgpu_atif_handler(adev, entry);
> }
>
> Thanks,
> Ryan Lin.
>
> -----Original Message-----
> From: Koenig, Christian <Christian.Koenig@amd.com>
> Sent: Friday, March 25, 2022 2:58 PM
> To: Lin, Tsung-hua (Ryan) <Tsung-hua.Lin@amd.com>; Wentland, Harry <Harry.Wentland@amd.com>; Li, Sun peng (Leo) <Sunpeng.Li@amd.com>; Deucher, Alexander <Alexander.Deucher@amd.com>; David1.Zhou@amd.com; airlied@linux.ie; daniel@ffwll.ch; seanpaul@chromium.org; bas@basnieuwenhuizen.nl; Kazlauskas, Nicholas <Nicholas.Kazlauskas@amd.com>; sashal@kernel.org; markyacoub@google.com; victorchengchi.lu@amd.com; ching-shih.li@amd.corp-partner.google.com; Siqueira, Rodrigo <Rodrigo.Siqueira@amd.com>; ddavenport@chromium.org; amd-gfx@lists.freedesktop.org; dri-devel@lists.freedesktop.org; linux-kernel@vger.kernel.org; Li, Leon <Leon.Li@amd.com>
> Subject: Re: [PATCH v2 3/25] drm/amdgpu: Disable ABM when AC mode
>
> Am 25.03.22 um 05:05 schrieb Ryan Lin:
>> Disable ABM feature when the system is running on AC mode to get the
>> more perfect contrast of the display.
>>
>> Signed-off-by: Ryan Lin <tsung-hua.lin@amd.com>
>>
>> ---
>>    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) {
> String comparison in a hot path is not something we usually like to see in the kernel.
>
> Isn't there any other way to detect that? Like a flag or similar?
>
> Regards,
> Christian.
>
>> +		adev->pm.ac_power = power_supply_is_system_supplied() > 0;
>> +	}
>> +
>>    	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 <linux/power_supply.h>
>> +#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;
>>