From 1f575df04f003c1e1fe9413f95023c20a2f30e19 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 23 Oct 2015 16:18:29 -0400 Subject: linux-yocto/4.1: drm/i915: Fix the VBT child device parsing for BSW MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updating the 4.1 SRCREVs to integrate the following fix: [ drm/i915: Fix the VBT child device parsing for BSW Recent BSW VBT has a VBT child device size 37 bytes instead of the 33 bytes our code assumes. This means we fail to parse the VBT and thus fail to detect eDP ports properly and just register them as DP ports instead. Fix it up by using the reported child device size from the VBT instead of assuming it matches out struct defintions. The latest spec I have shows that the child device size should be 36 bytes for rev >= 195, however on my BSW the size is actually 37 bytes. And our current struct definition is 33 bytes. Feels like the entire VBT parses would need to be rewritten to handle changes in the layout better, but for now I've decided to do just the bare minimum to get my eDP port back. Cc: Vijay Purushothaman Signed-off-by: Ville Syrjälä Reviewed-by: Damien Lespiau Signed-off-by: Daniel Vetter (cherry picked from commit 90e4f1592bb6e82f6690f0e05a8aadcf04d7bce7) Signed-off-by: abdul arif abdul muttalib Signed-off-by: Tan Jui Nee Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_4.1.bb | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index fe3eab5a55..ce20eb2e46 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb @@ -2,7 +2,7 @@ KBRANCH ?= "standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "8acaa791408f146069473a96e3d98bed8be86244" +SRCREV_machine ?= "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e" SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index da12edb106..13a940db37 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb @@ -9,7 +9,7 @@ LINUX_VERSION ?= "4.1.8" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" +SRCREV_machine ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index 44c34ece83..84352d95cc 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb @@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "187e28708b478b5d01a7df9e6410a340347e4819" -SRCREV_machine_qemuarm64 ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" -SRCREV_machine_qemumips ?= "dd6b1f0940dbffd5e0feef2beecbc89a25da8e8f" -SRCREV_machine_qemuppc ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" -SRCREV_machine_qemux86 ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" -SRCREV_machine_qemux86-64 ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" -SRCREV_machine_qemumips64 ?= "8458e792e2c595f48bc5b2924e20e844f2a96522" -SRCREV_machine ?= "52a4a9f4a2b408ef3a0745372e44cc362832d86d" +SRCREV_machine_qemuarm ?= "bc11ecf659e30c8687604e086450ae1ff90c0169" +SRCREV_machine_qemuarm64 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" +SRCREV_machine_qemumips ?= "181e2c553ffaae19d08a6730e98d288c7e337d39" +SRCREV_machine_qemuppc ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" +SRCREV_machine_qemux86 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" +SRCREV_machine_qemux86-64 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" +SRCREV_machine_qemumips64 ?= "2684711a16ed21f114d834742f860cee532f7438" +SRCREV_machine ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" SRCREV_meta ?= "d8bbf59771fb915fa71debc8591bf6c69d8fa49c" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ -- cgit 1.2.3-korg