From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [Intel-gfx] [PATCH RESEND] drm/i915: Fix pipe/transcoder enum mismatches Date: Fri, 5 May 2017 20:40:43 +0300 Message-ID: <20170505174043.GK12629@intel.com> References: <20170420215605.176722-1-mka@chromium.org> <20170505172636.GA128305@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20170505172636.GA128305@google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Matthias Kaehlcke Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Michael Davidson , Grant Grundler , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCBNYXkgMDUsIDIwMTcgYXQgMTA6MjY6MzZBTSAtMDcwMCwgTWF0dGhpYXMgS2FlaGxj a2Ugd3JvdGU6Cj4gRWwgVGh1LCBBcHIgMjAsIDIwMTcgYXQgMDI6NTY6MDVQTSAtMDcwMCBNYXR0 aGlhcyBLYWVobGNrZSBoYSBkaXQ6Cj4gCj4gPiBJbiBzZXZlcmFsIGluc3RhbmNlcyB0aGUgZHJp dmVyIHBhc3NlcyBhbiAnZW51bSBwaXBlJyB2YWx1ZSB0byBhCj4gPiBmdW5jdGlvbiBleHBlY3Rp bmcgYW4gJ2VudW0gdHJhbnNjb2RlcicgYW5kIHZpY2V2ZXJzYS4gU2luY2UgUElQRV94IGFuZAo+ ID4gVFJBTlNDT0RFUl94IGhhdmUgdGhlIHNhbWUgdmFsdWVzIHRoaXMgZG9lc24ndCBjYXVzZSBm dW5jdGlvbmFsCj4gPiBwcm9ibGVtcy4gU3RpbGwgaXQgaXMgaW5jb3JyZWN0IGFuZCBjYXVzZXMg Y2xhbmcgdG8gZ2VuZXJhdGUgd2FybmluZ3MKPiA+IGxpa2UgdGhpczoKPiA+IAo+ID4gZHJpdmVy cy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jOjE4NDQ6MzQ6IHdhcm5pbmc6IGltcGxpY2l0 Cj4gPiAgIGNvbnZlcnNpb24gZnJvbSBlbnVtZXJhdGlvbiB0eXBlICdlbnVtIHRyYW5zY29kZXIn IHRvIGRpZmZlcmVudAo+ID4gICBlbnVtZXJhdGlvbiB0eXBlICdlbnVtIHBpcGUnIFstV2VudW0t Y29udmVyc2lvbl0KPiA+ICAgICBhc3NlcnRfZmRpX3J4X2VuYWJsZWQoZGV2X3ByaXYsIFRSQU5T Q09ERVJfQSk7Cj4gPiAKPiA+IENoYW5nZSB0aGUgY29kZSB0byBwYXNzIHZhbHVlcyBvZiB0aGUg dHlwZSBleHBlY3RlZCBieSB0aGUgY2FsbGVlLgo+ID4gCj4gPiBTaWduZWQtb2ZmLWJ5OiBNYXR0 aGlhcyBLYWVobGNrZSA8bWthQGNocm9taXVtLm9yZz4KPiA+IC0tLQo+ID4gIGRyaXZlcnMvZ3B1 L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYyB8IDQgKystLQo+ID4gIGRyaXZlcnMvZ3B1L2RybS9p OTE1L2ludGVsX2RwLmMgICAgICB8IDYgKysrKy0tCj4gPiAgZHJpdmVycy9ncHUvZHJtL2k5MTUv aW50ZWxfaGRtaS5jICAgIHwgNiArKysrLS0KPiA+ICBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pbnRl bF9zZHZvLmMgICAgfCA2ICsrKystLQo+ID4gIDQgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9u cygrKSwgOCBkZWxldGlvbnMoLSkKPiAKPiBQaW5nLCBhbnkgY29tbWVudHMgb24gdGhpcyBwYXRj aD8KCkknbSBub3QgY29udmluY2VkIHRoZSBwYXRjaCBpcyBtYWtpbmcgdGhpbmdzIGFueSBiZXR0 ZXIgcmVhbGx5LiBUbwpmaXggdGhpcyByZWFsbHkgcHJvcGVybHksIEkgdGhpbmsgd2UnZCBuZWVk IHRvIGludHJvZHVjZSBhIG5ldyBlbnVtIApwY2hfdHJhbnNjb2RlciBhbmQgdGh1cyBhdm9pZCB0 aGUgY29uZnVzaW9uIG9mIHdoaWNoIHR5cGUgb2YKdHJhbnNjb2RlciB3ZSdyZSB0YWxraW5nIGFi b3V0LiBDdXJyZW50bHkgbW9zdCBwbGFjZXMgZXhwZWN0IGFuIAplbnVtIHBpcGUgd2hlbiBkZWFs aW5nIHdpdGggUENIIHRyYW5zY29kZXJzLCBhbmQgZW51bSB0cmFuc2NvZGVyCndoZW4gZGVhbGlu ZyB3aXRoIENQVSB0cmFuc2NvZGVycy4gQnV0IHRoZXJlIGFyZSBzb21lIGV4Y2VwdGlvbnMKb2Yg Y291cnNlLgoKLS0gClZpbGxlIFN5cmrDpGzDpApJbnRlbCBPVEMKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3Jn L21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751154AbdEERkx (ORCPT ); Fri, 5 May 2017 13:40:53 -0400 Received: from mga01.intel.com ([192.55.52.88]:8606 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750879AbdEERkw (ORCPT ); Fri, 5 May 2017 13:40:52 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,293,1491289200"; d="scan'208";a="1144177176" Date: Fri, 5 May 2017 20:40:43 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Matthias Kaehlcke Cc: Daniel Vetter , Jani Nikula , David Airlie , Grant Grundler , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Greg Hackmann , Michael Davidson , dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH RESEND] drm/i915: Fix pipe/transcoder enum mismatches Message-ID: <20170505174043.GK12629@intel.com> References: <20170420215605.176722-1-mka@chromium.org> <20170505172636.GA128305@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170505172636.GA128305@google.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 05, 2017 at 10:26:36AM -0700, Matthias Kaehlcke wrote: > El Thu, Apr 20, 2017 at 02:56:05PM -0700 Matthias Kaehlcke ha dit: > > > In several instances the driver passes an 'enum pipe' value to a > > function expecting an 'enum transcoder' and viceversa. Since PIPE_x and > > TRANSCODER_x have the same values this doesn't cause functional > > problems. Still it is incorrect and causes clang to generate warnings > > like this: > > > > drivers/gpu/drm/i915/intel_display.c:1844:34: warning: implicit > > conversion from enumeration type 'enum transcoder' to different > > enumeration type 'enum pipe' [-Wenum-conversion] > > assert_fdi_rx_enabled(dev_priv, TRANSCODER_A); > > > > Change the code to pass values of the type expected by the callee. > > > > Signed-off-by: Matthias Kaehlcke > > --- > > drivers/gpu/drm/i915/intel_display.c | 4 ++-- > > drivers/gpu/drm/i915/intel_dp.c | 6 ++++-- > > drivers/gpu/drm/i915/intel_hdmi.c | 6 ++++-- > > drivers/gpu/drm/i915/intel_sdvo.c | 6 ++++-- > > 4 files changed, 14 insertions(+), 8 deletions(-) > > Ping, any comments on this patch? I'm not convinced the patch is making things any better really. To fix this really properly, I think we'd need to introduce a new enum pch_transcoder and thus avoid the confusion of which type of transcoder we're talking about. Currently most places expect an enum pipe when dealing with PCH transcoders, and enum transcoder when dealing with CPU transcoders. But there are some exceptions of course. -- Ville Syrjälä Intel OTC