From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH v11 3/4] drm/i915: Use new CRC debugfs API Date: Wed, 16 Nov 2016 14:58:03 +0200 Message-ID: <87h9771t0k.fsf@intel.com> References: <1475767268-14379-1-git-send-email-tomeu.vizoso@collabora.com> <1475767268-14379-4-git-send-email-tomeu.vizoso@collabora.com> <87inrq2vee.fsf@intel.com> <20161115071609.GI8202@suiko.acc.umu.se> <87a8d12lmy.fsf@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Tomeu Vizoso Cc: David Airlie , Intel Graphics Development , "linux-kernel@vger.kernel.org" , "dri-devel@lists.freedesktop.org" , Thierry Reding , Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAxNiBOb3YgMjAxNiwgVG9tZXUgVml6b3NvIDx0b21ldS52aXpvc29AY29sbGFib3Jh LmNvbT4gd3JvdGU6Cj4gT24gMTUgTm92ZW1iZXIgMjAxNiBhdCAwOToyNywgSmFuaSBOaWt1bGEg PGphbmkubmlrdWxhQGxpbnV4LmludGVsLmNvbT4gd3JvdGU6Cj4+IE9uIFR1ZSwgMTUgTm92IDIw MTYsIERhdmlkIFdlaW5laGFsbCA8dGFvQGtlcm5lbC5vcmc+IHdyb3RlOgo+Pj4gT24gTW9uLCBO b3YgMTQsIDIwMTYgYXQgMTI6NDQ6MjVQTSArMDIwMCwgSmFuaSBOaWt1bGEgd3JvdGU6Cj4+Pj4g T24gVGh1LCAwNiBPY3QgMjAxNiwgVG9tZXUgVml6b3NvIDx0b21ldS52aXpvc29AY29sbGFib3Jh LmNvbT4gd3JvdGU6Cj4+Pj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50 ZWxfZGlzcGxheS5jIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+Pj4g PiBpbmRleCAyM2E2YzcyMTNlY2EuLjc0MTJhMDVmYTVkOSAxMDA2NDQKPj4+PiA+IC0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rpc3BsYXkuYwo+Pj4+ID4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2k5MTUvaW50ZWxfZGlzcGxheS5jCj4+Pj4gPiBAQCAtMTQ2MzYsNiArMTQ2MzYsNyBA QCBzdGF0aWMgY29uc3Qgc3RydWN0IGRybV9jcnRjX2Z1bmNzIGludGVsX2NydGNfZnVuY3MgPSB7 Cj4+Pj4gPiAgICAucGFnZV9mbGlwID0gaW50ZWxfY3J0Y19wYWdlX2ZsaXAsCj4+Pj4gPiAgICAu YXRvbWljX2R1cGxpY2F0ZV9zdGF0ZSA9IGludGVsX2NydGNfZHVwbGljYXRlX3N0YXRlLAo+Pj4+ ID4gICAgLmF0b21pY19kZXN0cm95X3N0YXRlID0gaW50ZWxfY3J0Y19kZXN0cm95X3N0YXRlLAo+ Pj4+ID4gKyAgLnNldF9jcmNfc291cmNlID0gaW50ZWxfY3J0Y19zZXRfY3JjX3NvdXJjZSwKPj4+ PiA+ICB9Owo+Pj4+ID4KPj4+PiA+ICAvKioKPj4+PiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dw dS9kcm0vaTkxNS9pbnRlbF9kcnYuaCBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5o Cj4+Pj4gPiBpbmRleCA3MzcyNjFiMDkxMTAuLjMxODk0YjdjNjUxNyAxMDA2NDQKPj4+PiA+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2Rydi5oCj4+Pj4gPiArKysgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9kcnYuaAo+Pj4+ID4gQEAgLTE4NDQsNiArMTg0NCwxNCBAQCB2 b2lkIGludGVsX2NvbG9yX2xvYWRfbHV0cyhzdHJ1Y3QgZHJtX2NydGNfc3RhdGUgKmNydGNfc3Rh dGUpOwo+Pj4+ID4gIC8qIGludGVsX3BpcGVfY3JjLmMgKi8KPj4+PiA+ICBpbnQgaW50ZWxfcGlw ZV9jcmNfY3JlYXRlKHN0cnVjdCBkcm1fbWlub3IgKm1pbm9yKTsKPj4+PiA+ICB2b2lkIGludGVs X3BpcGVfY3JjX2NsZWFudXAoc3RydWN0IGRybV9taW5vciAqbWlub3IpOwo+Pj4+ID4gKyNpZmRl ZiBDT05GSUdfREVCVUdfRlMKPj4+PiA+ICtpbnQgaW50ZWxfY3J0Y19zZXRfY3JjX3NvdXJjZShz dHJ1Y3QgZHJtX2NydGMgKmNydGMsIGNvbnN0IGNoYXIgKnNvdXJjZV9uYW1lLAo+Pj4+ID4gKyAg ICAgICAgICAgICAgICAgICAgICAgIHNpemVfdCAqdmFsdWVzX2NudCk7Cj4+Pj4gPiArI2Vsc2UK Pj4+PiA+ICtzdGF0aWMgaW5saW5lIGludCBpbnRlbF9jcnRjX3NldF9jcmNfc291cmNlKHN0cnVj dCBkcm1fY3J0YyAqY3J0YywKPj4+PiA+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbnN0IGNoYXIgKnNvdXJjZV9uYW1lLAo+Pj4+ID4gKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgc2l6ZV90ICp2YWx1ZXNfY250KSB7IHJldHVybiAwOyB9Cj4+ Pj4gPiArI2VuZGlmCj4+Pj4KPj4+PiAiaW5saW5lIiBoZXJlIGRvZXNuJ3Qgd29yayBiZWNhdXNl IGl0J3MgdXNlZCBhcyBhIGZ1bmN0aW9uIHBvaW50ZXIuCj4+Pj4KPj4+PiBJcyBpdCBiZXR0ZXIg dG8gaGF2ZSBhIGZ1bmN0aW9uIHRoYXQgcmV0dXJucyAwIGZvciAuc2V0X2NyY19zb3VyY2UsIG9y Cj4+Pj4gdG8gc2V0IC5zZXRfY3JjX3NvdXJjZSB0byBOVUxMIHdoZW4gQ09ORklHX0RFQlVHX0ZT PW4/Cj4+Pgo+Pj4gSSdkIHNheSB0aGF0IHdoZW5ldmVyIHdlIGhhdmUgYSBmdW5jdGlvbiBwb2lu dGVyIHdlIHNob3VsZCBoYXZlIGEgZHVtbXkKPj4+IGZ1bmN0aW9uIHdpdGhvdXQgc2lkZS1lZmZl Y3RzIGZvciB0aGlzIGtpbmQgb2YgdGhpbmdzLgo+Pgo+PiBXaG9ldmVyIGNhbGxzIC5zZXRfY3Jj X3NvdXJjZSBjb3VsZCBkbyBzbWFydGVyIHRoaW5ncyBkZXBlbmRpbmcgb24gdGhlCj4+IGhvb2sg bm90IGJlaW5nIHRoZXJlIHZzLiBqdXN0IHNpbGVudGx5IHBsdW5naW5nIG9uLgo+Cj4gSW4gdGhp cyBzcGVjaWZpYyBjYXNlLCB3aGVuIENPTkZJR19ERUJVR19GUz1uIGl0IGRvZXNuJ3QgbWFrZSBh bnkKPiBzZW5zZSB0byBjYWxsIHRoYXQgY2FsbGJhY2ssIHNvIEkgdGhpbmsgd2Ugc2hvdWxkIGhh dmUgYSBkdW1teQo+IGltcGxlbWVudGF0aW9uIHRvIGF2b2lkIGFkZGluZyBhbiBpZmRlZiB0byB0 aGUgLmMuCgpXZSBkb24ndCB3YW50IHRoZSBpZmRlZiB0byB0aGUgLmMgZmlsZSwgYnV0IHdlIGNv dWxkIGRvCgojaWZkZWYgQ09ORklHX0RFQlVHX0ZTCmludCBpbnRlbF9jcnRjX3NldF9jcmNfc291 cmNlKHN0cnVjdCBkcm1fY3J0YyAqY3J0YywgY29uc3QgY2hhciAqc291cmNlX25hbWUsCgkJCQlz aXplX3QgKnZhbHVlc19jbnQpOwojZWxzZQojZGVmaW5lIGludGVsX2NydGNfc2V0X2NyY19zb3Vy Y2UgTlVMTAojZW5kaWYKCkJSLApKYW5pLgoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVuIFNv dXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZngK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932155AbcKPM6J (ORCPT ); Wed, 16 Nov 2016 07:58:09 -0500 Received: from mga07.intel.com ([134.134.136.100]:21483 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752755AbcKPM6G (ORCPT ); Wed, 16 Nov 2016 07:58:06 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,500,1473145200"; d="scan'208";a="787120164" From: Jani Nikula To: Tomeu Vizoso Cc: David Weinehall , David Airlie , Intel Graphics Development , "linux-kernel\@vger.kernel.org" , "dri-devel\@lists.freedesktop.org" , Thierry Reding , Daniel Vetter Subject: Re: [Intel-gfx] [PATCH v11 3/4] drm/i915: Use new CRC debugfs API In-Reply-To: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1475767268-14379-1-git-send-email-tomeu.vizoso@collabora.com> <1475767268-14379-4-git-send-email-tomeu.vizoso@collabora.com> <87inrq2vee.fsf@intel.com> <20161115071609.GI8202@suiko.acc.umu.se> <87a8d12lmy.fsf@intel.com> Date: Wed, 16 Nov 2016 14:58:03 +0200 Message-ID: <87h9771t0k.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 16 Nov 2016, Tomeu Vizoso wrote: > On 15 November 2016 at 09:27, Jani Nikula wrote: >> On Tue, 15 Nov 2016, David Weinehall wrote: >>> On Mon, Nov 14, 2016 at 12:44:25PM +0200, Jani Nikula wrote: >>>> On Thu, 06 Oct 2016, Tomeu Vizoso wrote: >>>> > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >>>> > index 23a6c7213eca..7412a05fa5d9 100644 >>>> > --- a/drivers/gpu/drm/i915/intel_display.c >>>> > +++ b/drivers/gpu/drm/i915/intel_display.c >>>> > @@ -14636,6 +14636,7 @@ static const struct drm_crtc_funcs intel_crtc_funcs = { >>>> > .page_flip = intel_crtc_page_flip, >>>> > .atomic_duplicate_state = intel_crtc_duplicate_state, >>>> > .atomic_destroy_state = intel_crtc_destroy_state, >>>> > + .set_crc_source = intel_crtc_set_crc_source, >>>> > }; >>>> > >>>> > /** >>>> > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h >>>> > index 737261b09110..31894b7c6517 100644 >>>> > --- a/drivers/gpu/drm/i915/intel_drv.h >>>> > +++ b/drivers/gpu/drm/i915/intel_drv.h >>>> > @@ -1844,6 +1844,14 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state); >>>> > /* intel_pipe_crc.c */ >>>> > int intel_pipe_crc_create(struct drm_minor *minor); >>>> > void intel_pipe_crc_cleanup(struct drm_minor *minor); >>>> > +#ifdef CONFIG_DEBUG_FS >>>> > +int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name, >>>> > + size_t *values_cnt); >>>> > +#else >>>> > +static inline int intel_crtc_set_crc_source(struct drm_crtc *crtc, >>>> > + const char *source_name, >>>> > + size_t *values_cnt) { return 0; } >>>> > +#endif >>>> >>>> "inline" here doesn't work because it's used as a function pointer. >>>> >>>> Is it better to have a function that returns 0 for .set_crc_source, or >>>> to set .set_crc_source to NULL when CONFIG_DEBUG_FS=n? >>> >>> I'd say that whenever we have a function pointer we should have a dummy >>> function without side-effects for this kind of things. >> >> Whoever calls .set_crc_source could do smarter things depending on the >> hook not being there vs. just silently plunging on. > > In this specific case, when CONFIG_DEBUG_FS=n it doesn't make any > sense to call that callback, so I think we should have a dummy > implementation to avoid adding an ifdef to the .c. We don't want the ifdef to the .c file, but we could do #ifdef CONFIG_DEBUG_FS int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name, size_t *values_cnt); #else #define intel_crtc_set_crc_source NULL #endif BR, Jani. -- Jani Nikula, Intel Open Source Technology Center