From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Kaehlcke Subject: Re: [PATCH v2] drm/i915: Consistently use enum pipe for PCH transcoders Date: Wed, 19 Jul 2017 09:49:59 -0700 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-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170719063036.rsxvtkejagbleqtq@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Jani Nikula , Daniel Vetter , intel-gfx , Linux Kernel Mailing List , dri-devel@lists.freedesktop.org, =?utf-8?B?U3TDqXBoYW5l?= Marchesin , Grant Grundler List-Id: dri-devel@lists.freedesktop.org RWwgV2VkLCBKdWwgMTksIDIwMTcgYXQgMDg6MzA6MzZBTSArMDIwMCBEYW5pZWwgVmV0dGVyIGhh IGRpdDoKCj4gT24gVHVlLCBKdWwgMTgsIDIwMTcgYXQgMDE6NDg6NTNQTSAtMDcwMCwgTWF0dGhp YXMgS2FlaGxja2Ugd3JvdGU6Cj4gPiBIaSBEYW5pZWwsCj4gPiAKPiA+IEVsIFR1ZSwgSnVsIDE4 LCAyMDE3IGF0IDA4OjM5OjUwQU0gKzAyMDAgRGFuaWVsIFZldHRlciBoYSBkaXQ6Cj4gPiAKPiA+ ID4gT24gTW9uLCBKdWwgMTcsIDIwMTcgYXQgMTE6MTQ6MDNBTSAtMDcwMCwgTWF0dGhpYXMgS2Fl aGxja2Ugd3JvdGU6Cj4gPiA+ID4gVGhlIGN1cnJlbnQgY29kZSB1c2VzIGluIHNvbWUgaW5zdGFu Y2VzIGVudW0gdHJhbnNjb2RlciBmb3IgUENICj4gPiA+ID4gdHJhbnNjb2RlcnMgYW5kIGVudW0g cGlwZSBpbiBvdGhlcnMuIFRoaXMgaXMgZXJyb3IgcHJvbmUgYW5kIGNsYW5nCj4gPiA+ID4gcmFp c2VzIHdhcm5pbmdzIGxpa2UgdGhpczoKPiA+ID4gPiAKPiA+ID4gPiBkcml2ZXJzL2dwdS9kcm0v aTkxNS9pbnRlbF9kcC5jOjM1NDY6NTE6IHdhcm5pbmc6IGltcGxpY2l0IGNvbnZlcnNpb24KPiA+ ID4gPiAgIGZyb20gZW51bWVyYXRpb24gdHlwZSAnZW51bSBwaXBlJyB0byBkaWZmZXJlbnQgZW51 bWVyYXRpb24gdHlwZQo+ID4gPiA+ICAgJ2VudW0gdHJhbnNjb2RlcicgWy1XZW51bS1jb252ZXJz aW9uXQo+ID4gPiA+ICAgICBpbnRlbF9zZXRfcGNoX2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5nKGRl dl9wcml2LCBQSVBFX0EsIGZhbHNlKTsKPiA+ID4gPiAKPiA+ID4gPiBDb25zaXN0ZW50bHkgdXNl IHRoZSB0eXBlIGVudW0gcGlwZSBmb3IgUENIIHRyYW5zY29kZXJzLgo+ID4gPiA+IAo+ID4gPiA+ IFNpZ25lZC1vZmYtYnk6IE1hdHRoaWFzIEthZWhsY2tlIDxta2FAY2hyb21pdW0ub3JnPgo+ID4g PiAKPiA+ID4gU29tZWhvdyBnaXQgYXBwbHktbWJveCBjb3VsZCBwYXJzZSBpdCwgYnV0IG1hbnVh bGx5IGFwcGx5aW5nIHVzaW5nIHBhdGNoCj4gPiA+IHdvcmtlZC4gTm90IHN1cmUgd2hhdCdzIGdv aW5nIG9uLCBtYXliZSBkb3VibGUtY2hlY2sgaXQncyBhbGwgcmlnaHQuCj4gPiAKPiA+IE5vdCBz dXJlIHdoYXQgaGFwcGVuZWQsIG9uZSBvZiB0aGUgcGF0Y2ggZnJhZ21lbnRzIG9ubHkgaGFzIG9u ZSAnQCcKPiA+IGluc3RlYWQgb2YgdHdvLCB3aXRoIHRoYXQgZml4ZWQgdGhlIHBhdGNoIGFwcGxp ZXMuCj4gPiAKPiA+IFVuZm9ydHVuYXRlbHkgdGhlIG1hbnVhbCBhcHBsaWNhdGlvbiBtaXNzZWQg c29tZSBmcmFnbWVudHM6Cj4gPiAKPiA+IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3Bs YXkuYzo1MzUwOjUxOiB3YXJuaW5nOiBpbXBsaWNpdAo+ID4gICBjb252ZXJzaW9uIGZyb20gZW51 bWVyYXRpb24gdHlwZSAnZW51bSB0cmFuc2NvZGVyJyB0byBkaWZmZXJlbnQKPiA+ICAgZW51bWVy YXRpb24gdHlwZSAnZW51bSBwaXBlJyBbLVdlbnVtLWNvbnZlcnNpb25dCj4gPiAgICAgICAgICAg ICAgICAgaW50ZWxfc2V0X3BjaF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgVFJB TlNDT0RFUl9BLAo+ID4gICAgICAgICAgICAgICAgIH5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ fn5+fn5+fn5+fn4gICAgICAgICAgIF5+fn5+fn5+fn5+fgo+ID4gZHJpdmVycy9ncHUvZHJtL2k5 MTUvaW50ZWxfZGlzcGxheS5jOjU0MzY6NTE6IHdhcm5pbmc6IGltcGxpY2l0Cj4gPiAgIGNvbnZl cnNpb24gZnJvbSBlbnVtZXJhdGlvbiB0eXBlICdlbnVtIHRyYW5zY29kZXInIHRvIGRpZmZlcmVu dAo+ID4gICBlbnVtZXJhdGlvbiB0eXBlICdlbnVtIHBpcGUnIFstV2VudW0tY29udmVyc2lvbl0K PiA+ICAgICAgICAgICAgICAgICBpbnRlbF9zZXRfcGNoX2ZpZm9fdW5kZXJydW5fcmVwb3J0aW5n KGRldl9wcml2LCBUUkFOU0NPREVSX0EsCj4gPiAgICAgICAgICAgICAgICAgfn5+fn5+fn5+fn5+ fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fiAgICAgICAgICAgXn5+fn5+fn5+fn5+Cj4gPiBkcml2 ZXJzL2dwdS9kcm0vaTkxNS9pbnRlbF9kaXNwbGF5LmM6NTUzNDo1MTogd2FybmluZzogaW1wbGlj aXQKPiA+ICAgY29udmVyc2lvbiBmcm9tIGVudW1lcmF0aW9uIHR5cGUgJ2VudW0gdHJhbnNjb2Rl cicgdG8gZGlmZmVyZW50Cj4gPiAgIGVudW1lcmF0aW9uIHR5cGUgJ2VudW0gcGlwZScgWy1XZW51 bS1jb252ZXJzaW9uXQo+ID4gICAgICAgICAgICAgICAgIGludGVsX3NldF9wY2hfZmlmb191bmRl cnJ1bl9yZXBvcnRpbmcoZGV2X3ByaXYsIFRSQU5TQ09ERVJfQSwKPiA+ICAgICAgICAgICAgICAg ICB+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ICAgICAgICAgICBefn5+fn5+ fn5+fn4KPiA+IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYzo1NTYzOjUxOiB3 YXJuaW5nOiBpbXBsaWNpdAo+ID4gICBjb252ZXJzaW9uIGZyb20gZW51bWVyYXRpb24gdHlwZSAn ZW51bSB0cmFuc2NvZGVyJyB0byBkaWZmZXJlbnQKPiA+ICAgZW51bWVyYXRpb24gdHlwZSAnZW51 bSBwaXBlJyBbLVdlbnVtLWNvbnZlcnNpb25dCj4gPiAgICAgICAgICAgICAgICAgaW50ZWxfc2V0 X3BjaF9maWZvX3VuZGVycnVuX3JlcG9ydGluZyhkZXZfcHJpdiwgVFJBTlNDT0RFUl9BLAo+ID4g Cj4gPiAKPiA+IFdoYXQgd291bGQgYmUgdGhlIGJlc3Qgd2F5IGZvcndhcmQgZnJvbSBoZXJlPyBS ZXZlcnQgdGhlIG1hbnVhbAo+ID4gYXBwbGljYXRpb24gYW5kIGFwcGx5IGFnYWluLCBvciBhIGZp eHVwIHBhdGNoPwo+IAo+IERyYXQgSSBzY3Jld2VkIHVwIDotKCBkcm0taW50ZWwtbmV4dC1xdWV1 ZWQgaXMgbm9uLXJlYmFzaW5nLCB0aGF0IG1lYW5zIEkKPiBuZWVkIGEgZml4dXAgcGF0Y2guIEkg c2hvdWxkIGhhdmUgY2hlY2tlZCBtb3JlIGNhcmVmdWxseSB0aGF0IEkgaGF2ZSBhbGwKPiB0aGUg aHVua3MsIGJ1dCBwYXRjaCAtcDEgc2VlbWVkIGhhcHB5IC4uLgoKT2ssIEkgd2lsbCBzZW5kIGEg Zml4dXAgcGF0Y2ggc2hvcnRseQoKTWF0dGhpYXMKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vaW50ZWwtZ2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 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 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