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>,
	<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:09:08 +1100	[thread overview]
Message-ID: <20140122140908.c57e7336c70156e30eda2a18@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit c326c0a9c98c
("drm/i915: Call drm_calc_timestamping_constants() earlier") from the drm
tree and commit bbee18af2a25 ("drm/i915: Prepare to track new pipe config
per pipe") from the drm-intel 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/intel_display.c
index 14b024becb91,e1d3ae1212a7..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -9660,14 -9705,7 +9703,15 @@@ static int __intel_set_mode(struct drm_
  		/* mode_set/enable/disable functions rely on a correct pipe
  		 * config. */
  		to_intel_crtc(crtc)->config = *pipe_config;
+ 		to_intel_crtc(crtc)->new_config = &to_intel_crtc(crtc)->config;
 +
 +		/*
 +		 * Calculate and store various constants which
 +		 * are later needed by vblank and swap-completion
 +		 * timestamping. They are derived from true hwmode.
 +		 */
 +		drm_calc_timestamping_constants(crtc,
 +						&pipe_config->adjusted_mode);
  	}
  
  	/* Only after disabling all output pipelines that will be changed can we

[-- 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>,
	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:09:08 +1100	[thread overview]
Message-ID: <20140122140908.c57e7336c70156e30eda2a18@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit c326c0a9c98c
("drm/i915: Call drm_calc_timestamping_constants() earlier") from the drm
tree and commit bbee18af2a25 ("drm/i915: Prepare to track new pipe config
per pipe") from the drm-intel 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/intel_display.c
index 14b024becb91,e1d3ae1212a7..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -9660,14 -9705,7 +9703,15 @@@ static int __intel_set_mode(struct drm_
  		/* mode_set/enable/disable functions rely on a correct pipe
  		 * config. */
  		to_intel_crtc(crtc)->config = *pipe_config;
+ 		to_intel_crtc(crtc)->new_config = &to_intel_crtc(crtc)->config;
 +
 +		/*
 +		 * Calculate and store various constants which
 +		 * are later needed by vblank and swap-completion
 +		 * timestamping. They are derived from true hwmode.
 +		 */
 +		drm_calc_timestamping_constants(crtc,
 +						&pipe_config->adjusted_mode);
  	}
  
  	/* Only after disabling all output pipelines that will be changed can we

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

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

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-22  3:09 Stephen Rothwell [this message]
2014-01-22  3:09 ` linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
  -- 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:04 Stephen Rothwell
2014-01-22  3:04 ` 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
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=20140122140908.c57e7336c70156e30eda2a18@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --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.