Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/display/drm_dp_helper.c
between commit:
d34d6feaf4a7 ("drm/dp: Change AUX DPCD probe address from LANE0_1_STATUS to
TRAINING_PATTERN_SET")
from the drm-intel-fixes tree and commit:
b87ed522b364 ("drm/dp
Hi all,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/i915/display/intel_dp_mst.c
drivers/gpu/drm/i915/display/intel_dp_mst.h
between commit:
a2ccc33b88e2 ("drm/i915/dp_mst: Fix MST state after a sink reset")
from the drm-intel-fixes tree and commit:
e44bc
Hi all,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/xe/xe_gt_idle.c
drivers/gpu/drm/xe/xe_guc_pc.c
between commits:
2470b141bfae2 ("drm/xe: move disable_c6 call")
7c877115da419 ("drm/xe/xe_gt_idle: use GT forcewake domain assertion")
from the drm-intel-fi
Quoting Stephen Rothwell (2024-03-07 04:10:27)
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/display/intel_dp.c
>
> between commit:
>
> 984318aaf7b6 ("drm/i915/panelreplay: Move out psr_init_dpcd() from
> init_connector()")
>
> from the
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp.c
between commit:
984318aaf7b6 ("drm/i915/panelreplay: Move out psr_init_dpcd() from
init_connector()")
from the drm-intel-fixes tree and commit:
e60cff453b82 ("drm/i915/dp: Enable
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp_aux.c
between commit:
e1c71f8f91804 ("drm/i915: Fix fast wake AUX sync len")
from the drm-intel-fixes tree and commit:
605f7c7313334 ("drm/i915: Fix fast wake AUX sync len")
from t
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_reg.h
between commit:
54395a33718a ("drm/i915/dmc: Add MMIO range restrictions")
from the drm-intel-fixes tree and commit:
9c67d9e84c7d ("drm/i915/dmc: split out dmc registers to a separate fil
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/display/intel_snps_phy.c
between commit:
28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error")
from the drm-intel-fixes tree and commits:
c5274e86da5fe ("drm/i915/snps: conver
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/display/intel_snps_phy.c
between commit:
28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error")
from the drm-intel-fixes tree and commit:
c5274e86da5fe ("drm/i915/snps: convert
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/gem/i915_gem_domain.c
between commit:
47bf7b7a7151 ("drm/i915/gem: Remove object_is_locked assertion from
unpin_from_display_plane")
from the drm-intel-fixes tree and commit:
9da0ea09639f ("drm/i91
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/display/intel_fbc.c
between commit:
82152d424b6c ("Make the "Reducing compressed framebufer size" message be
DRM_INFO_ONCE()")
from the drm-intel-fixes tree and commit:
97ed48b5c8b1 ("drm/i915/fbc:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_gtt.c
between commit:
ecc4d2a52df6 ("drm/i915/userptr: fix size calculation")
from the drm-intel-fixes tree and commit:
2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")
from the drm tr
Hi all,
On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell
wrote:
>
> -hw_flags = 0;
> +/* For resource streamer on HSW+ and power context elsewhere */
> +BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
> +BUILD_BUG_ON(HSW_MI_RS_
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/display/intel_display.c
between commit:
2b2c4a83d69d ("drm/i915/dp: Disable Port sync mode correctly on teardown")
from the drm-intel-fixes tree and commit:
773b4b54351c ("drm/i915: Move stuff from
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_drv.h
between commit:
ce69e553b9a4 ("drm/i915/gt: Restore coarse power gating")
from the drm-intel-fixes tree and commit:
90eb7d2aa3ce ("drm/i915: Simplify NEEDS_WaRsDisableCoarsePowerGating")
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/gt/intel_ring_submission.c
between commit:
103309977589 ("drm/i915/gt: Do not restore invalid RS state")
from the drm-intel-fixes tree and commit:
3cd6e8860ecd ("drm/i915/gen7: Re-enable full-ppgtt
Hi all,
This is now a conflict between the drm tree and Linus' tree.
On Thu, 31 Oct 2019 11:33:15 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_drv.h
>
> between commit:
>
> 59cd826fb5e7 ("drm/i915: Fix PCH ref
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_drv.h
between commit:
59cd826fb5e7 ("drm/i915: Fix PCH reference clock for FDI on HSW/BDW")
from the drm-intel-fixes tree and commit:
7d423af9bfb1 ("drm/i915: Implement a better i945gm vblank i
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_cdclk.c
between commit:
30414f3010af ("drm/i915: Apply Display WA #1183 on skl, kbl, and cfl")
from the drm-intel-fixes tree and commit:
2aa97491da8a ("drm/i915: Use cdclk_state->voltage on SK
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_pm.c
between commit:
9cc5bb18bd0a ("drm/i915: Fix bad comparison in skl_compute_plane_wm")
from the drm-intel-fixes tree and commit:
eac2cb81fb87 ("drm/i915: cleanup fixed-point wrappers namin
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_pm.c
between commit:
1c2d6bbf0433 ("drm/i915: Fix SKL+ watermarks for 90/270 rotation")
from the drm-intel-fixes tree and commit:
7084b50bdd8f ("drm/i915/skl+: calculate pixel_rate & relative
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_display.c
between commit:
9a775e0308b5 ("drm/i915: Fix scaling check for 90/270 degree plane rotation")
from the drm-intel-fixes tree and commit:
c2c446ad2943 ("drm: Add DRM_MODE_ROTATE_ and
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_engine_cs.c
between commit:
ef6c4d75e353 ("drm/i915: fix warning for unused variable")
from the drm-intel-fixes tree and commit:
a8e9a419c337 ("drm/i915: Lie and treat all engines as idle if
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_drv.h
between commit:
d86b18a06cf3 ("drm/i915: Serialize GTT/Aperture accesses on BXT")
(which is also commit 0ef34ad6222a in the drm tree)
from the drm-intel-fixes tree and commit:
80debff8d9
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_ringbuffer.h
between commit:
dd68f2ba0720 ("drm/i915/execlists: Wrap tail pointer after reset tweaking")
from the drm-intel-fixes tree and commit:
73dec95e6ba3 ("drm/i915: Emit to ringbuffer
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_lrc.c
between commit:
dd68f2ba0720 ("drm/i915/execlists: Wrap tail pointer after reset tweaking")
from the drm-intel-fixes tree and commit:
944a36d472be ("drm/i915: Assert that the request->t
> On Tue, Mar 21, 2017 at 5:00 PM, Stephen Rothwell
wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_gem_shrinker.c
>
> between commit:
>
> 3d3d18f086cd ("drm/i915: Avoid rcu_barrier() from reclaim paths
(shrinker)")
>
> from the d
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_shrinker.c
between commit:
3d3d18f086cd ("drm/i915: Avoid rcu_barrier() from reclaim paths (shrinker)")
from the drm-intel-fixes tree and commit:
519d52498156 ("drm/i915: i915_gem_shrink_a
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_context.c
between commit:
590379aef2e3 ("drm/i915: make context status notifier head be per engine")
from the drm-intel-fixes tree and commits:
2355cf088d46 ("drm/i915: Create context desc
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/gvt/cmd_parser.c
between commit:
695fbc08d80f ("drm/i915/gvt: replace the gvt_err with gvt_vgpu_err")
from the drm-intel-fixes tree and commit:
73dec95e6ba3 ("drm/i915: Emit to ringbuffer directly"
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_display.c
between commit:
a5aac5ab876a ("drm/i915: Check VBT for port presence in addition to the strap
on VLV/CHV")
from the drm-intel-fixes tree and commit:
457c52d87e5d ("drm/i915: Only i
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_display.c
between commit:
57a2af6bbc7a ("drm/i915: Kill intel_crtc->cursor_bo")
from the drm-intel-fixes tree and commit:
6285262259ca ("drm/i915: Only run commit when crtc is active, v2.")
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_pm.c
between commits:
344df9809f45 ("drm/i915/skl: Disable coarse power gating up until F0")
6704d4552853 ("drm/i915/skl: Double RC6 WRL always on")
from the drm-intel-fixes tree and commit:
On Thu, 03 Dec 2015, Mark Brown wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_hdmi.c between commit ac9b8236551d1 ("drm/i915:
> Introduce a gmbus power domain") from the drm-intel-fixes tree and commit
> 69172f210e9fffaf8 ("drm/i915:
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_hdmi.c between commit ac9b8236551d1 ("drm/i915:
Introduce a gmbus power domain") from the drm-intel-fixes tree and commit
69172f210e9fffaf8 ("drm/i915: take a power domain ref only when needed
during HD
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_atomic.c
drivers/gpu/drm/i915/intel_display.c
between commits:
f0fdc55db0c6 ("drm/i915: calculate primary visibility changes instead of
calling from set_config")
d2944cf21305 ("drm/i915: Com
Hi Jani,
On Fri, 05 Jun 2015 11:03:20 +0300 Jani Nikula wrote:
>
> On Fri, 05 Jun 2015, "mpe at ellerman.id.au" wrote:
> > Hi Dave,
> >
> > Today's linux-next merge of the drm tree got a conflict in
> > drivers/gpu/drm/i915/intel_ringbuffer.c between commit 4f47c99a9be7
> > ("drm/i915:
> > Move
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_ringbuffer.c between commit 4f47c99a9be7 ("drm/i915:
Move WaBarrierPerformanceFixDisable:skl to skl code from chv code") from the
drm-intel-fixes tree and commit b62adbd1ea1f ("drm/i915/bxt: Move
WaForce
On Fri, 05 Jun 2015, "mpe at ellerman.id.au" wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_ringbuffer.c between commit 4f47c99a9be7
> ("drm/i915:
> Move WaBarrierPerformanceFixDisable:skl to skl code from chv code") from the
> drm-in
On 03/16/2015 at 10:30 AM, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45
> ("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from
> the drm-intel-fixes tree and c
On Mon, 16 Mar 2015, Xi Ruoyao wrote:
> On 03/16/2015 at 10:30 AM, Stephen Rothwell wrote:
>> Hi Dave,
>>
>> Today's linux-next merge of the drm tree got a conflict in
>> drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45
>> ("drm/i915: Ensure plane->state->fb stays in sync with plan
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit 2dccc9898d45
("drm/i915: Ensure plane->state->fb stays in sync with plane->fb") from
the drm-intel-fixes tree and commit afd65eb4cc05 ("drm/i915: Ensure
plane->state->fb stays in
Hi Jani,
On Wed, 03 Dec 2014 10:24:12 +0200 Jani Nikula wrote:
>
> On Wed, 03 Dec 2014, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the drm tree got a conflict in
> > drivers/gpu/drm/i915/intel_display.c between commit b68362278af9
> > ("drm/i915: More cautious with pch fifo unde
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit b68362278af9
("drm/i915: More cautious with pch fifo underruns") from the
drm-intel-fixes tree and commit a72e4c9f9a11 ("drm/i915: Use dev_priv
in public intel_fifo_underrun.c fu
On Wed, 03 Dec 2014, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_display.c between commit b68362278af9
> ("drm/i915: More cautious with pch fifo underruns") from the
> drm-intel-fixes tree and commit a72e4c9f9a11 ("
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_pm.c between commit 6bc55a67bd4b ("drm/i915:
drop WaSetupGtModeTdRowDispatch:snb") from the drm-intel-fixes tree and
commits (not sure which ones - the code seems to have been rearranged
quite a bit) fro
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem_render_state.c between commit
88b982873567 ("drm/i915: fix freeze with blank screen booting highmem")
from the drm-intel-fixes tree and commit 1ce826d436f3 ("drm/i915:
Simplify processing of the golde
Hi Dave,
On Mon, 28 Oct 2013 16:46:09 +1100 Stephen Rothwell
wrote:
>
> @@@ -1486,8 -1542,8 +1562,8 @@@ static void intel_edp_psr_setup(struct
> intel_edp_psr_write_vsc(intel_dp, &psr_vsc);
>
> /* Avoid continuous PSR exit by masking memup and hpd */
> -I915_WRITE(EDP_PSR_DE
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_dp.c between commit 0cc4b69960f3 ("drm/i915:
Mask LPSP to get PSR working even with Power Well in use by audio") from
Linus' tree and commit 52e1e223456e ("drm/i915/dp: workaround BIOS eDP
bpp clamping i
49 matches
Mail list logo
