El Wed, Jul 19, 2017 at 08:30:36AM +0200 Daniel Vetter ha dit:
On Tue, Jul 18, 2017 at 01:48:53PM -0700, Matthias Kaehlcke wrote:
Hi Daniel,
El Tue, Jul 18, 2017 at 08:39:50AM +0200 Daniel Vetter ha dit:
On Mon, Jul 17, 2017 at 11:14:03AM -0700, Matthias Kaehlcke wrote:
The current code uses in some instances enum transcoder for PCH transcoders and enum pipe in others. This is error prone and clang raises warnings like this:
drivers/gpu/drm/i915/intel_dp.c:3546:51: warning: implicit conversion from enumeration type 'enum pipe' to different enumeration type 'enum transcoder' [-Wenum-conversion] intel_set_pch_fifo_underrun_reporting(dev_priv, PIPE_A, false);
Consistently use the type enum pipe for PCH transcoders.
Signed-off-by: Matthias Kaehlcke mka@chromium.org
Somehow git apply-mbox could parse it, but manually applying using patch worked. Not sure what's going on, maybe double-check it's all right.
Not sure what happened, one of the patch fragments only has one '@' instead of two, with that fixed the patch applies.
Unfortunately the manual application missed some fragments:
drivers/gpu/drm/i915/intel_display.c:5350:51: warning: implicit conversion from enumeration type 'enum transcoder' to different enumeration type 'enum pipe' [-Wenum-conversion] intel_set_pch_fifo_underrun_reporting(dev_priv, TRANSCODER_A, ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~ drivers/gpu/drm/i915/intel_display.c:5436:51: warning: implicit conversion from enumeration type 'enum transcoder' to different enumeration type 'enum pipe' [-Wenum-conversion] intel_set_pch_fifo_underrun_reporting(dev_priv, TRANSCODER_A, ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~ drivers/gpu/drm/i915/intel_display.c:5534:51: warning: implicit conversion from enumeration type 'enum transcoder' to different enumeration type 'enum pipe' [-Wenum-conversion] intel_set_pch_fifo_underrun_reporting(dev_priv, TRANSCODER_A, ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~ drivers/gpu/drm/i915/intel_display.c:5563:51: warning: implicit conversion from enumeration type 'enum transcoder' to different enumeration type 'enum pipe' [-Wenum-conversion] intel_set_pch_fifo_underrun_reporting(dev_priv, TRANSCODER_A,
What would be the best way forward from here? Revert the manual application and apply again, or a fixup patch?
Drat I screwed up :-( drm-intel-next-queued is non-rebasing, that means I need a fixup patch. I should have checked more carefully that I have all the hunks, but patch -p1 seemed happy ...
Ok, I will send a fixup patch shortly
Matthias