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>, Dave Airlie <airlied@linux.ie>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Matt Roper <matthew.d.roper@intel.com>,
Rob Clark <robdclark@gmail.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Thu, 3 Apr 2014 12:00:26 +1100 [thread overview]
Message-ID: <20140403120026.481c9a08f440b72ffaf19fa6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1256 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 f4510a2752b7 ("drm:
Replace crtc fb with primary plane fb (v3)") from the drm tree and commit
262ca2b08fbd ("drm/i915: Rename similar plane functions to avoid
confusion") 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 3ffe5a6124f1,c31c6203c7ca..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -2291,9 -2398,11 +2398,11 @@@ void intel_display_handle_reset(struct
* disabling them without disabling the entire crtc) allow again
* a NULL crtc->fb.
*/
- if (intel_crtc->active && crtc->fb)
+ if (intel_crtc->active && crtc->primary->fb)
- dev_priv->display.update_plane(crtc, crtc->primary->fb,
- crtc->x, crtc->y);
+ dev_priv->display.update_primary_plane(crtc,
- crtc->fb,
++ crtc->primary->fb,
+ crtc->x,
+ crtc->y);
mutex_unlock(&crtc->mutex);
}
}
[-- 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,
Dave Airlie <airlied@linux.ie>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Matt Roper <matthew.d.roper@intel.com>,
Rob Clark <robdclark@gmail.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Thu, 3 Apr 2014 12:00:26 +1100 [thread overview]
Message-ID: <20140403120026.481c9a08f440b72ffaf19fa6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1256 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 f4510a2752b7 ("drm:
Replace crtc fb with primary plane fb (v3)") from the drm tree and commit
262ca2b08fbd ("drm/i915: Rename similar plane functions to avoid
confusion") 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 3ffe5a6124f1,c31c6203c7ca..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -2291,9 -2398,11 +2398,11 @@@ void intel_display_handle_reset(struct
* disabling them without disabling the entire crtc) allow again
* a NULL crtc->fb.
*/
- if (intel_crtc->active && crtc->fb)
+ if (intel_crtc->active && crtc->primary->fb)
- dev_priv->display.update_plane(crtc, crtc->primary->fb,
- crtc->x, crtc->y);
+ dev_priv->display.update_primary_plane(crtc,
- crtc->fb,
++ crtc->primary->fb,
+ crtc->x,
+ crtc->y);
mutex_unlock(&crtc->mutex);
}
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-04-03 1:00 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-03 1:00 Stephen Rothwell [this message]
2014-04-03 1:00 ` 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-01-22 3:09 Stephen Rothwell
2014-01-22 3:09 ` 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=20140403120026.481c9a08f440b72ffaf19fa6@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=matthew.d.roper@intel.com \
--cc=robdclark@gmail.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.