diff for duplicates of <2164089.bDJbLuhFGU@phil> diff --git a/a/1.txt b/N1/1.txt index a4f7008..04e42cd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,7 +8,7 @@ Am Dienstag, 28. August 2018, 10:12:34 CEST schrieb Sandy Huang: > Signed-off-by: Sandy Huang <hjc@rock-chips.com> > Reviewed-by: Sean Paul <seanpaul@chromium.org> > Reviewed-by: Mark Yao <mark.yao@rock-chips.com> -> Link: https://patchwork.freedesktop.org/patch/msgid/1509522851-128181-1-git-send-email-hjc@rock-chips.com +> Link: https://patchwork.freedesktop.org/patch/msgid/1509522851-128181-1-git-send-email-hjc at rock-chips.com This does not really address, Rob's concern about not being an actual hardware block related to the devicetree node you are using. @@ -485,3 +485,10 @@ index 0c5358350159..f4dd0b143467 100644 static const struct vop_scl_extension rk3288_win_full_scl_ext = { -- 2.17.0 +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: 0001-drm-tockchip-add-function-to-check-if-endpoint-is-a-.patch +Type: text/x-patch +Size: 2584 bytes +Desc: not available +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180828/3ec9cb76/attachment.bin> diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 637e4e6..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,3 +0,0 @@ -Content-Disposition: attachment; filename="0001-drm-tockchip-add-function-to-check-if-endpoint-is-a-.patch" -Content-Transfer-Encoding: 7Bit -Content-Type: text/x-patch; charset="UTF-8"; name="0001-drm-tockchip-add-function-to-check-if-endpoint-is-a-.patch" diff --git a/a/2.txt b/a/2.txt deleted file mode 100644 index 061b200..0000000 --- a/a/2.txt +++ /dev/null @@ -1,75 +0,0 @@ -From c5a48c772f3564211dcd1ec71004de1d6dbb0307 Mon Sep 17 00:00:00 2001 -From: Heiko Stuebner <heiko@sntech.de> -Date: Sat, 25 Aug 2018 19:05:21 +0200 -Subject: [PATCH 1/2] drm/tockchip: add function to check if endpoint is a - subdriver - -To be able to have both internal subdrivers and external bridge -drivers as output endpoints of vops, add a function to be able -to distinguish these. - -Signed-off-by: Heiko Stuebner <heiko@sntech.de> ---- - drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 27 +++++++++++++++++++++ - drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + - 2 files changed, 28 insertions(+) - -diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -index 1d9c4a9201c8..d18f7f85aa23 100644 ---- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c -@@ -24,6 +24,7 @@ - #include <linux/pm_runtime.h> - #include <linux/module.h> - #include <linux/of_graph.h> -+#include <linux/of_platform.h> - #include <linux/component.h> - #include <linux/console.h> - #include <linux/iommu.h> -@@ -267,6 +268,32 @@ static const struct dev_pm_ops rockchip_drm_pm_ops = { - static struct platform_driver *rockchip_sub_drivers[MAX_ROCKCHIP_SUB_DRIVERS]; - static int num_rockchip_sub_drivers; - -+/* -+ * check if a vop output-endpoint is a subdriver or bridge. -+ */ -+bool rockchip_drm_endpoint_is_subdriver(struct device_node *ep) -+{ -+ struct device_node *node = of_graph_get_remote_port_parent(ep); -+ struct platform_device *pdev; -+ int i; -+ -+ if (!node) -+ return false; -+ -+ pdev = of_find_device_by_node(node); -+ if (!pdev) -+ return false; -+ -+ for (i = 0; i < num_rockchip_sub_drivers; i++) { -+ struct device_driver *drv = pdev->dev.driver; -+ -+ if (rockchip_sub_drivers[i] == to_platform_driver(drv)) -+ return true; -+ } -+ -+ return false; -+} -+ - static int compare_dev(struct device *dev, void *data) - { - return dev == (struct device *)data; -diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h -index d67ad0a3cf36..305b4858c522 100644 ---- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h -+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h -@@ -64,6 +64,7 @@ void rockchip_drm_dma_detach_device(struct drm_device *drm_dev, - struct device *dev); - int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout); - -+bool rockchip_drm_endpoint_is_subdriver(struct device_node *ep); - extern struct platform_driver cdn_dp_driver; - extern struct platform_driver dw_hdmi_rockchip_pltfm_driver; - extern struct platform_driver dw_mipi_dsi_driver; --- -2.17.0 diff --git a/a/content_digest b/N1/content_digest index 1e81070..1e8c233 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,10 @@ "ref\01535443954-38806-1-git-send-email-hjc@rock-chips.com\0" "ref\01535443954-38806-3-git-send-email-hjc@rock-chips.com\0" - "From\0Heiko Stuebner <heiko@sntech.de>\0" - "Subject\0Re: [PATCH v5 2/2] drm/rockchip: Add support for Rockchip Soc RGB output interface\0" + "From\0heiko@sntech.de (Heiko Stuebner)\0" + "Subject\0[PATCH v5 2/2] drm/rockchip: Add support for Rockchip Soc RGB output interface\0" "Date\0Tue, 28 Aug 2018 10:31:25 +0200\0" - "To\0Sandy Huang <hjc@rock-chips.com>\0" - "Cc\0robh@kernel.org" - David Airlie <airlied@linux.ie> - linux-kernel@vger.kernel.org - dri-devel@lists.freedesktop.org - linux-arm-kernel@lists.infradead.org - " linux-rockchip@lists.infradead.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi Sandy,\n" "\n" @@ -22,7 +16,7 @@ "> Signed-off-by: Sandy Huang <hjc@rock-chips.com>\n" "> Reviewed-by: Sean Paul <seanpaul@chromium.org>\n" "> Reviewed-by: Mark Yao <mark.yao@rock-chips.com>\n" - "> Link: https://patchwork.freedesktop.org/patch/msgid/1509522851-128181-1-git-send-email-hjc@rock-chips.com\n" + "> Link: https://patchwork.freedesktop.org/patch/msgid/1509522851-128181-1-git-send-email-hjc at rock-chips.com\n" "\n" "This does not really address, Rob's concern about not being an actual\n" "hardware block related to the devicetree node you are using.\n" @@ -498,84 +492,13 @@ " \n" " static const struct vop_scl_extension rk3288_win_full_scl_ext = {\n" "-- \n" - 2.17.0 - "\01:2\0" - "fn\00001-drm-tockchip-add-function-to-check-if-endpoint-is-a-.patch\0" - "b\0" - "From c5a48c772f3564211dcd1ec71004de1d6dbb0307 Mon Sep 17 00:00:00 2001\n" - "From: Heiko Stuebner <heiko@sntech.de>\n" - "Date: Sat, 25 Aug 2018 19:05:21 +0200\n" - "Subject: [PATCH 1/2] drm/tockchip: add function to check if endpoint is a\n" - " subdriver\n" - "\n" - "To be able to have both internal subdrivers and external bridge\n" - "drivers as output endpoints of vops, add a function to be able\n" - "to distinguish these.\n" - "\n" - "Signed-off-by: Heiko Stuebner <heiko@sntech.de>\n" - "---\n" - " drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 27 +++++++++++++++++++++\n" - " drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 +\n" - " 2 files changed, 28 insertions(+)\n" - "\n" - "diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c\n" - "index 1d9c4a9201c8..d18f7f85aa23 100644\n" - "--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c\n" - "+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c\n" - "@@ -24,6 +24,7 @@\n" - " #include <linux/pm_runtime.h>\n" - " #include <linux/module.h>\n" - " #include <linux/of_graph.h>\n" - "+#include <linux/of_platform.h>\n" - " #include <linux/component.h>\n" - " #include <linux/console.h>\n" - " #include <linux/iommu.h>\n" - "@@ -267,6 +268,32 @@ static const struct dev_pm_ops rockchip_drm_pm_ops = {\n" - " static struct platform_driver *rockchip_sub_drivers[MAX_ROCKCHIP_SUB_DRIVERS];\n" - " static int num_rockchip_sub_drivers;\n" - " \n" - "+/*\n" - "+ * check if a vop output-endpoint is a subdriver or bridge.\n" - "+ */\n" - "+bool rockchip_drm_endpoint_is_subdriver(struct device_node *ep)\n" - "+{\n" - "+\tstruct device_node *node = of_graph_get_remote_port_parent(ep);\n" - "+\tstruct platform_device *pdev;\n" - "+\tint i;\n" - "+\n" - "+\tif (!node)\n" - "+\t\treturn false;\n" - "+\n" - "+\tpdev = of_find_device_by_node(node);\n" - "+\tif (!pdev)\n" - "+\t\treturn false;\n" - "+\n" - "+\tfor (i = 0; i < num_rockchip_sub_drivers; i++) {\n" - "+\t\tstruct device_driver *drv = pdev->dev.driver;\n" - "+\n" - "+\t\tif (rockchip_sub_drivers[i] == to_platform_driver(drv))\n" - "+\t\t\treturn true;\n" - "+\t}\n" - "+\n" - "+\treturn false;\n" - "+}\n" - "+\n" - " static int compare_dev(struct device *dev, void *data)\n" - " {\n" - " \treturn dev == (struct device *)data;\n" - "diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h\n" - "index d67ad0a3cf36..305b4858c522 100644\n" - "--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h\n" - "+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h\n" - "@@ -64,6 +64,7 @@ void rockchip_drm_dma_detach_device(struct drm_device *drm_dev,\n" - " \t\t\t\t struct device *dev);\n" - " int rockchip_drm_wait_vact_end(struct drm_crtc *crtc, unsigned int mstimeout);\n" - " \n" - "+bool rockchip_drm_endpoint_is_subdriver(struct device_node *ep);\n" - " extern struct platform_driver cdn_dp_driver;\n" - " extern struct platform_driver dw_hdmi_rockchip_pltfm_driver;\n" - " extern struct platform_driver dw_mipi_dsi_driver;\n" - "-- \n" - 2.17.0 + "2.17.0\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: 0001-drm-tockchip-add-function-to-check-if-endpoint-is-a-.patch\n" + "Type: text/x-patch\n" + "Size: 2584 bytes\n" + "Desc: not available\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180828/3ec9cb76/attachment.bin> -c77679f488ef4ccbcd67deb6a99624978248cf2b1db209fecddd192a476c9444 +6f7a8eaa148634d628bbef9076105c1d44efce972839db594351dc4d54306ffc
diff --git a/a/2.txt b/N2/2.txt index 061b200..c3b9086 100644 --- a/a/2.txt +++ b/N2/2.txt @@ -1,4 +1,4 @@ -From c5a48c772f3564211dcd1ec71004de1d6dbb0307 Mon Sep 17 00:00:00 2001 +>From c5a48c772f3564211dcd1ec71004de1d6dbb0307 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner <heiko@sntech.de> Date: Sat, 25 Aug 2018 19:05:21 +0200 Subject: [PATCH 1/2] drm/tockchip: add function to check if endpoint is a diff --git a/a/content_digest b/N2/content_digest index 1e81070..3c5f759 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -502,7 +502,7 @@ "\01:2\0" "fn\00001-drm-tockchip-add-function-to-check-if-endpoint-is-a-.patch\0" "b\0" - "From c5a48c772f3564211dcd1ec71004de1d6dbb0307 Mon Sep 17 00:00:00 2001\n" + ">From c5a48c772f3564211dcd1ec71004de1d6dbb0307 Mon Sep 17 00:00:00 2001\n" "From: Heiko Stuebner <heiko@sntech.de>\n" "Date: Sat, 25 Aug 2018 19:05:21 +0200\n" "Subject: [PATCH 1/2] drm/tockchip: add function to check if endpoint is a\n" @@ -578,4 +578,4 @@ "-- \n" 2.17.0 -c77679f488ef4ccbcd67deb6a99624978248cf2b1db209fecddd192a476c9444 +273d386625c8f90fbaedb43b1e2ba31193b69a8964beb51b8e193aa8a05e3bf4
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.