From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Maxime Ripard <maxime.ripard@free-electrons•com>,
Daniel Vetter <daniel.vetter@ffwll•ch>,
Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>
Cc: Chen-Yu Tsai <wens@csie•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Shawn Guo <shawn.guo@linaro•org>
Subject: linux-next: manual merge of the sunxi tree with the drm-misc tree
Date: Tue, 7 Mar 2017 10:59:06 +1100 [thread overview]
Message-ID: <20170307105906.214e7bec@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the sunxi tree got a conflict in:
drivers/gpu/drm/sun4i/sun4i_drv.c
between commit:
50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs")
from the drm-misc tree and commit:
1c313a69e3ea ("drm/sun4i: Move layers from sun4i_drv to sun4i_crtc")
from the sunxi tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/sun4i/sun4i_drv.c
index 9ccf7c4deb6d,1ec5b825aa64..000000000000
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@@ -20,10 -21,31 +21,8 @@@
#include <drm/drm_fb_helper.h>
#include <drm/drm_of.h>
- #include "sun4i_crtc.h"
#include "sun4i_drv.h"
#include "sun4i_framebuffer.h"
- #include "sun4i_layer.h"
-#include "sun4i_tcon.h"
-
-static int sun4i_drv_enable_vblank(struct drm_device *drm, unsigned int pipe)
-{
- struct sun4i_drv *drv = drm->dev_private;
- struct sun4i_tcon *tcon = drv->tcon;
-
- DRM_DEBUG_DRIVER("Enabling VBLANK on pipe %d\n", pipe);
-
- sun4i_tcon_enable_vblank(tcon, true);
-
- return 0;
-}
-
-static void sun4i_drv_disable_vblank(struct drm_device *drm, unsigned int pipe)
-{
- struct sun4i_drv *drv = drm->dev_private;
- struct sun4i_tcon *tcon = drv->tcon;
-
- DRM_DEBUG_DRIVER("Disabling VBLANK on pipe %d\n", pipe);
-
- sun4i_tcon_enable_vblank(tcon, false);
-}
static const struct file_operations sun4i_drv_fops = {
.owner = THIS_MODULE,
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists•freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2017-03-06 23:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-06 23:59 Stephen Rothwell [this message]
2017-03-07 3:05 ` linux-next: manual merge of the sunxi tree with the drm-misc tree Chen-Yu Tsai
-- strict thread matches above, loose matches on Subject: below --
2016-06-23 2:59 Stephen Rothwell
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=20170307105906.214e7bec@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@free-electrons$(echo .)com \
--cc=shawn.guo@linaro$(echo .)org \
--cc=wens@csie$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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