All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Dave Airlie <airlied@linux.ie>, <intel-gfx@lists.freedesktop.org>,
	<dri-devel@lists.freedesktop.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"\"Ville Syrjälä\"" <ville.syrjala@linux.intel.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Wed, 22 Jan 2014 14:04:02 +1100	[thread overview]
Message-ID: <20140122140402.20163da276690810a1040909@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1954 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass
'flags' from the caller to .get_scanout_position()") from the drm tree
and commit d59a63ad8234 ("drm/i915: Add intel_get_crtc_scanline()") from
the drm-intel tree.

I fixed it up (I think - 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 17d8fcb1b6f7,ffb56a9db9cc..000000000000
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@@ -649,8 -675,9 +649,9 @@@ static bool ilk_pipe_in_vblank_locked(s
  }
  
  static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,
 -				    int *vpos, int *hpos,
 +				    unsigned int flags, int *vpos, int *hpos,
- 				    ktime_t *stime, ktime_t *etime)
+ 				    ktime_t *stime, ktime_t *etime,
+ 				    bool adjust)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
@@@ -788,6 -786,24 +791,24 @@@
  	return ret;
  }
  
+ static int i915_get_scanout_position(struct drm_device *dev, int pipe,
+ 				     int *vpos, int *hpos,
+ 				     ktime_t *stime, ktime_t *etime)
+ {
 -	return i915_get_crtc_scanoutpos(dev, pipe, vpos, hpos,
++	return i915_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
+ 					stime, etime, true);
+ }
+ 
+ int intel_get_crtc_scanline(struct drm_crtc *crtc)
+ {
+ 	int vpos = 0, hpos = 0;
+ 
 -	i915_get_crtc_scanoutpos(crtc->dev, to_intel_crtc(crtc)->pipe,
++	i915_get_crtc_scanoutpos(crtc->dev, to_intel_crtc(crtc)->pipe, 0,
+ 				 &vpos, &hpos, NULL, NULL, false);
+ 
+ 	return vpos;
+ }
+ 
  static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe,
  			      int *max_error,
  			      struct timeval *vblank_time,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Dave Airlie <airlied@linux.ie>,
	intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	"\"Ville Syrjälä\"" <ville.syrjala@linux.intel.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Wed, 22 Jan 2014 14:04:02 +1100	[thread overview]
Message-ID: <20140122140402.20163da276690810a1040909@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1954 bytes --]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/i915_irq.c between commit abca9e454498 ("drm: Pass
'flags' from the caller to .get_scanout_position()") from the drm tree
and commit d59a63ad8234 ("drm/i915: Add intel_get_crtc_scanline()") from
the drm-intel tree.

I fixed it up (I think - 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 17d8fcb1b6f7,ffb56a9db9cc..000000000000
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@@ -649,8 -675,9 +649,9 @@@ static bool ilk_pipe_in_vblank_locked(s
  }
  
  static int i915_get_crtc_scanoutpos(struct drm_device *dev, int pipe,
 -				    int *vpos, int *hpos,
 +				    unsigned int flags, int *vpos, int *hpos,
- 				    ktime_t *stime, ktime_t *etime)
+ 				    ktime_t *stime, ktime_t *etime,
+ 				    bool adjust)
  {
  	struct drm_i915_private *dev_priv = dev->dev_private;
  	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
@@@ -788,6 -786,24 +791,24 @@@
  	return ret;
  }
  
+ static int i915_get_scanout_position(struct drm_device *dev, int pipe,
+ 				     int *vpos, int *hpos,
+ 				     ktime_t *stime, ktime_t *etime)
+ {
 -	return i915_get_crtc_scanoutpos(dev, pipe, vpos, hpos,
++	return i915_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
+ 					stime, etime, true);
+ }
+ 
+ int intel_get_crtc_scanline(struct drm_crtc *crtc)
+ {
+ 	int vpos = 0, hpos = 0;
+ 
 -	i915_get_crtc_scanoutpos(crtc->dev, to_intel_crtc(crtc)->pipe,
++	i915_get_crtc_scanoutpos(crtc->dev, to_intel_crtc(crtc)->pipe, 0,
+ 				 &vpos, &hpos, NULL, NULL, false);
+ 
+ 	return vpos;
+ }
+ 
  static int i915_get_vblank_timestamp(struct drm_device *dev, int pipe,
  			      int *max_error,
  			      struct timeval *vblank_time,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2014-01-22  3:04 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-22  3:04 Stephen Rothwell [this message]
2014-01-22  3:04 ` linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
2014-01-22 10:06 ` Daniel Vetter
2014-01-23  1:21   ` Olof Johansson
2014-01-23  1:21     ` Olof Johansson
2014-01-23 21:10     ` Olof Johansson
2014-01-23 21:10       ` Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2023-10-03  0:09 Stephen Rothwell
2023-10-03  0:09 ` Stephen Rothwell
2023-10-05 14:41 ` Jani Nikula
2023-05-30  1:59 Stephen Rothwell
2023-05-30  1:59 ` Stephen Rothwell
2023-05-30  1:57 Stephen Rothwell
2023-05-30  1:57 ` Stephen Rothwell
2023-05-30  2:10 ` Stephen Rothwell
2023-05-30  2:10   ` Stephen Rothwell
2023-01-24 23:42 Stephen Rothwell
2023-01-24 23:42 ` Stephen Rothwell
2022-09-13  2:19 Stephen Rothwell
2022-09-13  2:19 ` Stephen Rothwell
2022-09-12  1:46 Stephen Rothwell
2022-09-12  1:46 ` Stephen Rothwell
2022-02-11  2:06 Stephen Rothwell
2022-02-11  2:06 ` Stephen Rothwell
2022-02-09  0:55 Stephen Rothwell
2022-02-09  0:55 ` Stephen Rothwell
2021-08-12  1:28 Stephen Rothwell
2021-04-01  2:13 Stephen Rothwell
2021-04-01  2:13 ` Stephen Rothwell
2021-03-17  3:08 Stephen Rothwell
2021-03-17  3:08 ` Stephen Rothwell
2021-03-18  1:52 ` Stephen Rothwell
2021-03-18  1:52   ` Stephen Rothwell
2021-04-29 22:23   ` Stephen Rothwell
2021-04-29 22:23     ` Stephen Rothwell
2021-05-14  1:53     ` Stephen Rothwell
2021-05-14  1:53       ` Stephen Rothwell
2021-05-14 12:14       ` Thomas Zimmermann
2021-01-25  0:46 Stephen Rothwell
2021-01-25  0:46 ` Stephen Rothwell
2020-07-14  2:59 Stephen Rothwell
2020-07-14  2:59 ` Stephen Rothwell
2019-08-22  3:15 Stephen Rothwell
2019-02-06  0:42 Stephen Rothwell
2019-01-17  1:59 Stephen Rothwell
2019-01-17  1:59 ` Stephen Rothwell
2017-05-19  2:04 Stephen Rothwell
2016-09-07  3:59 Stephen Rothwell
2014-07-23  3:18 Stephen Rothwell
2014-07-23  3:18 ` Stephen Rothwell
2014-07-23  3:06 Stephen Rothwell
2014-07-23  3:06 ` Stephen Rothwell
2014-07-23  5:09 ` Daniel Vetter
2014-07-23  5:09   ` Daniel Vetter
2014-04-03  1:00 Stephen Rothwell
2014-04-03  1:00 ` Stephen Rothwell
2014-01-22  3:09 Stephen Rothwell
2014-01-22  3:09 ` Stephen Rothwell
2013-11-07  2:37 Stephen Rothwell
2013-11-07  2:37 ` Stephen Rothwell
2013-08-29  4:09 Stephen Rothwell
2013-08-29  4:09 ` Stephen Rothwell
2013-06-18  3:04 Stephen Rothwell
2013-06-18  3:04 ` Stephen Rothwell
2013-05-01  4:37 Stephen Rothwell
2013-05-01  8:08 ` Daniel Vetter

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=20140122140402.20163da276690810a1040909@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ville.syrjala@linux.intel.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.