Re: [PATCH] linux-ti-staging: add lost patch for ti2016.04-rc4

[Denys Dmytriyenko <denys@ti.com>]

NAK, will have to move the tag...


On Fri, Oct 07, 2016 at 06:16:08PM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
> 
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
>  .../fbdev-drm-omap-revert.patch                    | 52 ++++++++++++++++++++++
>  recipes-kernel/linux/linux-ti-staging_4.4.bb       |  4 +-
>  2 files changed, 55 insertions(+), 1 deletion(-)
>  create mode 100644 recipes-kernel/linux/linux-ti-staging-4.4/fbdev-drm-omap-revert.patch
> 
> diff --git a/recipes-kernel/linux/linux-ti-staging-4.4/fbdev-drm-omap-revert.patch b/recipes-kernel/linux/linux-ti-staging-4.4/fbdev-drm-omap-revert.patch
> new file mode 100644
> index 0000000..692228f
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-ti-staging-4.4/fbdev-drm-omap-revert.patch
> @@ -0,0 +1,52 @@
> +From patchwork Tue Oct  4 10:38:52 2016
> +Content-Type: text/plain; charset="utf-8"
> +MIME-Version: 1.0
> +Content-Transfer-Encoding: 7bit
> +Subject: [tiL4.4-AD] Revert "drm/omap: Create fbdev emulation only for the
> + first DRM connector"
> +Date: Tue, 04 Oct 2016 16:38:52 -0000
> +From: Peter Ujfalusi <peter.ujfalusi@ti.com>
> +X-Patchwork-Id: 26457
> +Message-Id: <20161004103852.22175-1-peter.ujfalusi@ti.com>
> +To: <tomi.valkeinen@ti.com>, <jsarha@ti.com>
> +Cc: <linux-patch-review@list.ti.com>
> +
> +This reverts commit 28847e82286dd1a95a2a48f63feb939f5c91d650.
> +
> +User space applications needs to be fixed to be able to handle this change,
> +which can take some time.
> +
> +Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> +
> +---
> +Hi,
> +
> +As per LCPD-8237:
> +
> +this revert needs to hit 2016.04 as user space is broken by the commit and they
> +need to be fixed.
> +
> +Regards,
> +Peter
> +
> + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +---
> + 1 file changed, 1 insertion(+), 3 deletions(-)
> +
> +--
> +2.10.0
> +
> +diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c b/drivers/gpu/drm/omapdrm/omap_fbdev.c
> +index 6c8c21c55cc2..9e62444235a2 100644
> +--- a/drivers/gpu/drm/omapdrm/omap_fbdev.c
> ++++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c
> +@@ -280,9 +280,7 @@ struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev)
> + 		goto fail;
> + 	}
> +
> +-	drm_modeset_lock_all(dev);
> +-	ret = drm_fb_helper_add_one_connector(helper, priv->connectors[0]);
> +-	drm_modeset_unlock_all(dev);
> ++	ret = drm_fb_helper_single_add_all_connectors(helper);
> + 	if (ret)
> + 		goto fini;
> +
> diff --git a/recipes-kernel/linux/linux-ti-staging_4.4.bb b/recipes-kernel/linux/linux-ti-staging_4.4.bb
> index c3fe9bb..b23f292 100644
> --- a/recipes-kernel/linux/linux-ti-staging_4.4.bb
> +++ b/recipes-kernel/linux/linux-ti-staging_4.4.bb
> @@ -80,10 +80,12 @@ SRCREV = "aa23871a2a5a5f4aea6f9dff394c137ab4cab2a4"
>  PV = "4.4.23+git${SRCPV}"
>  
>  # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
> -MACHINE_KERNEL_PR_append = "d"
> +MACHINE_KERNEL_PR_append = "e"
>  PR = "${MACHINE_KERNEL_PR}"
>  
>  KERNEL_GIT_URI = "git://git.ti.com/ti-linux-kernel/ti-linux-kernel.git"
>  KERNEL_GIT_PROTOCOL = "git"
>  SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
>              file://defconfig"
> +
> +SRC_URI += "file://fbdev-drm-omap-revert.patch"
> -- 
> 2.7.4
>