From: Kandpal Suraj <suraj.kandpal@intel.com> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Kandpal Suraj <suraj.kandpal@intel.com>, carsten.haitzler@arm.com, jani.nikula@intel.com, quic_abhinavk@quicinc.com, laurent.pinchart@ideasonboard.com, dmitry.baryshkov@linaro.org, arun.r.murthy@intel.com Subject: [PATCH v2 4/6] drm/vc4: vc4 driver changes to accommodate changes done in drm_writeback_connector structure Date: Wed, 2 Feb 2022 13:47:00 +0530 [thread overview] Message-ID: <20220202081702.22119-4-suraj.kandpal@intel.com> (raw) In-Reply-To: <20220202081702.22119-1-suraj.kandpal@intel.com> Changing vc4 driver to accomadate the change of drm_writeback_connector.base and drm_writeback_connector.encoder to a pointer the reason for which is explained in the Patch(drm: add writeback pointers to drm_connector). Signed-off-by: Kandpal Suraj <suraj.kandpal@intel.com> --- drivers/gpu/drm/vc4/vc4_txp.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index 9809ca3e2945..9882569d147c 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -151,6 +151,10 @@ struct vc4_txp { struct platform_device *pdev; + struct drm_connector drm_conn; + + struct drm_encoder drm_enc; + struct drm_writeback_connector connector; void __iomem *regs; @@ -159,12 +163,12 @@ struct vc4_txp { static inline struct vc4_txp *encoder_to_vc4_txp(struct drm_encoder *encoder) { - return container_of(encoder, struct vc4_txp, connector.encoder); + return container_of(encoder, struct vc4_txp, drm_enc); } static inline struct vc4_txp *connector_to_vc4_txp(struct drm_connector *conn) { - return container_of(conn, struct vc4_txp, connector.base); + return container_of(conn, struct vc4_txp, drm_conn); } static const struct debugfs_reg32 txp_regs[] = { @@ -467,6 +471,7 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) struct vc4_txp *txp; struct drm_crtc *crtc; struct drm_encoder *encoder; + struct drm_writeback_connector *wb_conn; int ret, irq; irq = platform_get_irq(pdev, 0); @@ -491,10 +496,13 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) txp->regset.base = txp->regs; txp->regset.regs = txp_regs; txp->regset.nregs = ARRAY_SIZE(txp_regs); + wb_conn = &txp->connector; + wb_conn->base = &txp->drm_conn; + wb_conn->encoder = &txp->drm_enc; - drm_connector_helper_add(&txp->connector.base, + drm_connector_helper_add(wb_conn->base, &vc4_txp_connector_helper_funcs); - ret = drm_writeback_connector_init(drm, &txp->connector, + ret = drm_writeback_connector_init(drm, wb_conn, &vc4_txp_connector_funcs, &vc4_txp_encoder_helper_funcs, drm_fmts, ARRAY_SIZE(drm_fmts)); @@ -506,7 +514,7 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) if (ret) return ret; - encoder = &txp->connector.encoder; + encoder = txp->connector.encoder; encoder->possible_crtcs = drm_crtc_mask(crtc); ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0, @@ -529,7 +537,7 @@ static void vc4_txp_unbind(struct device *dev, struct device *master, struct vc4_dev *vc4 = to_vc4_dev(drm); struct vc4_txp *txp = dev_get_drvdata(dev); - vc4_txp_connector_destroy(&txp->connector.base); + vc4_txp_connector_destroy(txp->connector.base); vc4->txp = NULL; } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Kandpal Suraj <suraj.kandpal@intel.com> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: carsten.haitzler@arm.com, jani.nikula@intel.com, quic_abhinavk@quicinc.com, laurent.pinchart@ideasonboard.com, dmitry.baryshkov@linaro.org Subject: [Intel-gfx] [PATCH v2 4/6] drm/vc4: vc4 driver changes to accommodate changes done in drm_writeback_connector structure Date: Wed, 2 Feb 2022 13:47:00 +0530 [thread overview] Message-ID: <20220202081702.22119-4-suraj.kandpal@intel.com> (raw) In-Reply-To: <20220202081702.22119-1-suraj.kandpal@intel.com> Changing vc4 driver to accomadate the change of drm_writeback_connector.base and drm_writeback_connector.encoder to a pointer the reason for which is explained in the Patch(drm: add writeback pointers to drm_connector). Signed-off-by: Kandpal Suraj <suraj.kandpal@intel.com> --- drivers/gpu/drm/vc4/vc4_txp.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index 9809ca3e2945..9882569d147c 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -151,6 +151,10 @@ struct vc4_txp { struct platform_device *pdev; + struct drm_connector drm_conn; + + struct drm_encoder drm_enc; + struct drm_writeback_connector connector; void __iomem *regs; @@ -159,12 +163,12 @@ struct vc4_txp { static inline struct vc4_txp *encoder_to_vc4_txp(struct drm_encoder *encoder) { - return container_of(encoder, struct vc4_txp, connector.encoder); + return container_of(encoder, struct vc4_txp, drm_enc); } static inline struct vc4_txp *connector_to_vc4_txp(struct drm_connector *conn) { - return container_of(conn, struct vc4_txp, connector.base); + return container_of(conn, struct vc4_txp, drm_conn); } static const struct debugfs_reg32 txp_regs[] = { @@ -467,6 +471,7 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) struct vc4_txp *txp; struct drm_crtc *crtc; struct drm_encoder *encoder; + struct drm_writeback_connector *wb_conn; int ret, irq; irq = platform_get_irq(pdev, 0); @@ -491,10 +496,13 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) txp->regset.base = txp->regs; txp->regset.regs = txp_regs; txp->regset.nregs = ARRAY_SIZE(txp_regs); + wb_conn = &txp->connector; + wb_conn->base = &txp->drm_conn; + wb_conn->encoder = &txp->drm_enc; - drm_connector_helper_add(&txp->connector.base, + drm_connector_helper_add(wb_conn->base, &vc4_txp_connector_helper_funcs); - ret = drm_writeback_connector_init(drm, &txp->connector, + ret = drm_writeback_connector_init(drm, wb_conn, &vc4_txp_connector_funcs, &vc4_txp_encoder_helper_funcs, drm_fmts, ARRAY_SIZE(drm_fmts)); @@ -506,7 +514,7 @@ static int vc4_txp_bind(struct device *dev, struct device *master, void *data) if (ret) return ret; - encoder = &txp->connector.encoder; + encoder = txp->connector.encoder; encoder->possible_crtcs = drm_crtc_mask(crtc); ret = devm_request_irq(dev, irq, vc4_txp_interrupt, 0, @@ -529,7 +537,7 @@ static void vc4_txp_unbind(struct device *dev, struct device *master, struct vc4_dev *vc4 = to_vc4_dev(drm); struct vc4_txp *txp = dev_get_drvdata(dev); - vc4_txp_connector_destroy(&txp->connector.base); + vc4_txp_connector_destroy(txp->connector.base); vc4->txp = NULL; } -- 2.17.1
next prev parent reply other threads:[~2022-02-02 8:08 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-11 10:17 [PATCH 1/3] drm: add writeback pointers to drm_connector Kandpal, Suraj 2022-01-11 10:17 ` [Intel-gfx] " Kandpal, Suraj 2022-01-11 10:18 ` [PATCH 2/3] drm/arm/komeda : change driver to use drm_writeback_connector.base pointer Kandpal, Suraj 2022-01-11 10:18 ` [Intel-gfx] " Kandpal, Suraj 2022-01-24 17:27 ` Carsten Haitzler 2022-01-24 17:27 ` [Intel-gfx] " Carsten Haitzler 2022-01-11 10:18 ` [PATCH 3/3] drm/vkms: change vkms " Kandpal, Suraj 2022-01-11 10:18 ` [Intel-gfx] " Kandpal, Suraj 2022-01-31 4:14 ` Kandpal, Suraj 2022-01-31 4:14 ` [Intel-gfx] " Kandpal, Suraj 2022-01-11 15:03 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/3] drm: add writeback pointers to drm_connector Patchwork 2022-01-11 15:16 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2022-01-11 20:42 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork 2022-01-21 18:25 ` [Intel-gfx] [PATCH 1/3] " Abhinav Kumar 2022-01-21 18:25 ` Abhinav Kumar 2022-01-27 9:33 ` Kandpal, Suraj 2022-01-27 9:33 ` [Intel-gfx] " Kandpal, Suraj 2022-01-27 18:17 ` Abhinav Kumar 2022-01-27 18:17 ` [Intel-gfx] " Abhinav Kumar 2022-02-01 1:42 ` Abhinav Kumar 2022-02-01 1:42 ` [Intel-gfx] " Abhinav Kumar 2022-02-01 5:23 ` Kandpal, Suraj 2022-02-01 5:23 ` [Intel-gfx] " Kandpal, Suraj 2022-02-02 8:16 ` [PATCH v2 1/6] " Kandpal Suraj 2022-02-02 8:16 ` [Intel-gfx] " Kandpal Suraj 2022-02-02 8:16 ` [PATCH v2 2/6] drm/arm/komeda : change driver to use drm_writeback_connector.base pointer Kandpal Suraj 2022-02-02 8:16 ` [Intel-gfx] " Kandpal Suraj 2022-02-02 8:16 ` [PATCH v2 3/6] drm/vkms: change vkms " Kandpal Suraj 2022-02-02 8:16 ` [Intel-gfx] " Kandpal Suraj 2022-02-02 8:17 ` Kandpal Suraj [this message] 2022-02-02 8:17 ` [Intel-gfx] [PATCH v2 4/6] drm/vc4: vc4 driver changes to accommodate changes done in drm_writeback_connector structure Kandpal Suraj 2022-02-02 8:17 ` [PATCH v2 5/6] drm/rcar_du: changes to rcar-du driver resulting from drm_writeback_connector structure changes Kandpal Suraj 2022-02-02 8:17 ` [Intel-gfx] " Kandpal Suraj 2022-02-02 8:17 ` [PATCH v2 6/6] drm/arm: changes to malidp " Kandpal Suraj 2022-02-02 8:17 ` [Intel-gfx] " Kandpal Suraj
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220202081702.22119-4-suraj.kandpal@intel.com \ --to=suraj.kandpal@intel.com \ --cc=arun.r.murthy@intel.com \ --cc=carsten.haitzler@arm.com \ --cc=dmitry.baryshkov@linaro.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=quic_abhinavk@quicinc.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.