From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll•ch>,
intel-gfx@lists•freedesktop.org, dri-devel@lists•freedesktop.org
Cc: Thierry Reding <treding@nvidia•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree
Date: Thu, 15 Oct 2015 13:04:58 +1100 [thread overview]
Message-ID: <20151015130458.030a2c01@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/i915/i915_irq.c
between commit:
fd8f507c0de9 ("drm/i915: s/PIPE_FRMCOUNT_GM45/PIPE_FRMCOUNT_G4X/ etc.")
from the drm-intel tree and commit:
88e72717c2de ("drm/irq: Use unsigned int pipe in public API")
from the drm-misc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/gpu/drm/i915/i915_irq.c
index e24378ee7eda,bc732eb52b50..000000000000
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@@ -710,11 -611,12 +710,11 @@@ static u32 i915_get_vblank_counter(stru
return (((high1 << 8) | low) + (pixel >= vbl_start)) & 0xffffff;
}
- static u32 g4x_get_vblank_counter(struct drm_device *dev, int pipe)
-static u32 gm45_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
++static u32 g4x_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
{
struct drm_i915_private *dev_priv = dev->dev_private;
- int reg = PIPE_FRMCOUNT_GM45(pipe);
- return I915_READ(reg);
+ return I915_READ(PIPE_FRMCOUNT_G4X(pipe));
}
/* raw reads, only for fast reads of display block, no need for forcewake etc. */
_______________________________________________
dri-devel mailing list
dri-devel@lists•freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2015-10-15 2:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 2:04 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 3:34 linux-next: manual merge of the drm-misc tree with the drm-intel tree Stephen Rothwell
2020-04-15 1:52 Stephen Rothwell
2019-08-20 2:19 Stephen Rothwell
2019-05-22 23:58 Stephen Rothwell
2019-05-22 23:53 Stephen Rothwell
2019-03-19 0:51 Stephen Rothwell
2019-01-16 1:27 Stephen Rothwell
2017-07-20 1:23 Stephen Rothwell
2017-07-21 0:11 ` Stephen Rothwell
2017-05-23 2:00 Stephen Rothwell
2017-05-25 1:53 ` Stephen Rothwell
2017-03-06 23:48 Stephen Rothwell
2017-01-03 2:14 Stephen Rothwell
2017-01-03 2:08 Stephen Rothwell
2017-01-03 1:59 Stephen Rothwell
2017-01-03 1:50 Stephen Rothwell
2016-10-23 23:59 Stephen Rothwell
2016-05-03 3:24 Stephen Rothwell
2016-05-03 7:54 ` Daniel Vetter
2016-04-27 2:32 Stephen Rothwell
2015-12-14 1:06 Stephen Rothwell
2015-09-29 1:26 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=20151015130458.030a2c01@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=treding@nvidia$(echo .)com \
/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