Hi Stephen,
On Wed, Nov 22, 2023 at 1:29 AM Stephen Rothwell wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/accel/ivpu/ivpu_hw_37xx.c
>
> between commit:
>
> 3f7c0634926d ("accel/ivpu/37xx: Fix hangs related to MMIO reset")
>
> from the drm-misc-fixes tree an
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/accel/ivpu/ivpu_hw_37xx.c
between commit:
3f7c0634926d ("accel/ivpu/37xx: Fix hangs related to MMIO reset")
from the drm-misc-fixes tree and commits:
3de6d9597892 ("accel/ivpu: Pass D0i3 residency time to the VP
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/accel/ivpu/ivpu_fw.c
between commit:
645d694559ca ("accel/ivpu: Use cached buffers for FW loading")
from the drm-misc-fixes tree and commit:
53d98420f5f9 ("accel/ivpu: Move ivpu_fw_load() to ivpu_fw_init()")
fr
Hi all,
On Tue, 27 Jun 2023 11:54:32 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> include/drm/gpu_scheduler.h
>
> between commit:
>
> db8b4968a8d0 ("drm/sched: Call drm_sched_fence_set_parent() from
> drm_sched_fence_scheduled()")
>
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
include/drm/gpu_scheduler.h
between commit:
db8b4968a8d0 ("drm/sched: Call drm_sched_fence_set_parent() from
drm_sched_fence_scheduled()")
from the drm-misc-fixes tree and commit:
539f9ee4b52a ("drm/scheduler: properly
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
between commit:
b09d6acba1d9 ("drm/amdgpu: handle gang submit before VMID")
from the drm-misc-fixes tree and commits:
c5093cddf56b ("drm/amdgpu: drop the fence argument from amdgp
Hi Dave,
On Wed, 27 Jul 2022 13:24:45 +1000 Dave Airlie wrote:
>
> My assumption is I fix this on sending my -next tree to Linus with a
> resolution I create at that time?
>
> Is there another option, we have this fixed in out drm-tip tree already.
Sounds good, no problem.
--
Cheers,
Stephen
On Wed, 27 Jul 2022 at 12:55, Stephen Rothwell wrote:
>
> Hi all,
>
> On Mon, 18 Jul 2022 09:44:53 +1000 Stephen Rothwell
> wrote:
> >
> > On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
> > wrote:
> > >
> > > Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> > > >
> > > > Today's linux-next
Hi all,
On Mon, 18 Jul 2022 09:44:53 +1000 Stephen Rothwell
wrote:
>
> On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
> wrote:
> >
> > Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> > >
> > > Today's linux-next merge of the drm tree got a conflict in:
> > >
> > >drivers/gpu/drm/amd
Hi Stephen,
On Mon, Jul 18, 2022 at 1:49 AM Stephen Rothwell wrote:
> On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
> wrote:
> > Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> > >
> > > Today's linux-next merge of the drm tree got a conflict in:
> > >
> > >drivers/gpu/drm/amd/amdgpu/
Hi all,
On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
wrote:
>
> Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> >
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> >drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> >
> > between commit:
> >
> >925b6e59138c ("Rever
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
between commit:
925b6e59138c ("Revert "drm/amdgpu: add drm buddy support to amdgpu"")
from the drm-misc-fixes tree and commit:
5e3f1e7729ec ("drm/amdgpu: fix start calculatio
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,
On Fri, 18 Mar 2022 11:55:44 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/bridge/Kconfig
>
> between commit:
>
> 3c3384050d68 ("drm: Don't make DRM_PANEL_BRIDGE dependent on
> DRM_KMS_HELPERS")
>
> from the drm
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/bridge/Kconfig
between commit:
3c3384050d68 ("drm: Don't make DRM_PANEL_BRIDGE dependent on DRM_KMS_HELPERS")
from the drm-misc-fixes tree and commit:
803abfd8dda5 ("drm: bridge: fix unmet dependency on
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/nouveau/nouveau_fence.c
between commit:
67f74302f45d ("drm/nouveau: wait for the exclusive fence after the shared
ones v2")
from the drm-misc-fixes tree and commit:
40298cb45071 ("drm/nouveau: use the n
Hi Maxime,
On Tue, 30 Nov 2021 09:58:31 +0100 Maxime Ripard wrote:
>
> Unfortunately the merge resolution isn't entirely correct :/
>
> There's multiple conflicts between those two branches on that file, but
> things went wrong between 16e101051f32 and 0c980a006d3f
>
> The first one changes the
Hi Stephen,
On Tue, Nov 30, 2021 at 10:33:53AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/vc4/vc4_kms.c
>
> between commits:
>
> f927767978d2 ("drm/vc4: kms: Fix return code check")
> d354699e2292 ("drm/vc4
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/vc4/vc4_kms.c
between commits:
f927767978d2 ("drm/vc4: kms: Fix return code check")
d354699e2292 ("drm/vc4: kms: Don't duplicate pending commit")
from the drm-misc-fixes tree and commit:
16e101051f32 (
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/drm_panel_orientation_quirks.c
between commit:
def0c3697287 ("drm: panel-orientation-quirks: Add quirk for Aya Neo 2021")
from the drm-misc-fixes tree and commits:
072e70d52372 ("drm: panel-orientation-q
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/vc4/vc4_hdmi.c
between commit:
9984d6664ce9 ("drm/vc4: hdmi: Make sure the controller is powered in detect")
from the drm-misc-fixes tree and commit:
6800234ceee0 ("drm/vc4: hdmi: Convert to gpiod")
fro
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/vc4/vc4_plane.c
between commit:
35d65ab3fdba ("drm/vc4: plane: Remove redundant assignment")
from the drm-misc-fixes tree and commit:
5ddb0bd4ddc3 ("drm/atomic: Pass the full state to planes async atomic
On 18/03/2021 03:02, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/omapdrm/dss/dsi.c
between commit:
690911544275 ("drm/omap: dsi: fix unsigned expression compared with zero")
from the drm-misc-fixes tree and commit:
bbd
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/omapdrm/dss/dsi.c
between commit:
690911544275 ("drm/omap: dsi: fix unsigned expression compared with zero")
from the drm-misc-fixes tree and commit:
bbd13d6a7b2e ("drm/omap: dsi: fix unreachable code in
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/drm_gem.c
between commit:
8490d6a7e0a0 ("drm: hold gem reference until object is no longer accessed")
from the drm-misc-fixes tree and commit:
be6ee102341b ("drm: remove _unlocked suffix in drm_gem_objec
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:
include/linux/dma-buf.h
between commit:
6f49c2515e22 ("dma-buf: fix documentation build warnings")
from the drm-misc-fixes tree and commit:
09606b5446c2 ("dma-buf: add peer2peer flag")
from the drm tree.
I fixed it up
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/virtio/virtgpu_object.c
between commit:
6be7e0733548 ("drm/virtio: fix mmap page attributes")
from the drm-misc-fixes tree and commit:
18b39fb975b7 ("drm/virtio: add virtio_gpu_is_shmem helper")
from th
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
On Mon, Aug 26, 2019 at 01:06:37PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c
>
> between commit:
>
> 51a44a28eefd ("drm/komeda: Add missing of_node_get() call")
>
> from the d
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/arm/display/komeda/komeda_dev.c
between commit:
51a44a28eefd ("drm/komeda: Add missing of_node_get() call")
from the drm-misc-fixes tree and commit:
8965ad8433ea ("drm/komeda: Enable dual-link support")
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/meson/meson_crtc.c
between commit:
47ebfb6ed13e ("drm/meson: Fixes for drm_crtc_vblank_on/off support")
from the drm-misc-fixes tree and commit:
f9a2348196d1 ("drm/meson: Support Overlay plane for video
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/sun4i/sun4i_tcon.c
between commit:
e742a17cd360 ("drm/sun4i: tcon: Reduce the scope of the LVDS error a bit")
from the drm-misc-fixes tree and commit:
34d698f6e349 ("drm/sun4i: Add has_channel_0 TCON qui
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/drm_edid.c
between commit:
4b4df570b41d ("drm: Update edid-derived drm_display_info fields at edid
property set [v2]")
from the drm-misc-fixes tree and commit:
c945b8c14bb7 ("drm/edid: build ELD in drm_
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:
include/drm/drm_atomic.h
between commit:
7e9081c5aac7 ("drm/fence: fix memory overwrite when setting out_fence fd")
from the drm-misc-fixes tree and commit:
bdc571464c49 ("drm/atomic: Clean up wait_for_vblanks, v2.")
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:
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, "m...@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 W
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, "m...@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-inte
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
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 commit afd
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
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_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
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
Today's linux-next merge of the drm tree got conflicts in
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel
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 (
73 matches
Mail list logo
