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 functions") from the drm tree.
I fixed it up (I used the drm tree version) and can carry the fix as necessary (no action is required).
On Wed, 03 Dec 2014, Stephen Rothwell sfr@canb.auug.org.au 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 ("drm/i915: Use dev_priv in public intel_fifo_underrun.c functions") from the drm tree.
I fixed it up (I used the drm tree version) and can carry the fix as necessary (no action is required).
b68362278af9 removes two lines of code; these should be removed in the resolved version too.
BR, Jani.
Hi Jani,
On Wed, 03 Dec 2014 10:24:12 +0200 Jani Nikula jani.nikula@intel.com wrote:
On Wed, 03 Dec 2014, Stephen Rothwell sfr@canb.auug.org.au 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 underruns") from the drm-intel-fixes tree and commit a72e4c9f9a11 ("drm/i915: Use dev_priv in public intel_fifo_underrun.c functions") from the drm tree.
I fixed it up (I used the drm tree version) and can carry the fix as necessary (no action is required).
b68362278af9 removes two lines of code; these should be removed in the resolved version too.
Thanks for the correction. I will do that tomorrow.
dri-devel@lists.freedesktop.org
-
Jani Nikula -
Stephen Rothwell