From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.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 CF51634CFAB for ; Wed, 22 Jul 2026 06:36:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784702203; cv=none; b=rRyQU6wp4CuoErmqV0vJ37yA4Q0fSML3kW6bqkDnXEu6ipEv128QLEWYA7V+1Id3YpkI4eSwxFdDjib/wK7MIDLzAfpBbE1CypbV+zJAckVo+8Uq7OD9Uqul44mOdzXCSkBCJyALgzwjF2b7iwc6n/Q6iiRzwjyHC3I6E5GU/MU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784702203; c=relaxed/simple; bh=dQq1YP1Zgxo5wlRNn1ky+tfmQFYD+CU0qqdX3e33yF4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QVObqvxEASivN+mmcpzWRxnEAxFVglTtmg8/93BHxLiJ3HKfHSoU9vAptGjSZBAVGOReK2wHHD+99Bck7c5vFLjAuiDMEp/RyEWYLBimJZXpA0ClTGcyiA9pvPHCVnKSw/0Vb0wkiPL6UOI/rxmCxdAi+7+BSMTx9XYHe3n0380= 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=PMuIjw10; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=PLpxtQT7; arc=none smtp.client-ip=205.220.168.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="PMuIjw10"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="PLpxtQT7" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66M53ZJb3662150 for ; Wed, 22 Jul 2026 06:36:41 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= s2WFosEjx5mL1fry95UZtUlBXhZEDC7Nphcd8IbkOew=; b=PMuIjw10/fpWE+i9 tpIxgw0iQSglHKshT/xWjSqtPxEeYJVB/mNAl05LT5Sj4syrdAZAjc6KXWOWX1qi NxEI6Mwm+NBXqygZsRq/79j9dAqxij8fLsioraC6J29UPdW0xXsD8lagH8Ngli6t wQwiNnIYwcWotFhI5eyIpTe71nGdO2A5UsaEFmZLP/Jk1ma8zv22tiD10Qg4smPO llbkPvmBGcBjFTfnEt52CWz+Aw7AF1AIAI0aJi0W+uht3DQBubvFdXfyoT0ct6Y9 ZHfQV2YLA6DNOY1VgFH+/quTDdAnI6FgbVmchtIrZrek3yqgpQN7BQ7f45xoBS0I sanr/w== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fjd5e2jke-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 22 Jul 2026 06:36:41 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-51c0199faafso187490281cf.3 for ; Tue, 21 Jul 2026 23:36:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784702200; x=1785307000; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=s2WFosEjx5mL1fry95UZtUlBXhZEDC7Nphcd8IbkOew=; b=PLpxtQT7uR9KnPMWBiI8ZyO0BFRTIZct6o3jhn94M/E6TRstXbrSFaANTDDPb+pV+8 3QPaeWLuZYy0/YwJ9/RUyo4pX1Z1tUj8pzwLTNz4G3iB1I/Xcjb1hubz0Gj2Tjg4VVJ9 BW3Zqzk50R+oXhO8hzCXS4Ua/RKpUvFtWJN9PTCLQg41wYUOwluwNwpv+DV33yxncyS8 GalS93anxjNrb3PS0eiQDREkOaakECoaCOxPLmJ8hPlKzk3FQIlr/h9/Nyo1IlaOmNBP /7VDpdoQxIDDdv8MS8pC7QffPeLepeXx+c9fr0mfcMWXAF2RxMiYXY6VihJLqp0acLoH WoAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784702200; x=1785307000; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=s2WFosEjx5mL1fry95UZtUlBXhZEDC7Nphcd8IbkOew=; b=Jm1dlnX7YUM4j3xQLBOtG7X5GlaOyRHjadZ99Si1huRxYNIeA6dAj0xhKnTLVPzxSe p5TBBvQNXUeJJpLzQTz78YBkhXTucFigAgr65AmKrbAxJ+mUYkJwPV4AzxypjjojKF2+ 8roBItPHO4Vb1KqITZEuAVEwdJ19Hf1ixyA0QU3WkoTqJ+JWBesR/9t9kt/Qm/cR77Z1 9QQEbSowPCHW4r0wncIpU+GiVmemsvgzcPGJOYcTUDtYnB+MJko4i4/p+JvP1OsVKgvQ zV9GQ8fCs3BqaKMY9f9H0GMJV+Tu06Yj0y3lkcP6AHxYdXqXjnMtHjmOZmCKnoBTPtIx nwjw== X-Forwarded-Encrypted: i=1; AHgh+RrSzIfwawTyn/DRw0EHDcsBO92YiNWi39FDg45zbJKLRP5TQ3k4UNck8zddlp79Uiheek7i5EUTuVTzFD8=@vger.kernel.org X-Gm-Message-State: AOJu0YzCXn1eomQexyQ9HpgyiB8VrFkoXrTmjUwj6WkCvIhtbk5NgREN k4PI2/5Ka0LQivLXB9fB8MnnNuwDEJPHH/AvjoI9/4drXVU6ITnw7secupFwe+iCXmayJ+tw92z 6MA4r5fsnFepEOKoVr4PT03mxTfwwCS5Zq66Fk6UsX+sE+553YyjKEV4Dvqh50CUmqkQ= X-Gm-Gg: AR+sD11631ThZev8JsPraM2SwArGuQDyxvoybmMmXMqCOLYpZWpUa6MqjgYavBq4gVR HrKAFpdtzVc57HLY5Tn8cFdO0qT97tu6TDu9mkCxDVJSVa7JtSqq9HKkITk4s6gFrrsSxRzhv+D V/OJxiFF5YG0evpADGfnEg4XeECs4fOYRnCM9t+BoyJ6K5s4jTf0CEHTBf77XuXti0qLBc3e8g6 NnlBaoKJ5H5uS8mhtblDHlwG/IGwIGW3N0y7dA7+1GPcjw7NyDJ3wsIw5Zdj5YTH9A75vxXjC3+ CHCOpOLY22LIgsvy6Nl0oS2UDMxHd3zEPtGsow9b69QNPnQgqc2r0E6BV7rPZ2Ucovmm4XNUPle H85X1LG3dXJsV6vZCwCnDfBz4B9kfoJOokNO1Oe48zDAjatRXmJNYWmsCKbFHErD0Lb2r7hXVsm 2Aah4lrkeciDxi5w== X-Received: by 2002:ac8:5705:0:b0:51c:7b12:5fe9 with SMTP id d75a77b69052e-5213f46eecemr203114801cf.85.1784702199984; Tue, 21 Jul 2026 23:36:39 -0700 (PDT) X-Received: by 2002:ac8:5705:0:b0:51c:7b12:5fe9 with SMTP id d75a77b69052e-5213f46eecemr203114571cf.85.1784702199446; Tue, 21 Jul 2026 23:36:39 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5b2a9b8c6f6sm309696e87.4.2026.07.21.23.36.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 23:36:37 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 22 Jul 2026 09:36:19 +0300 Subject: [PATCH 04/24] drm/msm: introduce the struct msm_display interface 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: <20260722-drm-msm-display-interface-v1-4-368c10fe62fd@oss.qualcomm.com> References: <20260722-drm-msm-display-interface-v1-0-368c10fe62fd@oss.qualcomm.com> In-Reply-To: <20260722-drm-msm-display-interface-v1-0-368c10fe62fd@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=14063; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=dQq1YP1Zgxo5wlRNn1ky+tfmQFYD+CU0qqdX3e33yF4=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqYGTm32+s5Aq9TFVw6J/Dt04/OahxDzQYoqv8o tY4vg/1PKmJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCamBk5gAKCRCLPIo+Aiko 1WBlB/4wkfgDeTfXALuLn/xPGBejzMsFa67zv5YfgYdek89ujIIdXd0e8IupplKTUBCEbNMVIm/ CEF5eDGd9WxHV8EPuFMMSSNIPNwMVazIPKKxovYCKJ1ZRdnU5emr+2gCRRG8ZB3goP1nkyWlgUx z1xWey+KzJYzAnpy3zHBKpA8ukvokdKgQkO8NKKhAdSKs4cXrjiqBcdjlRUBoFPg5Gfkn/omVrz Xvd2MtQlqEI6UFCorBgZN/Rj27GvPV7dZvUo/4F8yWTU9GVE2+FqbgygD/ztYGzF5yecE9RfbOG 8PY773N7dApmhULTSbuoqhPnlLiNLqzULB4XGaDnFSfV2izv X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: LGxyTGsDjSzj7UWzpnc_bA_bUgjGPboP X-Authority-Analysis: v=2.4 cv=CbE4Irrl c=1 sm=1 tr=0 ts=6a6064f9 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=KkC0EXddP0L80uirutwA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-ORIG-GUID: LGxyTGsDjSzj7UWzpnc_bA_bUgjGPboP X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIyMDA2MCBTYWx0ZWRfX1J0e0qwn4DU9 UtbLupCqC5yYzQM3aLtiN54e4T0C6v/dRcUSKUeAZOjgfzEyYHsvua8yrHow6zieAzJslJk4wGH N2Xo/sDebg/F/PPXLKaykNv8/6bXhDIZAU4muBRSTUQtvS8flKmyjoqlk+3/MCOp2KS14VT+qx7 fO4vKhCduLQQWyxqT0cTF32E0lrNFHUn5DjTBiv+CD+rPuGt/kXrvZMor2d7ptIK/m+MOHg+0EK HBR61t72xWFAcVIOQLb9VJ0wv51PgQrC6VKueA39X7as7OZ3pznWi7tbdl1lXFEMjZzpZ/aT/Rf 0m3n0BxLHz5HuqM15fzFAvTA9S9L+kSqkYLCUTyzFqCgaZCJKVb2f11PUFax0vgvTtaR3DUc8qz WQUczZZDjxFi0vpElNZMUj4CkIq0bFFioupntCi4kBVweUc/JfawlAiqD+rsLxXaE6+BEiFPhZA 7APR4L8rkCF2Vd8GJCg== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIyMDA2MCBTYWx0ZWRfXz00M8jjColsK ZGPIloM0tHa1S2MidxhXM3f/1+8e1IrMg7QDnbTNJ+daWSW31pDyUfOsQ/alzBnPVUZhFkGoqJu qvZY5YO6HfjimlCd8ENe73glZ5ZWWqo= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-22_02,2026-07-21_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 suspectscore=0 clxscore=1015 spamscore=0 malwarescore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607220060 The common connector setup in msm_kms_init_connectors() calls the type-specific msm_dsi_modeset_init(), msm_dp_modeset_init() and msm_hdmi_modeset_init() functions, so it has to know about each concrete sub-block type. Introduce a small struct msm_display interface with a modeset_init() callback, embedded in struct hdmi, struct msm_dsi and struct msm_dp. Each sub-block registers its ops and provides a msm_*_get_display() accessor; the common code then dispatches through display->funcs->modeset_init() without knowing the concrete type. Further per-sub-block operations will be folded into this interface in following patches. No functional change intended. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/dp/dp_display.c | 17 ++++++++-- drivers/gpu/drm/msm/dp/dp_display.h | 2 ++ drivers/gpu/drm/msm/dsi/dsi.c | 18 ++++++++-- drivers/gpu/drm/msm/dsi/dsi.h | 2 ++ drivers/gpu/drm/msm/hdmi/hdmi.c | 13 +++++++- drivers/gpu/drm/msm/hdmi/hdmi.h | 2 ++ drivers/gpu/drm/msm/msm_drv.h | 50 ++++++++++++++++++---------- drivers/gpu/drm/msm/msm_kms.c | 66 ++++++++++++++++++------------------- 8 files changed, 115 insertions(+), 55 deletions(-) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c index 5ae5eed7e010..79dd556e96c2 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -203,6 +203,8 @@ void msm_dp_display_signal_audio_complete(struct msm_dp *msm_dp_display) complete_all(&dp->audio_comp); } +static const struct msm_display_funcs msm_dp_display_funcs; + static int msm_dp_display_bind(struct device *dev, struct device *master, void *data) { @@ -212,6 +214,7 @@ static int msm_dp_display_bind(struct device *dev, struct device *master, struct drm_device *drm = priv->dev; dp->msm_dp_display.drm_dev = drm; + dp->msm_dp_display.display.funcs = &msm_dp_display_funcs; priv->kms->dp[dp->id] = &dp->msm_dp_display; dp->drm_dev = drm; @@ -1317,9 +1320,10 @@ void msm_dp_display_debugfs_init(struct msm_dp *msm_dp_display, struct dentry *r DRM_ERROR("failed to initialize debug, rc = %d\n", rc); } -int msm_dp_modeset_init(struct msm_dp *msm_dp_display, struct drm_device *dev, - struct drm_encoder *encoder) +static int msm_dp_modeset_init(struct msm_display *display, + struct drm_device *dev, struct drm_encoder *encoder) { + struct msm_dp *msm_dp_display = container_of(display, struct msm_dp, display); struct msm_dp_display_private *msm_dp_priv; int ret; @@ -1348,6 +1352,15 @@ int msm_dp_modeset_init(struct msm_dp *msm_dp_display, struct drm_device *dev, return 0; } +static const struct msm_display_funcs msm_dp_display_funcs = { + .modeset_init = msm_dp_modeset_init, +}; + +struct msm_display *msm_dp_get_display(struct msm_dp *msm_dp_display) +{ + return msm_dp_display ? &msm_dp_display->display : NULL; +} + void msm_dp_bridge_atomic_enable(struct drm_bridge *drm_bridge, struct drm_atomic_commit *state) { diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h index 0b65e16c790d..20a71afb1f90 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.h +++ b/drivers/gpu/drm/msm/dp/dp_display.h @@ -12,6 +12,8 @@ #define DP_MAX_PIXEL_CLK_KHZ 675000 struct msm_dp { + struct msm_display display; + struct drm_device *drm_dev; struct platform_device *pdev; struct drm_connector *connector; diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 3c9f01ed6271..6cd844d08733 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -115,6 +115,8 @@ static struct msm_dsi *dsi_init(struct platform_device *pdev) return ERR_PTR(ret); } +static const struct msm_display_funcs msm_dsi_display_funcs; + static int dsi_bind(struct device *dev, struct device *master, void *data) { struct msm_drm_private *priv = dev_get_drvdata(master); @@ -136,6 +138,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) msm_dsi->next_bridge = ext_bridge; } + msm_dsi->display.funcs = &msm_dsi_display_funcs; priv->kms->dsi[msm_dsi->id] = msm_dsi; return 0; @@ -230,9 +233,11 @@ void __exit msm_dsi_unregister(void) platform_driver_unregister(&dsi_driver); } -int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, - struct drm_encoder *encoder) +static int msm_dsi_modeset_init(struct msm_display *display, + struct drm_device *dev, + struct drm_encoder *encoder) { + struct msm_dsi *msm_dsi = container_of(display, struct msm_dsi, display); int ret; msm_dsi->dev = dev; @@ -262,6 +267,15 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, return 0; } +static const struct msm_display_funcs msm_dsi_display_funcs = { + .modeset_init = msm_dsi_modeset_init, +}; + +struct msm_display *msm_dsi_get_display(struct msm_dsi *msm_dsi) +{ + return msm_dsi ? &msm_dsi->display : NULL; +} + void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi) { msm_dsi_host_snapshot(disp_state, msm_dsi->host); diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h index 93c028a122f3..1d1bda0682db 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.h +++ b/drivers/gpu/drm/msm/dsi/dsi.h @@ -32,6 +32,8 @@ enum msm_dsi_phy_usecase { #define DSI_BUS_CLK_MAX 4 struct msm_dsi { + struct msm_display display; + struct drm_device *dev; struct platform_device *pdev; diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 474006084633..03367c6ba428 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -159,9 +159,10 @@ static int msm_hdmi_init(struct hdmi *hdmi) * should be handled in msm_hdmi_init() so that failure happens from * hdmi sub-device's probe. */ -int msm_hdmi_modeset_init(struct hdmi *hdmi, +static int msm_hdmi_modeset_init(struct msm_display *display, struct drm_device *dev, struct drm_encoder *encoder) { + struct hdmi *hdmi = container_of(display, struct hdmi, display); int ret; hdmi->dev = dev; @@ -210,6 +211,15 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, return ret; } +static const struct msm_display_funcs msm_hdmi_display_funcs = { + .modeset_init = msm_hdmi_modeset_init, +}; + +struct msm_display *msm_hdmi_get_display(struct hdmi *hdmi) +{ + return hdmi ? &hdmi->display : NULL; +} + /* * The hdmi device: */ @@ -243,6 +253,7 @@ static int msm_hdmi_bind(struct device *dev, struct device *master, void *data) err = msm_hdmi_init(hdmi); if (err) return err; + hdmi->display.funcs = &msm_hdmi_display_funcs; priv->kms->hdmi = hdmi; return 0; diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.h b/drivers/gpu/drm/msm/hdmi/hdmi.h index 49433f7727c3..f24444610fe1 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.h +++ b/drivers/gpu/drm/msm/hdmi/hdmi.h @@ -31,6 +31,8 @@ struct hdmi_audio { struct hdmi_hdcp_ctrl; struct hdmi { + struct msm_display display; + struct drm_device *dev; struct platform_device *pdev; diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 0ec0622d9217..dbd955091ce7 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -274,17 +274,39 @@ int msm_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper, .fbdev_probe = NULL #endif +struct msm_display; + +/** + * struct msm_display_funcs - ops provided by a display sub-block (DSI/DP/HDMI) + * @modeset_init: create the bridge and connector for the sub-block, attaching + * to @encoder. + */ +struct msm_display_funcs { + int (*modeset_init)(struct msm_display *display, struct drm_device *dev, + struct drm_encoder *encoder); +}; + +/** + * struct msm_display - common interface to a display sub-block + * @funcs: sub-block provided ops + * + * Embedded in each sub-block (&struct hdmi, &struct msm_dsi, &struct msm_dp) + * so that common KMS code can set up their connectors without knowing the + * concrete type. + */ +struct msm_display { + const struct msm_display_funcs *funcs; +}; + struct hdmi; #ifdef CONFIG_DRM_MSM_HDMI -int msm_hdmi_modeset_init(struct hdmi *hdmi, struct drm_device *dev, - struct drm_encoder *encoder); +struct msm_display *msm_hdmi_get_display(struct hdmi *hdmi); void __init msm_hdmi_register(void); void __exit msm_hdmi_unregister(void); #else -static inline int msm_hdmi_modeset_init(struct hdmi *hdmi, struct drm_device *dev, - struct drm_encoder *encoder) +static inline struct msm_display *msm_hdmi_get_display(struct hdmi *hdmi) { - return -EINVAL; + return NULL; } static inline void __init msm_hdmi_register(void) {} static inline void __exit msm_hdmi_unregister(void) {} @@ -296,8 +318,7 @@ int dsi_dev_attach(struct platform_device *pdev); void dsi_dev_detach(struct platform_device *pdev); void __init msm_dsi_register(void); void __exit msm_dsi_unregister(void); -int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, - struct drm_encoder *encoder); +struct msm_display *msm_dsi_get_display(struct msm_dsi *msm_dsi); void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi); bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi); bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi); @@ -312,11 +333,9 @@ static inline void __init msm_dsi_register(void) static inline void __exit msm_dsi_unregister(void) { } -static inline int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, - struct drm_device *dev, - struct drm_encoder *encoder) +static inline struct msm_display *msm_dsi_get_display(struct msm_dsi *msm_dsi) { - return -EINVAL; + return NULL; } static inline void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi) { @@ -353,8 +372,7 @@ struct msm_dp; #ifdef CONFIG_DRM_MSM_DP int __init msm_dp_register(void); void __exit msm_dp_unregister(void); -int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev, - struct drm_encoder *encoder); +struct msm_display *msm_dp_get_display(struct msm_dp *dp_display); void msm_dp_snapshot(struct msm_disp_state *disp_state, struct msm_dp *dp_display); bool msm_dp_needs_periph_flush(const struct msm_dp *dp_display, const struct drm_display_mode *mode); @@ -368,11 +386,9 @@ static inline int __init msm_dp_register(void) static inline void __exit msm_dp_unregister(void) { } -static inline int msm_dp_modeset_init(struct msm_dp *dp_display, - struct drm_device *dev, - struct drm_encoder *encoder) +static inline struct msm_display *msm_dp_get_display(struct msm_dp *dp_display) { - return -EINVAL; + return NULL; } static inline void msm_dp_snapshot(struct msm_disp_state *disp_state, struct msm_dp *dp_display) diff --git a/drivers/gpu/drm/msm/msm_kms.c b/drivers/gpu/drm/msm/msm_kms.c index 87530145e82b..3f855f9b3d06 100644 --- a/drivers/gpu/drm/msm/msm_kms.c +++ b/drivers/gpu/drm/msm/msm_kms.c @@ -260,9 +260,24 @@ void msm_drm_kms_uninit(struct device *dev) kms->funcs->destroy(kms); } +static int msm_display_modeset_init(struct msm_display *display, + struct drm_device *ddev, + struct drm_encoder *encoder) +{ + if (!display) + return 0; + + return display->funcs->modeset_init(display, ddev, encoder); +} + /* - * Set up the bridges and connectors for the display sub-blocks, using the - * encoders the backend created in ->kms_init(). + * Set up the bridges and connectors for the display sub-blocks, dispatching + * through the common display interface using the encoders the backend created + * in ->kms_init(). + * + * The slave link of a bonded DSI pair shares its master's encoder and creates + * no connector of its own; its ->modeset_init() handles that internally, so it + * needs no special-casing here. */ static int msm_kms_init_connectors(struct drm_device *ddev) { @@ -270,45 +285,30 @@ static int msm_kms_init_connectors(struct drm_device *ddev) struct msm_kms *kms = priv->kms; int i, ret; - /* - * The slave link of a bonded DSI pair shares its master's encoder and - * creates no connector of its own; msm_dsi_modeset_init() handles that - * internally, so it needs no special-casing here. - */ for (i = 0; i < ARRAY_SIZE(kms->dsi); i++) { - if (!kms->dsi[i]) - continue; - - ret = msm_dsi_modeset_init(kms->dsi[i], ddev, kms->dsi_encoder[i]); - if (ret) { - DRM_DEV_ERROR(ddev->dev, - "modeset_init failed for dsi[%d]: %d\n", i, ret); - return ret; - } + ret = msm_display_modeset_init(msm_dsi_get_display(kms->dsi[i]), + ddev, kms->dsi_encoder[i]); + if (ret) + goto fail; } for (i = 0; i < ARRAY_SIZE(kms->dp); i++) { - if (!kms->dp[i]) - continue; - - ret = msm_dp_modeset_init(kms->dp[i], ddev, kms->dp_encoder[i]); - if (ret) { - DRM_DEV_ERROR(ddev->dev, - "modeset_init failed for dp[%d]: %d\n", i, ret); - return ret; - } + ret = msm_display_modeset_init(msm_dp_get_display(kms->dp[i]), + ddev, kms->dp_encoder[i]); + if (ret) + goto fail; } - if (kms->hdmi) { - ret = msm_hdmi_modeset_init(kms->hdmi, ddev, kms->hdmi_encoder); - if (ret) { - DRM_DEV_ERROR(ddev->dev, - "modeset_init failed for HDMI: %d\n", ret); - return ret; - } - } + ret = msm_display_modeset_init(msm_hdmi_get_display(kms->hdmi), + ddev, kms->hdmi_encoder); + if (ret) + goto fail; return 0; + +fail: + DRM_DEV_ERROR(ddev->dev, "modeset_init failed: %d\n", ret); + return ret; } int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv) -- 2.47.3