diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-09 21:57:03 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-09 21:57:26 +0300 |
| commit | eb610d680c7f53762307304045b5828d38cffc60 (patch) | |
| tree | 8803733bcd858fe2c222d163ce1cf587608ff88e /meta-xilinx/meta-xilinx-contrib | |
| parent | f0578c1dfb63be4c5366e537b33caf10e96b3aa9 (diff) | |
| download | openbmc-eb610d680c7f53762307304045b5828d38cffc60.tar.xz | |
meta-xilinx: subtree update:68eacd5636..391c7054e8
Alejandro Enedino Hernandez Samaniego (2):
qemu-xilinx: split recipes for native (system, usermode) and target
README.building: Update building instructions for multiconfig builds
Manjukumar Matha (2):
machine-xilinx-default.inc: Deploy u-boot.elf for Versal devices
meta-xilinx-contrib: Fix drm patch for v4.19 kernel
Change-Id: I1bc00353e9fb0ce4035ef42aa100ab2162093608
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-xilinx/meta-xilinx-contrib')
| -rw-r--r-- | meta-xilinx/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/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch index b8ba70ea2..660bc2182 100644 --- a/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch +++ b/meta-xilinx/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx/v2019.1/0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch @@ -1,4 +1,4 @@ -From c1bf9e8c50baa237b514715dcb9c8fd367694c93 Mon Sep 17 00:00:00 2001 +From 21cc8144efdaa3cd8dbd7279f87b14fa3432fae4 Mon Sep 17 00:00:00 2001 From: Jason Wu <jason.wu.misc@gmail.com> Date: Sun, 10 Apr 2016 13:14:13 +1000 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> diff --git a/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt new file mode 100644 -index 0000000000..242b24e482 +index 0000000..242b24e --- /dev/null +++ b/Documentation/devicetree/bindings/drm/xilinx/dglnt_encoder.txt @@ -0,0 +1,23 @@ @@ -49,21 +49,24 @@ index 0000000000..242b24e482 + dglnt,edid-i2c = <&i2c1>; + }; diff --git a/drivers/gpu/drm/xilinx/Kconfig b/drivers/gpu/drm/xilinx/Kconfig -index 12b548c2a9..c3e2562e53 100644 +index 57e18a9..d9ecff2 100644 --- a/drivers/gpu/drm/xilinx/Kconfig +++ b/drivers/gpu/drm/xilinx/Kconfig -@@ -57,3 +57,9 @@ config DRM_XILINX_SDI - depends on DRM_XILINX +@@ -33,6 +33,12 @@ config DRM_XILINX_DP_SUB help DRM driver for Xilinx Display Port Subsystem. -+ + +config DRM_DIGILENT_ENCODER + tristate "Digilent VGA/HDMI DRM Encoder Driver" + depends on DRM_XILINX + help + DRM slave encoder for Video-out on Digilent boards. ++ + config DRM_XILINX_DP_SUB_DEBUG_FS + bool "Xilinx DRM DPSUB debugfs" + depends on DEBUG_FS && DRM_XILINX_DP_SUB diff --git a/drivers/gpu/drm/xilinx/Makefile b/drivers/gpu/drm/xilinx/Makefile -index 19bc1541ca..c2717e40ea 100644 +index 19bc154..c2717e40 100644 --- a/drivers/gpu/drm/xilinx/Makefile +++ b/drivers/gpu/drm/xilinx/Makefile @@ -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 obj-$(CONFIG_DRM_XILINX_DP_SUB) += xilinx_drm_dp_sub.o diff --git a/drivers/gpu/drm/xilinx/dglnt_encoder.c b/drivers/gpu/drm/xilinx/dglnt_encoder.c new file mode 100644 -index 0000000000..26a23986f9 +index 0000000..cb9fc7d --- /dev/null +++ b/drivers/gpu/drm/xilinx/dglnt_encoder.c @@ -0,0 +1,217 @@ @@ -177,7 +180,7 @@ index 0000000000..26a23986f9 + + if (dglnt->i2c_present) { + edid = drm_get_edid(connector, dglnt->i2c_bus); -+ drm_mode_connector_update_edid_property(connector, edid); ++ drm_connector_update_edid_property(connector, edid); + if (edid) { + num_modes = drm_add_edid_modes(connector, edid); + kfree(edid); @@ -298,5 +301,5 @@ index 0000000000..26a23986f9 +MODULE_DESCRIPTION("DRM slave encoder for Video-out on Digilent boards"); +MODULE_LICENSE("GPL v2"); -- -2.14.2 +2.7.4 |