diff options
author | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2019-08-16 17:28:43 -0700 |
---|---|---|
committer | Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> | 2019-09-03 14:59:59 -0700 |
commit | 391c7054e88ae77abf18fe8a705ac7ff34c7dc79 (patch) | |
tree | b56d7856e53a4801e26a7e3c35d796779b227d0c | |
parent | af4c8e4d2be3f34965d597849a2b90658119065d (diff) | |
download | meta-xilinx-warrior.tar.gz |
meta-xilinx-contrib: Fix drm patch for v4.19 kernelwarrior
Fix drm patch for v4.19 kernel, seems like the api
drm_mode_connector_update_edid_property to
drm_connector_update_edid_property in v4.19
Update the patch to make sure there are no build errors
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r-- | meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch index b8ba70ea..660bc218 100644 --- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch +++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From c1bf9e8c50baa237b514715dcb9c8fd367694c93 Mon Sep 17 00:00:00 2001 | 1 | From 21cc8144efdaa3cd8dbd7279f87b14fa3432fae4 Mon Sep 17 00:00:00 2001 |
2 | From: Jason Wu <jason.wu.misc@gmail.com> | 2 | From: Jason Wu <jason.wu.misc@gmail.com> |
3 | Date: Sun, 10 Apr 2016 13:14:13 +1000 | 3 | Date: Sun, 10 Apr 2016 13:14:13 +1000 |
4 | Subject: [PATCH 1/3] drm: xilinx: Add encoder for Digilent boards | 4 | Subject: [PATCH 1/3] drm: xilinx: Add encoder for Digilent boards |
@@ -21,7 +21,7 @@ Signed-off-by: Jason Wu <jason.wu.misc@gmail.com> | |||
21 | 21 | ||
22 | diff --git a/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt | 22 | diff --git a/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt |
23 | new file mode 100644 | 23 | new file mode 100644 |
24 | index 0000000000..242b24e482 | 24 | index 0000000..242b24e |
25 | --- /dev/null | 25 | --- /dev/null |
26 | +++ b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt | 26 | +++ b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt |
27 | @@ -0,0 +1,23 @@ | 27 | @@ -0,0 +1,23 @@ |
@@ -49,21 +49,24 @@ index 0000000000..242b24e482 | |||
49 | + dglnt,edid-i2c = <&i2c1>; | 49 | + dglnt,edid-i2c = <&i2c1>; |
50 | + }; | 50 | + }; |
51 | diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig | 51 | diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig |
52 | index 12b548c2a9..c3e2562e53 100644 | 52 | index 57e18a9..d9ecff2 100644 |
53 | --- a/drivers/gpu/drm/xilinx/Kconfig | 53 | --- a/drivers/gpu/drm/xilinx/Kconfig |
54 | +++ b/drivers/gpu/drm/xilinx/Kconfig | 54 | +++ b/drivers/gpu/drm/xilinx/Kconfig |
55 | @@ -57,3 +57,9 @@ config DRM_XILINX_SDI | 55 | @@ -33,6 +33,12 @@ config DRM_XILINX_DP_SUB |
56 | depends on DRM_XILINX | ||
57 | help | 56 | help |
58 | DRM driver for Xilinx Display Port Subsystem. | 57 | DRM driver for Xilinx Display Port Subsystem. |
59 | + | 58 | |
60 | +config DRM_DIGILENT_ENCODER | 59 | +config DRM_DIGILENT_ENCODER |
61 | + tristate "Digilent VGA/HDMI DRM Encoder Driver" | 60 | + tristate "Digilent VGA/HDMI DRM Encoder Driver" |
62 | + depends on DRM_XILINX | 61 | + depends on DRM_XILINX |
63 | + help | 62 | + help |
64 | + DRM slave encoder for Video-out on Digilent boards. | 63 | + DRM slave encoder for Video-out on Digilent boards. |
64 | + | ||
65 | config DRM_XILINX_DP_SUB_DEBUG_FS | ||
66 | bool "Xilinx DRM DPSUB debugfs" | ||
67 | depends on DEBUG_FS && DRM_XILINX_DP_SUB | ||
65 | diff --git a/drivers/gpu/drm/xilinx/Makefile b/drivers/gpu/drm/xilinx/Makefile | 68 | diff --git a/drivers/gpu/drm/xilinx/Makefile b/drivers/gpu/drm/xilinx/Makefile |
66 | index 19bc1541ca..c2717e40ea 100644 | 69 | index 19bc154..c2717e40 100644 |
67 | --- a/drivers/gpu/drm/xilinx/Makefile | 70 | --- a/drivers/gpu/drm/xilinx/Makefile |
68 | +++ b/drivers/gpu/drm/xilinx/Makefile | 71 | +++ b/drivers/gpu/drm/xilinx/Makefile |
69 | @@ -7,6 +7,7 @@ xilinx_drm-y := xilinx_drm_crtc.o xilinx_drm_connector.o xilinx_drm_drv.o \ | 72 | @@ -7,6 +7,7 @@ xilinx_drm-y := xilinx_drm_crtc.o xilinx_drm_connector.o xilinx_drm_drv.o \ |
@@ -76,7 +79,7 @@ index 19bc1541ca..c2717e40ea 100644 | |||
76 | obj-$(CONFIG_DRM_XILINX_DP_SUB) += xilinx_drm_dp_sub.o | 79 | obj-$(CONFIG_DRM_XILINX_DP_SUB) += xilinx_drm_dp_sub.o |
77 | diff --git a/drivers/gpu/drm/xilinx/dglnt_encoder.c b/drivers/gpu/drm/xilinx/dglnt_encoder.c | 80 | diff --git a/drivers/gpu/drm/xilinx/dglnt_encoder.c b/drivers/gpu/drm/xilinx/dglnt_encoder.c |
78 | new file mode 100644 | 81 | new file mode 100644 |
79 | index 0000000000..26a23986f9 | 82 | index 0000000..cb9fc7d |
80 | --- /dev/null | 83 | --- /dev/null |
81 | +++ b/drivers/gpu/drm/xilinx/dglnt_encoder.c | 84 | +++ b/drivers/gpu/drm/xilinx/dglnt_encoder.c |
82 | @@ -0,0 +1,217 @@ | 85 | @@ -0,0 +1,217 @@ |
@@ -177,7 +180,7 @@ index 0000000000..26a23986f9 | |||
177 | + | 180 | + |
178 | + if (dglnt->i2c_present) { | 181 | + if (dglnt->i2c_present) { |
179 | + edid = drm_get_edid(connector, dglnt->i2c_bus); | 182 | + edid = drm_get_edid(connector, dglnt->i2c_bus); |
180 | + drm_mode_connector_update_edid_property(connector, edid); | 183 | + drm_connector_update_edid_property(connector, edid); |
181 | + if (edid) { | 184 | + if (edid) { |
182 | + num_modes = drm_add_edid_modes(connector, edid); | 185 | + num_modes = drm_add_edid_modes(connector, edid); |
183 | + kfree(edid); | 186 | + kfree(edid); |
@@ -298,5 +301,5 @@ index 0000000000..26a23986f9 | |||
298 | +MODULE_DESCRIPTION("DRM slave encoder for Video-out on Digilent boards"); | 301 | +MODULE_DESCRIPTION("DRM slave encoder for Video-out on Digilent boards"); |
299 | +MODULE_LICENSE("GPL v2"); | 302 | +MODULE_LICENSE("GPL v2"); |
300 | -- | 303 | -- |
301 | 2.14.2 | 304 | 2.7.4 |
302 | 305 | ||