From: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> To: hjc-TNX95d0MmH7DzftRWevZcw@public.gmane.org, architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org, a.hajda-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org, kishon-l0cyMroinI0@public.gmane.org Cc: robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, airlied-cv59FeDIM0c@public.gmane.org, Laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org, zhengyang-TNX95d0MmH7DzftRWevZcw@public.gmane.org, Jose.Abreu-HKixBCOQz3hWk0Htik3J/w@public.gmane.org, algea.cao-TNX95d0MmH7DzftRWevZcw@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> Subject: [PATCH 8/9] drm/rockchip: dw_hdmi: store rockchip_hdmi reference in phy_data object Date: Mon, 5 Feb 2018 15:34:34 +0100 [thread overview] Message-ID: <20180205143435.4723-9-heiko@sntech.de> (raw) In-Reply-To: <20180205143435.4723-1-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> When using special phy handling operations we'll often need access to the rockchip_hdmi struct. As the chip-data that occupies the phy_data pointer initially gets assigned to the rockchip_hdmi struct we can not re-use this phy_data pointer to hold the reference to the rockchip_hdmi struct, similar to how meson-hdmi does it for example. Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 512f8556e7c0..5a62328887d5 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -342,7 +342,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, void *data) { struct platform_device *pdev = to_platform_device(dev); - const struct dw_hdmi_plat_data *plat_data; + struct dw_hdmi_plat_data *plat_data; const struct of_device_id *match; struct drm_device *drm = data; struct drm_encoder *encoder; @@ -357,9 +357,14 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, return -ENOMEM; match = of_match_node(dw_hdmi_rockchip_dt_ids, pdev->dev.of_node); - plat_data = match->data; + plat_data = devm_kmemdup(&pdev->dev, match->data, + sizeof(*plat_data), GFP_KERNEL); + if (!plat_data) + return -ENOMEM; + hdmi->dev = &pdev->dev; hdmi->chip_data = plat_data->phy_data; + plat_data->phy_data = hdmi; encoder = &hdmi->encoder; encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); -- 2.15.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stuebner) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 8/9] drm/rockchip: dw_hdmi: store rockchip_hdmi reference in phy_data object Date: Mon, 5 Feb 2018 15:34:34 +0100 [thread overview] Message-ID: <20180205143435.4723-9-heiko@sntech.de> (raw) In-Reply-To: <20180205143435.4723-1-heiko@sntech.de> When using special phy handling operations we'll often need access to the rockchip_hdmi struct. As the chip-data that occupies the phy_data pointer initially gets assigned to the rockchip_hdmi struct we can not re-use this phy_data pointer to hold the reference to the rockchip_hdmi struct, similar to how meson-hdmi does it for example. Signed-off-by: Heiko Stuebner <heiko@sntech.de> --- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c index 512f8556e7c0..5a62328887d5 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -342,7 +342,7 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, void *data) { struct platform_device *pdev = to_platform_device(dev); - const struct dw_hdmi_plat_data *plat_data; + struct dw_hdmi_plat_data *plat_data; const struct of_device_id *match; struct drm_device *drm = data; struct drm_encoder *encoder; @@ -357,9 +357,14 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master, return -ENOMEM; match = of_match_node(dw_hdmi_rockchip_dt_ids, pdev->dev.of_node); - plat_data = match->data; + plat_data = devm_kmemdup(&pdev->dev, match->data, + sizeof(*plat_data), GFP_KERNEL); + if (!plat_data) + return -ENOMEM; + hdmi->dev = &pdev->dev; hdmi->chip_data = plat_data->phy_data; + plat_data->phy_data = hdmi; encoder = &hdmi->encoder; encoder->possible_crtcs = drm_of_find_possible_crtcs(drm, dev->of_node); -- 2.15.1
next prev parent reply other threads:[~2018-02-05 14:34 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-05 14:34 [PATCH 0/9] drm/rockchip: hdmi support for rk3328 Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner 2018-02-05 14:34 ` [PATCH 7/9] drm/rockchip: dw_hdmi: allow including external phys Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner [not found] ` <20180205143435.4723-1-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> 2018-02-05 14:34 ` [PATCH 1/9] dt-bindings: add binding for Rockchip hdmi phy using an Innosilicon IP Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner [not found] ` <20180205143435.4723-2-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> 2018-02-09 2:34 ` Rob Herring 2018-02-09 2:34 ` Rob Herring 2018-02-05 14:34 ` [PATCH 2/9] phy: add Rockchip Innosilicon hdmi phy Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner [not found] ` <20180205143435.4723-3-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org> 2018-02-05 21:32 ` [2/9] " Martin Cerveny 2018-02-05 21:32 ` Martin Cerveny 2018-02-09 9:24 ` Heiko Stuebner 2018-02-09 9:24 ` Heiko Stuebner 2018-02-09 10:06 ` Andrzej Hajda 2018-02-09 10:06 ` Andrzej Hajda 2018-02-09 10:10 ` Heiko Stuebner 2018-02-09 10:10 ` Heiko Stuebner 2018-02-05 14:34 ` [PATCH 3/9] drm/bridge: dw-hdmi: allow overriding of phy-type reading Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner 2018-02-05 14:34 ` [PATCH 4/9] drm/bridge: dw-hdmi: export hotplug functions Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner 2018-02-05 14:34 ` [PATCH 5/9] drm/rockchip: dw_hdmi: Allow outputs that don't need output switching Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner 2018-02-05 14:34 ` [PATCH 6/9] dt-bindings: allow optional phys in Rockchip dw_hdmi binding Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner [this message] 2018-02-05 14:34 ` [PATCH 8/9] drm/rockchip: dw_hdmi: store rockchip_hdmi reference in phy_data object Heiko Stuebner 2018-02-05 14:34 ` [PATCH 9/9] drm/rockchip: dw_hdmi: add dw-hdmi support for the rk3328 Heiko Stuebner 2018-02-05 14:34 ` Heiko Stuebner
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=20180205143435.4723-9-heiko@sntech.de \ --to=heiko-4mtyjxux2i+zqb+pc5nmwq@public.gmane.org \ --cc=Jose.Abreu-HKixBCOQz3hWk0Htik3J/w@public.gmane.org \ --cc=Laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \ --cc=a.hajda-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org \ --cc=airlied-cv59FeDIM0c@public.gmane.org \ --cc=algea.cao-TNX95d0MmH7DzftRWevZcw@public.gmane.org \ --cc=architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \ --cc=hjc-TNX95d0MmH7DzftRWevZcw@public.gmane.org \ --cc=kishon-l0cyMroinI0@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \ --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=zhengyang-TNX95d0MmH7DzftRWevZcw@public.gmane.org \ /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.