From: Gustavo Padovan <gustavo@padovan.org>
To: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Cc: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>,
linux-samsung-soc@vger.kernel.org,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v5 09/12] drm/exynos: remove exported functions from exynos_drm_plane
Date: Thu, 21 May 2015 13:26:15 -0300 [thread overview]
Message-ID: <20150521162615.GA14089@joana> (raw)
In-Reply-To: <20150521153357.GB1641@joana>
2015-05-21 Gustavo Padovan <gustavo.padovan@collabora.co.uk>:
> 2015-05-21 Tobias Jakobi <tjakobi@math.uni-bielefeld.de>:
>
> > Hi,
> >
> > like I said before, this clashes with my commit 'drm/exynos: plane: honor
> > buffer offset for dma_addr' (5d878bdb51bd7915ba3def8b531238c67624aa58),
> > which is currently sitting in airlied's drm-fixes.
>
> Inki has to merge his -fixes tree into exynos-drm-next to solve this.
> It is the only way I can rebase on top of your commit and solve the
> conflict.
> Anyway, I just figured that exynos-drm-next was updated from yesterday
> to today so this v5 doesn't apply on today's tree. I'll send a v6 once
> Inki merges "drm/exynos: plane: honor buffer offset for dma_addr" into
> exynos-drm-next.
>
> Inki, can you please do that? so we can proceed with atomic and
> hopefully have it ready for 4.2 merge window.
Actually the patch is on exynos-drm-next but with a different commit id.
I wonder why. Why did you applied it directly to your branch instead of
merging the -fixes tree? Now we have the same commit with the differents
hashes in the tree.
Gustavo
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-05-21 16:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-21 15:02 [PATCH v5 00/12] drm/exynos: atomic modesetting support Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 01/12] drm/exynos: atomic phase 1: use drm_plane_helper_update() Gustavo Padovan
2015-05-21 15:02 ` [PATCH] drm/exynos: use drm_atomic_state directly Gustavo Padovan
2015-05-21 15:22 ` Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 02/12] drm/exynos: atomic phase 1: use drm_plane_helper_disable() Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 03/12] drm/exynos: atomic phase 1: add .mode_set_nofb() callback Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 04/12] drm/exynos: atomic phase 2: wire up state reset(), duplicate() and destroy() Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 05/12] drm/exynos: atomic phase 2: keep track of framebuffer pointer Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 06/12] drm/exynos: atomic phase 3: atomic updates of planes Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 07/12] drm/exynos: atomic phase 3: use atomic .set_config helper Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 08/12] drm/exynos: atomic phase 3: convert page flips Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 09/12] drm/exynos: remove exported functions from exynos_drm_plane Gustavo Padovan
2015-05-21 15:09 ` Tobias Jakobi
2015-05-21 15:33 ` Gustavo Padovan
2015-05-21 16:26 ` Gustavo Padovan [this message]
2015-05-21 17:52 ` Tobias Jakobi
2015-05-21 18:10 ` Gustavo Padovan
2015-05-21 18:12 ` Tobias Jakobi
2015-05-21 15:02 ` [PATCH v5 10/12] drm/exynos: don't disable unused functions at init Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 11/12] drm/exynos: atomic dpms support Gustavo Padovan
2015-05-21 15:02 ` [PATCH v5 12/12] drm/exynos: remove unnecessary calls to disable_plane() Gustavo Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150521162615.GA14089@joana \
--to=gustavo@padovan.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gustavo.padovan@collabora.co.uk \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=tjakobi@math.uni-bielefeld.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox