From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 03C593C8713 for ; Tue, 12 May 2026 20:53:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778619214; cv=none; b=kF2ESxaj9E8vLbzJ/vii/K5FUmZTuHZ/U1GXWSNG6VBc0RttGWtC2PIqVlM1pE9BqgL5pbXCUJnfZbj/TfAD3iffAJml4HsnG94zYNwV3Bpg3zoew3jpa+lqzJvqXr2cTX4ZWu92kahPVi2IEpGUW5yB4fFpYQiu5IDD25xYTXM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778619214; c=relaxed/simple; bh=gXeWiA6W9piE+ObDgMzSw8HmOPRVkifD1pJGObyFyig=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kQGVv39Rv5DiiUWELVG058AXtGF2viocGPr82AXAfdz/EEZ9jkIjn3ftLJbmexpHtPzciuFZvGLkvNFXYtGBocnvlhiPe5cIuWNRH4uIa2OUpfUArxOV31Gr0WTGg5BgP2yam1jFw8fYqt4aRW/m4HD/GsQKINURb9a7qF21DdY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=OeVVG+Lj; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=OMFBdB/X; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="OeVVG+Lj"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="OMFBdB/X" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64CJm9Q9144553 for ; Tue, 12 May 2026 20:53:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= wf9Q8Tx2vrt+yE2FnC2WSG2BLgxkvQB3xumvit79ifQ=; b=OeVVG+LjCHYxyTsG s2PJjNJuFwmll4NxxgdmnFpJUBYIrOTPQlPogMlVwqlAzstpqPl0bYc6MG5QimaG mCw2T5HeVjtlTv3HSLrQueoNFtcSHaVbsthAnpic01M9c8hS953Ly4mcchQVdFEV rhK53gnAp8tqTfx9xB6dT6pXHnVMjbBiwKKfaj1g/KJKnLCQmZa2Ol3CkDA/pQLO w4WT2QPQ3flOBnT0BT+fR/79Ut0/fD6q7RJfJxT2oJ0tly3jnepBSxCWnmgGbjQ1 g2fqbPAgdF+QahE9pwMlbl+LPsozhGejEUT9WE/gDWkaQsRhcPAjjECBGGe8Bfz/ 426xBw== Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e43ypa1xv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 12 May 2026 20:53:29 +0000 (GMT) Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-837d0d71c61so3592970b3a.1 for ; Tue, 12 May 2026 13:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778619208; x=1779224008; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=wf9Q8Tx2vrt+yE2FnC2WSG2BLgxkvQB3xumvit79ifQ=; b=OMFBdB/X4G1nhyuH1yihEhRSP67x96Xdm9NhluTeJELTP1iS2Gqz/v/kcxvUheIBv7 y/rSiYzIyUawPBCQzeKPiGVZEJ405dR9uyagJ1TsdG7AyCCsbAOhECdvd2kwHg0rmpdK 7HcnBclQw51Zwx3tRG4S2nM/07Lliwe6tMOmBbPpG/q2x0CaBbiA26rCdFPOVy8sNEUi LphgOWQLBsXdhwt/zyK1Y0Jm9pKrKE2HcrJIK6h4htAhP43mJYmHhGvPqQPpqk8K6Jgo cBhDJt6tLy0V0u93FPJKutRndv95QaxcDHZNAW0ydySvJcM5RJdnqfyNOJ0nwQml34kD 27zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778619208; x=1779224008; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=wf9Q8Tx2vrt+yE2FnC2WSG2BLgxkvQB3xumvit79ifQ=; b=b8RHx8Z+ObAbNrVr9pfkwGa7cxm6vft+pLm0WcttOprb5rKLPIp3mUYseZW+mLJ2Yt aTcL4JgCjJlf4omIQNVLEBa2TZ+1IEZrdr4U5/xA9BH4Fp+cSqkPmdvYvNJw4OcqWiqm Vo7Q+1lCY5aD8HrS0NumtuINRqiWk/CkbrRfqyMzPKGMzDNt7Tlpw9qotAxhBVzKDfUZ u2dwMivHs32uIx5c/gRe5XZpvBdtM+GDrd5fg/2jwhDmELri2esVMfnYH2Llo97fLX7l GVp4qNS+SInSZ4FeEuPUXaUchqhnP+ZX8Cl6Jy2SySaJWFH1ITi0cbWqpFyaubowagup uTOQ== X-Forwarded-Encrypted: i=1; AFNElJ/bOzAgvU3dyS173QEHjiAwxOFDcWa4R9Xfmmc1kOY8m6K/v4yNsmlzDJ4RhWGX0/Zx94yXu9HHuciEP2k=@vger.kernel.org X-Gm-Message-State: AOJu0Yw2mOUFJVna+SV/81VicKJahWdJdE2lwNWgwGUT0ZTP0XmMV0+f mMojTAZVW9+wFr5TkIkZdVaH46eRUj3ppzCwoa8Gbu+vPDfDJh1vem79ncOdNOgLN7VHAvoJAMQ w38+mr6Z0y2Gb8mC9G4LyFU6fdpLjfkY3HtZT3RXeX2HyGtRzAjb5GUb1kNtAc83/l4s= X-Gm-Gg: Acq92OEveuuG6f7wqKU9kxtG0S62l099Rm9NJOFb2OjjcW1vtb4FQKNBd7hZiogDJk+ HKx0/AST/Loj8FnrNyiwBMg65HcgC6svL/aYn9j6RxXuRVMIJ+5q2LbmWdhRxLzH273pXRanNQw pEJ9ej9ymus1nTZV4Qbwrh0GTaYy1LVtmwp9wakP9o4zQyjAEcHrr+S1NF/4joXy4Exo5yXdo/n ofuJCFhnWmJO5EXg3jclDijQGb2egBFDkievv9YqcUN6Kdk+2F4LCr47F1ofTDt/igsIlMgKhHi NuB+skFSnxT9eI9UFFiXbTC3eo603wZp97UGXBFSKvOCWa9tEOcpQ4UICCLfSe6c/5cukLMVDQr uzYQJZoVonxF3IBnMOyQS5rKjnCo9CXNg9/IpsQE80Khn7A== X-Received: by 2002:a05:6a00:3d0d:b0:827:2ee0:411f with SMTP id d2e1a72fcca58-83f03e910b4mr310252b3a.4.1778619208147; Tue, 12 May 2026 13:53:28 -0700 (PDT) X-Received: by 2002:a05:6a00:3d0d:b0:827:2ee0:411f with SMTP id d2e1a72fcca58-83f03e910b4mr310223b3a.4.1778619207592; Tue, 12 May 2026 13:53:27 -0700 (PDT) Received: from hu-akhilpo-hyd.qualcomm.com ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83965945c1bsm25453004b3a.15.2026.05.12.13.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 13:53:27 -0700 (PDT) From: Akhil P Oommen Date: Wed, 13 May 2026 02:22:57 +0530 Subject: [PATCH RFT 2/5] drm/msm: Centralize the standalone drm device check for GPU Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260513-gmu-sync-state-fix-v1-2-6e33e6aa9b4f@oss.qualcomm.com> References: <20260513-gmu-sync-state-fix-v1-0-6e33e6aa9b4f@oss.qualcomm.com> In-Reply-To: <20260513-gmu-sync-state-fix-v1-0-6e33e6aa9b4f@oss.qualcomm.com> To: Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , Neil Armstrong Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Akhil P Oommen X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1778619193; l=2896; i=akhilpo@oss.qualcomm.com; s=20240726; h=from:subject:message-id; bh=gXeWiA6W9piE+ObDgMzSw8HmOPRVkifD1pJGObyFyig=; b=jNm6AYPxND8Zd4dPFVsxuXQS2tAXO1YMWVaUgc2bEor3uuvHaEHqTnIyU1BQASaNPUYfC9EoR JlM8miS7CVUBxPAPkkYwGHkaGVmooKRJjvL4Nm9SYS4QJXly0UaVMaN X-Developer-Key: i=akhilpo@oss.qualcomm.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-Proofpoint-ORIG-GUID: rTPcZ6JwXn2t_WaDkonLXALgfJZt1rch X-Authority-Analysis: v=2.4 cv=R5kz39RX c=1 sm=1 tr=0 ts=6a039349 cx=c_pps a=WW5sKcV1LcKqjgzy2JUPuA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=Qn8wcy66etf9Ddiq8R4A:9 a=QEXdDO2ut3YA:10 a=OpyuDcXvxspvyRM73sMx:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTEyMDIxNCBTYWx0ZWRfX4B/N6qHVuF+v gHAswoyZ/Rhh+2l6/IXC6QNYqnOExLKedjcgk9XmUbA0M/58+omPHkyF5xhYcSFnpAJwYqQhzI/ DGXdzXWBujh6IuURobiHNGPnK2ym6YZs5L+HjWSEikFp/TpVOM2RctdoGecoFj9b/o7jY2kkeS1 6JKH7xivMfx9yZGc3N0o51h8ROIH9+waia9ZNvJKaI4BUOS0BjlwunvnNNpFDKv6iQo4S1LK+E/ cENDew1Ik6CYjmwY1Bs1fYHvX3jAiMLh/lm1cbs8sgjdYYqAhCzt+1l2UYwguagDU1T9D6E3H4S aBnlTuOLCBHfmMy1sKOgIo2OUjkQH6egY8hlJpZ2yE4jQuEgt9WnWyZsiMJktb9gcMbl8d8SeyN 2iDjILUL87dDM8jWi8wKgHsJg1+RFDCpl8G9tWcQ4BYbOVILvwCKfU4A3skgJeCS0jiv4avT/Te EBbcuBxXoLaHuno4Ovw== X-Proofpoint-GUID: rTPcZ6JwXn2t_WaDkonLXALgfJZt1rch X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-11_05,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 impostorscore=0 spamscore=0 priorityscore=1501 lowpriorityscore=0 suspectscore=0 bulkscore=0 phishscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605120214 Replace msm_gpu_no_components() with msm_gpu_use_separate_drm_dev() and move the platform-specific check for "amd,imageon" into the helper so the policy is centralized and reused by both the core driver and adreno probe path. No functional change intended. Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/adreno_device.c | 3 +-- drivers/gpu/drm/msm/msm_drv.c | 11 +++++++---- drivers/gpu/drm/msm/msm_drv.h | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 4edfe80c5be7..3052f3e36de0 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -271,8 +271,7 @@ static const struct component_ops a3xx_ops = { static int adreno_probe(struct platform_device *pdev) { - if (of_device_is_compatible(pdev->dev.of_node, "amd,imageon") || - msm_gpu_no_components()) + if (msm_gpu_use_separate_drm_dev(pdev)) return msm_gpu_probe(pdev, &a3xx_ops); return component_add(&pdev->dev, &a3xx_ops); diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 195f40e331e5..b61deafd02c3 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -61,9 +61,12 @@ module_param(separate_gpu_kms, bool, 0400); DECLARE_FAULT_ATTR(fail_gem_alloc); DECLARE_FAULT_ATTR(fail_gem_iova); -bool msm_gpu_no_components(void) +bool msm_gpu_use_separate_drm_dev(struct platform_device *pdev) { - return separate_gpu_kms; + if (!pdev) + return separate_gpu_kms; + + return of_device_is_compatible(pdev->dev.of_node, "amd,imageon") || separate_gpu_kms; } static int msm_drm_uninit(struct device *dev, const struct component_ops *gpu_ops) @@ -1035,7 +1038,7 @@ static int add_gpu_components(struct device *dev, static int msm_drm_bind(struct device *dev) { return msm_drm_init(dev, - msm_gpu_no_components() ? + msm_gpu_use_separate_drm_dev(NULL) ? &msm_kms_driver : &msm_driver, NULL); @@ -1074,7 +1077,7 @@ int msm_drv_probe(struct device *master_dev, return ret; } - if (!msm_gpu_no_components()) { + if (!msm_gpu_use_separate_drm_dev(NULL)) { ret = add_gpu_components(master_dev, &match); if (ret) return ret; diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 6d847d593f1a..6fcb696ceb7c 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -555,6 +555,6 @@ void msm_kms_shutdown(struct platform_device *pdev); bool msm_disp_drv_should_bind(struct device *dev, bool dpu_driver); -bool msm_gpu_no_components(void); +bool msm_gpu_use_separate_drm_dev(struct platform_device *pdev); #endif /* __MSM_DRV_H__ */ -- 2.51.0