On Mon, 06 Jan 2020, Pankaj Bharadiya pankaj.laxminarayan.bharadiya@intel.com wrote:
We will need struct device pointer to pass it to dev_WARN* calls.
Add helper functions to exract device pointer from various structs.
Please focus on using and adding helpers to get the struct drm_i915_private * pointer, and use that instead.
We've significantly consolidated on passing i915 around instead of struct drm_device or struct device.
BR, Jani.
Signed-off-by: Pankaj Bharadiya pankaj.laxminarayan.bharadiya@intel.com
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 630a94892b7b..6cca8921f3c6 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -1523,6 +1523,20 @@ dp_to_i915(struct intel_dp *intel_dp) return to_i915(dp_to_dig_port(intel_dp)->base.base.dev); }
+static inline struct device *enc_to_dev(const struct intel_encoder *encoder) +{
- return encoder->base.dev->dev;
+}
+static inline struct 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..2900ef848e84 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 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 b7f122dccdca..bd4557d6f35b 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1314,6 +1314,17 @@ static inline struct drm_i915_private *pdev_to_i915(struct pci_dev *pdev) return pci_get_drvdata(pdev); }
+static inline struct device *i915_to_dev(const struct drm_i915_private *i915) +{
- return i915->drm.dev;
+}
+static inline struct 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; \