From nobody Tue Oct 7 22:58:50 2025 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 ED9E628C5CF for ; Sat, 5 Jul 2025 10:02:44 +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=1751709767; cv=none; b=Ve/hDP/K1V1/Zpgm6FsEgC7+qzMgBEQFicy+W96ww+efzbVmCbQRmyvwpV/QwOLbKzzI+3EhNqA4rrT7r4C3XgZ8zrRzSZoMxrOil5ydtB5wD9Oe+IR8BYVqQqoJxYH4H3VPTzOKIZP/jsV1B3N2lvbSVeM5/k5ipskniIYYUTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751709767; c=relaxed/simple; bh=y5GEHKWdnesIiI7b6yReGP2RH3YEuiJU3ksnA2vEGDs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iPPdOPwwI5RdOakce+6MrHeCBwrDAPBe6JMilMAjDiDA7awQ/JC65GQ5ko5YUH9NOaAh7hx0xHzAIGXbojARImYcntKk/9VZTPGeeVGNLV2QJ9pSo4yD2erb3k3gWhMfd6IVJB55CMSrdA8o+UK+dW81QZfmKgMUQ7UHszLclcQ= 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=YGRW+fF/; 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="YGRW+fF/" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5658TlJS008960 for ; Sat, 5 Jul 2025 10:02:44 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= E3adLLPr5/+aiXMMTLA05JccG6xtDgJ60ZWs8OV0rHg=; b=YGRW+fF/6UDCXBaM tPUKrBbH9jJcsaYuXiMN4leLnm15rqDliV+UsVKZ9f2nP5i4aA8gLtQJIRi+GbVZ l1A40SL5BHFIdxWlWL7AgwxcX2Xg2ooKcKX4IevfMUfyElz+Xi2oNTPjeAoz4/lB a+57dQHNm6Wr26EtFLV13agLUbTP/L8bjOwE+Hspl65/CJc1XwSfiHpsFUVaXgS9 GFEhrV3aWIZ5EgiJP77p744k41unrzFrTpP4tBbPACoaqrHuk+ewgCFUQNVlSFE2 a8XslO69ra5n6vT0fozgnF5COy+FwqAaePPTE5ex52AB9VopCDrWmrN8SD/rC/W+ z+XvwA== Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 47pw7q0fyd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Sat, 05 Jul 2025 10:02:43 +0000 (GMT) Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-4a98d1ed40aso37347721cf.1 for ; Sat, 05 Jul 2025 03:02:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751709762; x=1752314562; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E3adLLPr5/+aiXMMTLA05JccG6xtDgJ60ZWs8OV0rHg=; b=W1/RpAVS6XiwNdadEAamDSLI9h61lI1J3m0XoWS6Yt0UWHNeBPhAxuaQ3ByVMO7jcn d6kWT4YBmesxNJLPEB2KYjty2uWWOVzZAc7J4LQXknjaHqkXS2ugAHWZRiu4SVWQqqlH TOBsNEV6XDCSUoeMbpT6+uHrNsLQcqG+wy5wG8a+8OZmW7SRaX4Ea42jthCovGtsInTv JvILen7Bn/paPRhbEn5qht/ooZcUR4zaRojf0NbahgpG69VkxK3sZEskMqtgm+fMwjUo mE5JeM082cYPjEOEntlzrnIvCAzOrWpvhIdX70WsnecDffT55KoOnYKI3rGtRaW3YlCQ heEg== X-Forwarded-Encrypted: i=1; AJvYcCWYvw/Gz4chlnkPM0wOG2GmKF2PZI/S2F/qJHKv0sFGSMEguUh3jNofgJIvhLCseBSdzAfOF5O+Iv2dez0=@vger.kernel.org X-Gm-Message-State: AOJu0YzpJzKDuz9M1j3VKpOirvIWKfpgCJZEJHpgzaoRayd++9dZMlI1 aJm+EBtGiJBOVWd8+0UW5dtKCnVVk3ZOOFBJ6oDGWMcUFOqWdh74mAG40nab7miS+OxhBQ+k4nc silwbiqcy0lR0BgJkH+tbfMQIiR1FtefC1oOvAEYRmypr4N99MBS4q4EnojPiUzbbqlU= X-Gm-Gg: ASbGncsFGKhdC+M8L6XBgNIiOag7FqH0Jq7o4lrHht25YChha+8XGaZJU3eK7CjMhxY GqUbWzXDJQQRLikqVZEFDOYrhMObU1LCK2Tt7+PhYaKakVpv47D2fyeewTsmht5H8UADuYbZMDZ Ws4wzkJQvNlY2MrbtwwDuymy66Bz02EO5vG71D1AfsBR6lLCDsqPnMzkiPSEMs+kT7WC4zYpsBL sLZQp8eLIvaxEq1WGdSH6h/8L4NL88fqJxDwtPD6Bc4feqaMEGju7oetL5IId4HkPHkZpis+RII vSqDf5Yxw1Tm4sYenOM1hq+leEMA/kiWht8t18JLq5xHtwHOTi6roQH3Q1limhMiQvfLWUEholH KV70LgVhykBSOTrImhQgLjM7Mzw6Xa95cLrs= X-Received: by 2002:a05:620a:2b46:b0:7d1:fc53:c6b2 with SMTP id af79cd13be357-7d5f1ad95fcmr249279985a.41.1751709762000; Sat, 05 Jul 2025 03:02:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IElRfBLwEgFO6T08UOJdIHJK2dBeCRnXG+B7FaRciaZH+UKp1B0MbMNZbJOteeK9hTArDNzGw== X-Received: by 2002:a05:620a:2b46:b0:7d1:fc53:c6b2 with SMTP id af79cd13be357-7d5f1ad95fcmr249272785a.41.1751709761153; Sat, 05 Jul 2025 03:02:41 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-556384c0558sm526274e87.209.2025.07.05.03.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jul 2025 03:02:40 -0700 (PDT) From: Dmitry Baryshkov Date: Sat, 05 Jul 2025 13:02:30 +0300 Subject: [PATCH v4 05/10] drm/msm: move KMS driver data to msm_kms 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: quoted-printable Message-Id: <20250705-msm-gpu-split-v4-5-fb470c481131@oss.qualcomm.com> References: <20250705-msm-gpu-split-v4-0-fb470c481131@oss.qualcomm.com> In-Reply-To: <20250705-msm-gpu-split-v4-0-fb470c481131@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Abhinav Kumar X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=15235; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=y5GEHKWdnesIiI7b6yReGP2RH3YEuiJU3ksnA2vEGDs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoaPgz6UM0S83Ejk5lRKpzgljEsFw198ybJUeEq EhBbSOtgVWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaGj4MwAKCRCLPIo+Aiko 1e0VB/44m4yH1bQHdV4HbENI95LIlSafiDr3NYsAycNkeHGPbwRdsSUoS8SEony5hvz2MfndKg4 Iy/e1T7DBceUM8GhgF0LfmwS93KfTI8rBIOWLNpLWtA2v2dnfTQ7LhL5S72J5pTLQ984faS86mu EGe8ME2pwr+D1XuFBw33E+kDpYJIeEUSZ47yBtYbyU9qjRnre1N64q2cxGJoMtS8gJ2CqgPH6DS KNldSfa0HbJ4qYdjva4iNECpZiknY5+W46rywO5beciDN/gWP1jZxnrMSmrrpLrlvgFX0SD8KFY ieArWtrwBGH4cgJ8iKBWf2o3LFCiGecEVLXQLRQFlwJ+fveV X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzA1MDA2NCBTYWx0ZWRfX/0DpES1hz/DU 2wvu1oZmOFo7B9zrNiEeigrHJTe2QmfxvChj9DdHPU0SDCHsmxZd1o6AqS7ferYBu723QG3SyvO MRxZB8kr7sEF1I4vTwl+nTgWCee6Zb0vxmuSvWojJ/kjWGq9Pk4JR9tpvnq4znFL46zLdrXxl+g PeBrSQc135jU9v8mV/EGO/DheSjk5fr5cUGsb9zlrMYpk2uSBUqn2O0/YQChYeeikwSIUt3l9Do 0SNdYQ+TbFa9v3jiHrZmJrme2p29mmfqQhFP5Ai0b+VAQVXZtXtyh0zfUIm9cKYPGS0WwGynE/e qEsCnjDWrBViA0j9m6TrZdL3ffauY7VKrurnu+j0p3J+7Az+EPDdXT8WW5zu5DWztujRJbuhWpF pMIhhcdlfQKAi9GwcWq1qASUiWixfWwaL2Iz47ZgXtZxgvYLPWk+YE7nB+BpCg4WN0MMbGw1 X-Proofpoint-GUID: 9S7dEqLCNS65n50czqyPdE_HtaEoX_5R X-Proofpoint-ORIG-GUID: 9S7dEqLCNS65n50czqyPdE_HtaEoX_5R X-Authority-Analysis: v=2.4 cv=SOBCVPvH c=1 sm=1 tr=0 ts=6868f844 cx=c_pps a=EVbN6Ke/fEF3bsl7X48z0g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Wb1JkmetP80A:10 a=COk6AnOGAAAA:8 a=EUspDBNiAAAA:8 a=472Qx-lKBLW_CYKAQVMA:9 a=QEXdDO2ut3YA:10 a=a_PwQJl-kcHnX1M80qC6:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-07-04_07,2025-07-04_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 bulkscore=0 impostorscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 malwarescore=0 adultscore=0 suspectscore=0 spamscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2507050064 Data for HDMI, DSI and DP blocks only makes sense for the KMS parts of the driver. Move corresponding data pointers from struct msm_drm_private to struct msm_kms. Suggested-by: Abhinav Kumar Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 11 ++++---- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 32 +++++++++++--------= ---- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 8 +++--- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 13 ++++----- drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 12 ++++----- drivers/gpu/drm/msm/dp/dp_display.c | 6 ++--- drivers/gpu/drm/msm/dsi/dsi.c | 4 +-- drivers/gpu/drm/msm/hdmi/hdmi.c | 9 ++++--- drivers/gpu/drm/msm/msm_drv.h | 11 +------- drivers/gpu/drm/msm/msm_kms.h | 6 +++++ 10 files changed, 55 insertions(+), 57 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_encoder.c index f7abe8ba73ef0899ff1985ebf26571b7c459a52f..05e5f3463e30c9a6bd5b7405807= 20ae2bf6b3246 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -264,7 +264,7 @@ bool dpu_encoder_needs_periph_flush(struct dpu_encoder_= phys *phys_enc) mode =3D &phys_enc->cached_mode; =20 return phys_enc->hw_intf->cap->type =3D=3D INTF_DP && - msm_dp_needs_periph_flush(priv->dp[disp_info->h_tile_instance[0]],= mode); + msm_dp_needs_periph_flush(priv->kms->dp[disp_info->h_tile_instance= [0]], mode); } =20 /** @@ -283,9 +283,9 @@ bool dpu_encoder_is_widebus_enabled(const struct drm_en= coder *drm_enc) index =3D disp_info->h_tile_instance[0]; =20 if (disp_info->intf_type =3D=3D INTF_DP) - return msm_dp_wide_bus_available(priv->dp[index]); + return msm_dp_wide_bus_available(priv->kms->dp[index]); else if (disp_info->intf_type =3D=3D INTF_DSI) - return msm_dsi_wide_bus_enabled(priv->dsi[index]); + return msm_dsi_wide_bus_enabled(priv->kms->dsi[index]); =20 return false; } @@ -647,7 +647,7 @@ struct drm_dsc_config *dpu_encoder_get_dsc_config(struc= t drm_encoder *drm_enc) int index =3D dpu_enc->disp_info.h_tile_instance[0]; =20 if (dpu_enc->disp_info.intf_type =3D=3D INTF_DSI) - return msm_dsi_get_dsc_config(priv->dsi[index]); + return msm_dsi_get_dsc_config(priv->kms->dsi[index]); =20 return NULL; } @@ -709,7 +709,8 @@ void dpu_encoder_update_topology(struct drm_encoder *dr= m_enc, if (fb && MSM_FORMAT_IS_YUV(msm_framebuffer_format(fb))) topology->num_cdm++; } else if (disp_info->intf_type =3D=3D INTF_DP) { - if (msm_dp_is_yuv_420_enabled(priv->dp[disp_info->h_tile_instance[0]], a= dj_mode)) + if (msm_dp_is_yuv_420_enabled(priv->kms->dp[disp_info->h_tile_instance[0= ]], + adj_mode)) topology->num_cdm++; } } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/= disp/dpu1/dpu_kms.c index 7025f521b70e501eefa69ddcdba64d38e0ca5465..12dcb32b472497f9e59619db4e8= 10abfbf610c7c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -583,7 +583,7 @@ static int _dpu_kms_initialize_dsi(struct drm_device *d= ev, struct msm_display_info info; int i, rc =3D 0; =20 - if (!(priv->dsi[0] || priv->dsi[1])) + if (!(priv->kms->dsi[0] || priv->kms->dsi[1])) return rc; =20 /* @@ -594,26 +594,26 @@ static int _dpu_kms_initialize_dsi(struct drm_device = *dev, * * TODO: Support swapping DSI0 and DSI1 in the bonded setup. */ - for (i =3D 0; i < ARRAY_SIZE(priv->dsi); i++) { + for (i =3D 0; i < ARRAY_SIZE(priv->kms->dsi); i++) { int other =3D (i + 1) % 2; =20 - if (!priv->dsi[i]) + if (!priv->kms->dsi[i]) continue; =20 - if (msm_dsi_is_bonded_dsi(priv->dsi[i]) && - !msm_dsi_is_master_dsi(priv->dsi[i])) + if (msm_dsi_is_bonded_dsi(priv->kms->dsi[i]) && + !msm_dsi_is_master_dsi(priv->kms->dsi[i])) continue; =20 memset(&info, 0, sizeof(info)); info.intf_type =3D INTF_DSI; =20 info.h_tile_instance[info.num_of_h_tiles++] =3D i; - if (msm_dsi_is_bonded_dsi(priv->dsi[i])) + if (msm_dsi_is_bonded_dsi(priv->kms->dsi[i])) info.h_tile_instance[info.num_of_h_tiles++] =3D other; =20 - info.is_cmd_mode =3D msm_dsi_is_cmd_mode(priv->dsi[i]); + info.is_cmd_mode =3D msm_dsi_is_cmd_mode(priv->kms->dsi[i]); =20 - rc =3D dpu_kms_dsi_set_te_source(&info, priv->dsi[i]); + rc =3D dpu_kms_dsi_set_te_source(&info, priv->kms->dsi[i]); if (rc) { DPU_ERROR("failed to identify TE source for dsi display\n"); return rc; @@ -625,15 +625,15 @@ static int _dpu_kms_initialize_dsi(struct drm_device = *dev, return PTR_ERR(encoder); } =20 - rc =3D msm_dsi_modeset_init(priv->dsi[i], dev, encoder); + rc =3D msm_dsi_modeset_init(priv->kms->dsi[i], dev, encoder); if (rc) { DPU_ERROR("modeset_init failed for dsi[%d], rc =3D %d\n", i, rc); break; } =20 - if (msm_dsi_is_bonded_dsi(priv->dsi[i]) && priv->dsi[other]) { - rc =3D msm_dsi_modeset_init(priv->dsi[other], dev, encoder); + if (msm_dsi_is_bonded_dsi(priv->kms->dsi[i]) && priv->kms->dsi[other]) { + rc =3D msm_dsi_modeset_init(priv->kms->dsi[other], dev, encoder); if (rc) { DPU_ERROR("modeset_init failed for dsi[%d], rc =3D %d\n", other, rc); @@ -655,8 +655,8 @@ static int _dpu_kms_initialize_displayport(struct drm_d= evice *dev, int rc; int i; =20 - for (i =3D 0; i < ARRAY_SIZE(priv->dp); i++) { - if (!priv->dp[i]) + for (i =3D 0; i < ARRAY_SIZE(priv->kms->dp); i++) { + if (!priv->kms->dp[i]) continue; =20 memset(&info, 0, sizeof(info)); @@ -671,7 +671,7 @@ static int _dpu_kms_initialize_displayport(struct drm_d= evice *dev, } =20 yuv_supported =3D !!dpu_kms->catalog->cdm; - rc =3D msm_dp_modeset_init(priv->dp[i], dev, encoder, yuv_supported); + rc =3D msm_dp_modeset_init(priv->kms->dp[i], dev, encoder, yuv_supported= ); if (rc) { DPU_ERROR("modeset_init failed for DP, rc =3D %d\n", rc); return rc; @@ -689,7 +689,7 @@ static int _dpu_kms_initialize_hdmi(struct drm_device *= dev, struct msm_display_info info; int rc; =20 - if (!priv->hdmi) + if (!priv->kms->hdmi) return 0; =20 memset(&info, 0, sizeof(info)); @@ -703,7 +703,7 @@ static int _dpu_kms_initialize_hdmi(struct drm_device *= dev, return PTR_ERR(encoder); } =20 - rc =3D msm_hdmi_modeset_init(priv->hdmi, dev, encoder); + rc =3D msm_hdmi_modeset_init(priv->kms->hdmi, dev, encoder); if (rc) { DPU_ERROR("modeset_init failed for DP, rc =3D %d\n", rc); return rc; diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm= /disp/mdp4/mdp4_kms.c index 1aa7d65afbd0b4e8a231d1d4ff7a7120e8b7391e..0952c7f18abdca4a7e24e5af8a7= 132456bfec129 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -250,9 +250,9 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4= _kms, /* DTV can be hooked to DMA_E: */ encoder->possible_crtcs =3D 1 << 1; =20 - if (priv->hdmi) { + if (priv->kms->hdmi) { /* Construct bridge/connector for HDMI: */ - ret =3D msm_hdmi_modeset_init(priv->hdmi, dev, encoder); + ret =3D msm_hdmi_modeset_init(priv->kms->hdmi, dev, encoder); if (ret) { DRM_DEV_ERROR(dev->dev, "failed to initialize HDMI: %d\n", ret); return ret; @@ -264,7 +264,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4= _kms, /* only DSI1 supported for now */ dsi_id =3D 0; =20 - if (!priv->dsi[dsi_id]) + if (!priv->kms->dsi[dsi_id]) break; =20 encoder =3D mdp4_dsi_encoder_init(dev); @@ -278,7 +278,7 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4= _kms, /* TODO: Add DMA_S later? */ encoder->possible_crtcs =3D 1 << DMA_P; =20 - ret =3D msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder); + ret =3D msm_dsi_modeset_init(priv->kms->dsi[dsi_id], dev, encoder); if (ret) { DRM_DEV_ERROR(dev->dev, "failed to initialize DSI: %d\n", ret); diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm= /disp/mdp5/mdp5_kms.c index 4c9e79fc00e9d8ca8de294c83559e72a2e48d1d2..5b6ca8dd929e1870b7228af93da= 03886524f5f20 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -312,7 +312,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, DRM_DEV_INFO(dev->dev, "Skipping eDP interface %d\n", intf->num); break; case INTF_HDMI: - if (!priv->hdmi) + if (!priv->kms->hdmi) break; =20 ctl =3D mdp5_ctlm_request(ctlm, intf->num); @@ -327,7 +327,7 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, break; } =20 - ret =3D msm_hdmi_modeset_init(priv->hdmi, dev, encoder); + ret =3D msm_hdmi_modeset_init(priv->kms->hdmi, dev, encoder); break; case INTF_DSI: { @@ -335,14 +335,14 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_km= s, mdp5_cfg_get_hw_config(mdp5_kms->cfg); int dsi_id =3D get_dsi_id_from_intf(hw_cfg, intf->num); =20 - if ((dsi_id >=3D ARRAY_SIZE(priv->dsi)) || (dsi_id < 0)) { + if ((dsi_id >=3D ARRAY_SIZE(priv->kms->dsi)) || (dsi_id < 0)) { DRM_DEV_ERROR(dev->dev, "failed to find dsi from intf %d\n", intf->num); ret =3D -EINVAL; break; } =20 - if (!priv->dsi[dsi_id]) + if (!priv->kms->dsi[dsi_id]) break; =20 ctl =3D mdp5_ctlm_request(ctlm, intf->num); @@ -357,9 +357,10 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms, break; } =20 - ret =3D msm_dsi_modeset_init(priv->dsi[dsi_id], dev, encoder); + ret =3D msm_dsi_modeset_init(priv->kms->dsi[dsi_id], dev, encoder); if (!ret) - mdp5_encoder_set_intf_mode(encoder, msm_dsi_is_cmd_mode(priv->dsi[dsi_i= d])); + mdp5_encoder_set_intf_mode(encoder, + msm_dsi_is_cmd_mode(priv->kms->dsi[dsi_id])); =20 break; } diff --git a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c b/drivers/gp= u/drm/msm/disp/msm_disp_snapshot_util.c index 07a2c1e872193bc96172c84142bd4ecc93a95a1c..071bcdea80f7114308e5a1e1a98= 9ad0f064a09d2 100644 --- a/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c +++ b/drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c @@ -127,18 +127,18 @@ void msm_disp_snapshot_capture_state(struct msm_disp_= state *disp_state) priv =3D drm_dev->dev_private; kms =3D priv->kms; =20 - for (i =3D 0; i < ARRAY_SIZE(priv->dp); i++) { - if (!priv->dp[i]) + for (i =3D 0; i < ARRAY_SIZE(kms->dp); i++) { + if (!kms->dp[i]) continue; =20 - msm_dp_snapshot(disp_state, priv->dp[i]); + msm_dp_snapshot(disp_state, kms->dp[i]); } =20 - for (i =3D 0; i < ARRAY_SIZE(priv->dsi); i++) { - if (!priv->dsi[i]) + for (i =3D 0; i < ARRAY_SIZE(kms->dsi); i++) { + if (!kms->dsi[i]) continue; =20 - msm_dsi_snapshot(disp_state, priv->dsi[i]); + msm_dsi_snapshot(disp_state, kms->dsi[i]); } =20 if (kms->funcs->snapshot) diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/d= p_display.c index 2006e7fe78848531bd121c07ebb449decab66029..d87d47cc7ec3eb757ac192c4110= 00bc50b824c59 100644 --- a/drivers/gpu/drm/msm/dp/dp_display.c +++ b/drivers/gpu/drm/msm/dp/dp_display.c @@ -292,9 +292,7 @@ static int msm_dp_display_bind(struct device *dev, stru= ct device *master, struct drm_device *drm =3D priv->dev; =20 dp->msm_dp_display.drm_dev =3D drm; - priv->dp[dp->id] =3D &dp->msm_dp_display; - - + priv->kms->dp[dp->id] =3D &dp->msm_dp_display; =20 dp->drm_dev =3D drm; dp->aux->drm_dev =3D drm; @@ -328,7 +326,7 @@ static void msm_dp_display_unbind(struct device *dev, s= truct device *master, msm_dp_aux_unregister(dp->aux); dp->drm_dev =3D NULL; dp->aux->drm_dev =3D NULL; - priv->dp[dp->id] =3D NULL; + priv->kms->dp[dp->id] =3D NULL; } =20 static const struct component_ops msm_dp_display_comp_ops =3D { diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 2962158776135d6e3c5b119bf4341c135c8f5248..d8bb40ef820e2b8c8ac933ca01e= 1dc46f087a218 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -136,7 +136,7 @@ static int dsi_bind(struct device *dev, struct device *= master, void *data) msm_dsi->next_bridge =3D ext_bridge; } =20 - priv->dsi[msm_dsi->id] =3D msm_dsi; + priv->kms->dsi[msm_dsi->id] =3D msm_dsi; =20 return 0; } @@ -148,7 +148,7 @@ static void dsi_unbind(struct device *dev, struct devic= e *master, struct msm_dsi *msm_dsi =3D dev_get_drvdata(dev); =20 msm_dsi_tx_buf_free(msm_dsi->host); - priv->dsi[msm_dsi->id] =3D NULL; + priv->kms->dsi[msm_dsi->id] =3D NULL; } =20 static const struct component_ops dsi_ops =3D { diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdm= i.c index 2fd388b892dcb3d83cf57b4616b7a65f9ff674d1..5afac09c0d3347f85a3449207b3= c876aae4dd1e2 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -15,6 +15,7 @@ #include #include =20 +#include "msm_kms.h" #include "hdmi.h" =20 void msm_hdmi_set_mode(struct hdmi *hdmi, bool power_on) @@ -244,7 +245,7 @@ static int msm_hdmi_bind(struct device *dev, struct dev= ice *master, void *data) err =3D msm_hdmi_init(hdmi); if (err) return err; - priv->hdmi =3D hdmi; + priv->kms->hdmi =3D hdmi; =20 return 0; } @@ -254,9 +255,9 @@ static void msm_hdmi_unbind(struct device *dev, struct = device *master, { struct msm_drm_private *priv =3D dev_get_drvdata(master); =20 - if (priv->hdmi) { - msm_hdmi_destroy(priv->hdmi); - priv->hdmi =3D NULL; + if (priv->kms->hdmi) { + msm_hdmi_destroy(priv->kms->hdmi); + priv->kms->hdmi =3D NULL; } } =20 diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index 88ce305792fd89f280b39bd92888a18abd0343e3..e7872b752c6c8e5869927634184= 733796afa1967 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -86,16 +86,6 @@ struct msm_drm_private { /* subordinate devices, if present: */ struct platform_device *gpu_pdev; =20 - /* possibly this should be in the kms component, but it is - * shared by both mdp4 and mdp5.. - */ - struct hdmi *hdmi; - - /* DSI is shared by mdp4 and mdp5 */ - struct msm_dsi *dsi[MSM_DSI_CONTROLLER_COUNT]; - - struct msm_dp *dp[MSM_DP_CONTROLLER_COUNT]; - /* when we have more than one 'msm_gpu' these need to be an array: */ struct msm_gpu *gpu; =20 @@ -367,6 +357,7 @@ static inline const char *msm_dsi_get_te_source(struct = msm_dsi *msm_dsi) } #endif =20 +struct msm_dp; #ifdef CONFIG_DRM_MSM_DP int __init msm_dp_register(void); void __exit msm_dp_unregister(void); diff --git a/drivers/gpu/drm/msm/msm_kms.h b/drivers/gpu/drm/msm/msm_kms.h index 7ecf420d0f16cd68f8f7fd99c52e994fe604851f..f4eb486531890f3351cf83670be= 801e8fd3631bb 100644 --- a/drivers/gpu/drm/msm/msm_kms.h +++ b/drivers/gpu/drm/msm/msm_kms.h @@ -131,6 +131,12 @@ struct msm_kms { const struct msm_kms_funcs *funcs; struct drm_device *dev; =20 + struct hdmi *hdmi; + + struct msm_dsi *dsi[MSM_DSI_CONTROLLER_COUNT]; + + struct msm_dp *dp[MSM_DP_CONTROLLER_COUNT]; + /* irq number to be passed on to msm_irq_install */ int irq; bool irq_requested; --=20 2.39.5