Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754836AbdGSQuE (ORCPT ); Wed, 19 Jul 2017 12:50:04 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:37293 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753879AbdGSQuC (ORCPT ); Wed, 19 Jul 2017 12:50:02 -0400 Date: Wed, 19 Jul 2017 09:49:59 -0700 From: Matthias Kaehlcke To: Jani Nikula , Daniel Vetter , intel-gfx , Linux Kernel Mailing List , dri-devel@lists.freedesktop.org, =?utf-8?B?U3TDqXBoYW5l?= Marchesin , Grant Grundler Subject: Re: [PATCH v2] drm/i915: Consistently use enum pipe for PCH transcoders Message-ID: <20170719164959.GN95735@google.com> References: <20170717181403.57324-1-mka@chromium.org> <20170718063950.ixnm6hevtgoalx4g@phenom.ffwll.local> <20170718204853.GM95735@google.com> <20170719063036.rsxvtkejagbleqtq@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170719063036.rsxvtkejagbleqtq@phenom.ffwll.local> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2994 Lines: 60 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 > > > > > > 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