[PATCH v5 3/7] drm/msm: a6x: Rework qmp_get() error handling

[Akhil P Oommen]

On 4/23/2025 6:58 PM, Dmitry Baryshkov wrote:
> On Sat, Apr 19, 2025 at 08:21:32PM +0530, Akhil P Oommen wrote:
>> Fix the following for qmp_get() errors:
>>
>> 1. Correctly handle probe defer for A6x GPUs
>> 2. Ignore other errors because those are okay when GPU ACD is
>> not required. They are checked again during gpu acd probe.
>>
>> Signed-off-by: Akhil P Oommen <quic_akhilpo at quicinc.com>
>> Reviewed-by: Konrad Dybcio <konrad.dybcio at oss.qualcomm.com>
>> Tested-by: Maya Matuszczyk <maccraft123mc at gmail.com>
>> Tested-by: Anthony Ruhier <aruhier at mailbox.org>
>> ---
>>  drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 5 +++--
>>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> If this a fix for the existing commit, it should come first and have a
> proper Fixes: tag. If not, please squash it into the first patch.

This patch is dependent on the ACD support patch, so we can't reorder it
(mentioned in the added comment below). No Fixes tag because qmp
messaging was unused until now, so there is no point in backports. I
prefer to keep this patch separate because this looks logically separate
to me and we are changing the behavior for a6x gpu probe (removed
adreno_is_a7xx() check).

-Akhil

> 
>>
>> diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
>> index 6bd6d7c67f98b38cb1d23f926b5e6ccbd7f2ec53..48b4ca8894ba38176481b62b7fd1406472369df1 100644
>> --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
>> +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
>> @@ -2043,9 +2043,10 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node)
>>  		goto detach_cxpd;
>>  	}
>>  
>> +	/* Other errors are handled during GPU ACD probe */
>>  	gmu->qmp = qmp_get(gmu->dev);
>> -	if (IS_ERR(gmu->qmp) && adreno_is_a7xx(adreno_gpu)) {
>> -		ret = PTR_ERR(gmu->qmp);
>> +	if (PTR_ERR_OR_ZERO(gmu->qmp) == -EPROBE_DEFER) {
>> +		ret = -EPROBE_DEFER;
>>  		goto detach_gxpd;
>>  	}
>>  
>>
>> -- 
>> 2.48.1
>>
>