From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63919C33CB2 for ; Tue, 14 Jan 2020 07:51:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3E286206D7 for ; Tue, 14 Jan 2020 07:51:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E286206D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 64B556E2DA; Tue, 14 Jan 2020 07:51:06 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E1ED6E2DA; Tue, 14 Jan 2020 07:51:05 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2020 23:51:03 -0800 X-IronPort-AV: E=Sophos;i="5.69,432,1571727600"; d="scan'208";a="217662278" Received: from huse-mobl2.ger.corp.intel.com (HELO localhost) ([10.252.50.31]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2020 23:50:58 -0800 From: Jani Nikula To: "Bharadiya\,Pankaj" Subject: Re: [Intel-gfx] [PATCH 2/6] drm/i915: add helper functions to get device ptr In-Reply-To: <20200113183158.GA739@plaxmina-desktop.iind.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200113115557.32713-1-pankaj.laxminarayan.bharadiya@intel.com> <20200113115557.32713-3-pankaj.laxminarayan.bharadiya@intel.com> <87imlfmu2s.fsf@intel.com> <20200113183158.GA739@plaxmina-desktop.iind.intel.com> Date: Tue, 14 Jan 2020 09:51:29 +0200 Message-ID: <87o8v6jx1a.fsf@intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pankaj.laxminaryan.bharadiya@outlook.iglb.intel.com, David Airlie , intel-gfx@lists.freedesktop.org, sudeep.dutt@intel.com, dri-devel@lists.freedesktop.org, Rodrigo Vivi , sam@ravnborg.org, Zhi Wang Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Tue, 14 Jan 2020, "Bharadiya,Pankaj" wrote: > Hi Jani, > > On Mon, Jan 13, 2020 at 02:14:51PM +0200, Jani Nikula wrote: >> On Mon, 13 Jan 2020, Pankaj Bharadiya wrote: >> > We will need struct drm_device pointer to pass it to drm_WARN* calls. >> > >> > Add helper functions to exract drm_device pointer from various structs. >> >> Please don't do this. >> >> We use the helpers we currently have when they involve something more >> complex than dereferences, such as container_of() or having to use >> dev_get_drvdata() or pci_get_drvdata(). > > Removing all the helpers will lead to 3 level access depth wherever > struct drm_device pointer is needed and unnecessary complicate the > drm_WARN* calls IMHO. > > e.g.: drm_WARN(&vgpu->gvt->dev_priv.drm, 1) > > If you are OK with this, I will remove all the helpers and extract > drm_device pointer while calling drm_WARN*() instead and submit > updated patch series. At times you may need to add local variables for struct drm_i915_private *i915. But I'd rather have that than the helpers. BR, Jani. > > Thanks, > Pankaj >> >> I really don't want people to use e.g. >> >> i915_to_dev(i915) >> >> over >> >> &i915->drm >> >> >> BR, >> Jani. >> >> > >> > Signed-off-by: Pankaj Bharadiya >> > --- >> > drivers/gpu/drm/i915/display/intel_display_types.h | 14 ++++++++++++++ >> > drivers/gpu/drm/i915/gvt/gvt.h | 5 +++++ >> > drivers/gpu/drm/i915/i915_drv.h | 11 +++++++++++ >> > 3 files changed, 30 insertions(+) >> > >> > diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h >> > index 7964b3dc0046..765878718fe9 100644 >> > --- a/drivers/gpu/drm/i915/display/intel_display_types.h >> > +++ b/drivers/gpu/drm/i915/display/intel_display_types.h >> > @@ -1521,6 +1521,20 @@ dp_to_i915(struct intel_dp *intel_dp) >> > return to_i915(dp_to_dig_port(intel_dp)->base.base.dev); >> > } >> > >> > +static inline struct drm_device *enc_to_dev(const struct intel_encoder *encoder) >> > +{ >> > + return encoder->base.dev; >> > +} >> > + >> > +static inline struct drm_device * >> > +crtc_state_to_dev(const struct intel_crtc_state *state) >> > +{ >> > + struct intel_crtc *crtc = to_intel_crtc(state->uapi.crtc); >> > + struct drm_i915_private *i915 = to_i915(crtc->base.dev); >> > + >> > + return i915_to_dev(i915); >> > +} >> > + >> > static inline struct intel_digital_port * >> > hdmi_to_dig_port(struct intel_hdmi *intel_hdmi) >> > { >> > diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h >> > index b47c6acaf9c0..d257399b075a 100644 >> > --- a/drivers/gpu/drm/i915/gvt/gvt.h >> > +++ b/drivers/gpu/drm/i915/gvt/gvt.h >> > @@ -348,6 +348,11 @@ static inline struct intel_gvt *to_gvt(struct drm_i915_private *i915) >> > return i915->gvt; >> > } >> > >> > +static inline struct drm_device *vgpu_to_dev(const struct intel_vgpu *vgpu) >> > +{ >> > + return i915_to_dev(vgpu->gvt->dev_priv); >> > +} >> > + >> > enum { >> > INTEL_GVT_REQUEST_EMULATE_VBLANK = 0, >> > >> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> > index e7be4c3e43c6..bdc89d021ff8 100644 >> > --- a/drivers/gpu/drm/i915/i915_drv.h >> > +++ b/drivers/gpu/drm/i915/i915_drv.h >> > @@ -1325,6 +1325,17 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) >> > return pci_get_drvdata(pdev); >> > } >> > >> > +static inline struct drm_device *i915_to_dev(struct drm_i915_private *i915) >> > +{ >> > + return &i915->drm; >> > +} >> > + >> > +static inline struct drm_device * >> > +perf_stream_to_dev(const struct i915_perf_stream *stream) >> > +{ >> > + return i915_to_dev(stream->perf->i915); >> > +} >> > + >> > /* Simple iterator over all initialised engines */ >> > #define for_each_engine(engine__, dev_priv__, id__) \ >> > for ((id__) = 0; \ >> >> -- >> Jani Nikula, Intel Open Source Graphics Center -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel