From: Thierry Reding <thierry.reding@gmail•com>
To: "Dave Airlie" <airlied@linux•ie>,
"Daniel Vetter" <daniel.vetter@ffwll•ch>,
intel-gfx@lists•freedesktop.org, dri-devel@lists•freedesktop.org,
"Ville Syrjälä" <ville.syrjala@linux•intel.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the drm tree
Date: Mon, 14 Oct 2013 16:48:04 +0200 [thread overview]
Message-ID: <1381762088-18880-4-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1381762088-18880-1-git-send-email-treding@nvidia.com>
Today's linux-next merge of the drm tree got conflicts in
drivers/gpu/drm/i915/intel_drv.h
caused by commits e1264eb (Revert "drm/i915: Delay disabling of VGA memory
until vgacon->fbcon handoff is done"), 20ddf66 (drm/i915: Make
intel_crtc_active() available outside intel_pm.c), 18442d0 (drm/i915: Fix
port_clock and adjusted_mode.clock readout all over), 6878da0 (drm/i915:
Add intel_dotclock_calculate()) and eb14cb7 (drm/i915: Add state readout
and checking for has_dp_encoder and dp_m_n).
I fixed them up (see below). Please verify that the resolution looks good.
Thanks,
Thierry
---
diff --cc drivers/gpu/drm/i915/intel_drv.h
index 9b7b68f,287bbef..39bfdb3
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -793,5 -817,14 +817,13 @@@ extern void hsw_pc8_disable_interrupts(
extern void hsw_pc8_restore_interrupts(struct drm_device *dev);
extern void intel_aux_display_runtime_get(struct drm_i915_private *dev_priv);
extern void intel_aux_display_runtime_put(struct drm_i915_private *dev_priv);
+ extern void intel_dp_get_m_n(struct intel_crtc *crtc,
+ struct intel_crtc_config *pipe_config);
+ extern int intel_dotclock_calculate(int link_freq,
+ const struct intel_link_m_n *m_n);
+ extern void ironlake_check_encoder_dotclock(const struct intel_crtc_config *pipe_config,
+ int dotclock);
+
+ extern bool intel_crtc_active(struct drm_crtc *crtc);
-extern void i915_disable_vga_mem(struct drm_device *dev);
#endif /* __INTEL_DRV_H__ */
next prev parent reply other threads:[~2013-10-14 14:48 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-14 14:48 linux-next: Tree for Oct 14 Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the block tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the drm-intel tree Thierry Reding
2013-10-14 14:48 ` Thierry Reding [this message]
2013-10-14 14:48 ` linux-next: manual merge of th imx-mxs tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the omap_dss2 tree Thierry Reding
2013-10-15 6:47 ` Tomi Valkeinen
2013-10-14 14:48 ` linux-next: manual merge of the pm tree Thierry Reding
2013-10-14 14:48 ` linux-next: manual merge of the spi tree Thierry Reding
2013-10-14 16:44 ` Mika Westerberg
2013-10-14 18:58 ` linux-next: Tree for Oct 14 (bcache) Randy Dunlap
2013-10-14 20:27 ` Mark Brown
[not found] ` <20131014202723.GQ2443-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2013-10-15 8:46 ` Thierry Reding
[not found] ` <20131015084631.GK7856-AwZRO8vwLAwmlAP/+Wk3EA@public.gmane.org>
2013-10-15 9:36 ` Mark Brown
[not found] ` <525C3EC2.20404-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>
2013-10-15 8:44 ` Thierry Reding
2013-10-14 19:36 ` [PATCH -next] netdev: inet_timewait_sock.h missing semi-colon when KMEMCHECK is enabled Randy Dunlap
2013-10-14 19:53 ` Joe Perches
2013-10-14 20:47 ` Randy Dunlap
2013-10-14 21:24 ` Joe Perches
2013-10-14 21:25 ` Joe Perches
2013-10-17 19:57 ` David Miller
2013-10-14 19:38 ` [PATCH -next] misc: fix various misc/mic/host/ build errors Randy Dunlap
2013-10-16 19:26 ` Greg Kroah-Hartman
2013-10-16 19:41 ` Randy Dunlap
2013-10-16 19:44 ` Greg Kroah-Hartman
2013-10-16 20:30 ` Thierry Reding
2013-10-16 20:37 ` Greg Kroah-Hartman
2013-10-17 14:02 ` Thierry Reding
2013-10-17 14:15 ` Greg Kroah-Hartman
2013-10-17 14:16 ` Mark Brown
2013-10-17 14:21 ` Thierry Reding
2013-10-17 14:49 ` Greg Kroah-Hartman
2013-10-16 20:47 ` Mark Brown
2013-10-14 19:39 ` [PATCH -next] staging/mt29f_spinand: fix build error when ONDIEECC not enabled Randy Dunlap
2013-10-14 20:51 ` linux-next: Tree for Oct 14 (ceph) Randy Dunlap
-- strict thread matches above, loose matches on Subject: below --
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the drm tree Thierry Reding
2008-10-17 5:56 Stephen Rothwell
2008-07-10 6:10 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=1381762088-18880-4-git-send-email-treding@nvidia.com \
--to=thierry.reding@gmail$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--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=ville.syrjala@linux$(echo .)intel.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