From patchwork Fri Mar 18 01:45:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhinav Kumar X-Patchwork-Id: 12784751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 419D7C433F5 for ; Fri, 18 Mar 2022 01:46:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7BFA410E92B; Fri, 18 Mar 2022 01:46:00 +0000 (UTC) Received: from alexa-out-sd-01.qualcomm.com (alexa-out-sd-01.qualcomm.com [199.106.114.38]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5368110E90E; Fri, 18 Mar 2022 01:45:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1647567959; x=1679103959; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=drgfOlbV1tTwxhpdOrf5OdjebHoFT0Bes414dEGx940=; b=MFhgszSmQmSzW6jN/6kNWjvdyVc3enPBgj+31E2DfivP+27vlTCSeEU5 eRvIngMByJGeRM8uWzITmuN2uRpEMvAOLjCh9jGw4lSG+8yjDJhpPNLBi QRJP5vWxez35MYEZ3uT01x286H3alZz77FkkKZ0bwfMD20Eme+rluqHK0 0=; Received: from unknown (HELO ironmsg02-sd.qualcomm.com) ([10.53.140.142]) by alexa-out-sd-01.qualcomm.com with ESMTP; 17 Mar 2022 18:45:59 -0700 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg02-sd.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2022 18:45:58 -0700 Received: from nalasex01a.na.qualcomm.com (10.47.209.196) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Thu, 17 Mar 2022 18:45:58 -0700 Received: from abhinavk-linux.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Thu, 17 Mar 2022 18:45:57 -0700 From: Abhinav Kumar To: Subject: [PATCH v4 4/4] drm/vc4: change vc4 driver to use drm_writeback_connector_init_with_encoder() Date: Thu, 17 Mar 2022 18:45:36 -0700 Message-ID: <1647567936-11971-5-git-send-email-quic_abhinavk@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1647567936-11971-1-git-send-email-quic_abhinavk@quicinc.com> References: <1647567936-11971-1-git-send-email-quic_abhinavk@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hamohammed.sa@gmail.com, suraj.kandpal@intel.com, emma@anholt.net, rodrigosiqueiramelo@gmail.com, jani.nikula@intel.com, liviu.dudau@arm.com, Abhinav Kumar , swboyd@chromium.org, melissa.srw@gmail.com, nganji@codeaurora.org, seanpaul@chromium.org, laurent.pinchart@ideasonboard.com, dmitry.baryshkov@linaro.org, james.qian.wang@arm.com, quic_aravindh@quicinc.com, mihail.atanassov@arm.com, freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" vc4 driver currently embeds the drm_encoder into struct vc4_txp and later on uses container_of to retrieve the vc4_txp from the drm_encoder. Since drm_encoder has now been made a pointer inside drm_writeback_connector, make vc4 driver use the new API so that the embedded encoder model can be retained in the driver and there is no change in functionality. changes in v4: - none Signed-off-by: Abhinav Kumar --- drivers/gpu/drm/vc4/vc4_txp.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index 341a9be5..3d24ef5 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -370,6 +370,10 @@ static const struct drm_encoder_helper_funcs vc4_txp_encoder_helper_funcs = { .disable = vc4_txp_encoder_disable, }; +static const struct drm_encoder_funcs vc4_txp_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + static int vc4_txp_enable_vblank(struct drm_crtc *crtc) { return 0; @@ -498,15 +502,24 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) wb_conn = &txp->connector; wb_conn->encoder = &txp->drm_enc; + drm_encoder_helper_add(wb_conn->encoder, &vc4_txp_encoder_helper_funcs); + + ret = drm_encoder_init(drm, wb_conn->encoder, + &vc4_txp_encoder_funcs, + DRM_MODE_ENCODER_VIRTUAL, NULL); + + if (ret) + return ret; + drm_connector_helper_add(&wb_conn->base, &vc4_txp_connector_helper_funcs); - ret = drm_writeback_connector_init(drm, wb_conn, - &vc4_txp_connector_funcs, - &vc4_txp_encoder_helper_funcs, - drm_fmts, ARRAY_SIZE(drm_fmts), - 0); - if (ret) + + ret = drm_writeback_connector_init_with_encoder(drm, wb_conn, + &vc4_txp_connector_funcs, drm_fmts, ARRAY_SIZE(drm_fmts)); + if (ret) { + drm_encoder_cleanup(wb_conn->encoder); return ret; + } ret = vc4_crtc_init(drm, vc4_crtc, &vc4_txp_crtc_funcs, &vc4_txp_crtc_helper_funcs);