| Message ID | 20201130111601.2817-9-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3,01/10] drm/i915/debugfs: remove RPS autotuning details from i915_rps_boost_info | expand |
On Mon, 30 Nov 2020, Jani Nikula <jani.nikula@intel.com> wrote: > Let's avoid adding new I915_WRITE uses while we try to get rid of them. > > Fixes: 5f60b12edcd0 ("drm/i915/gvt: Save/restore HW status to support GVT suspend/resume") > Cc: Zhenyu Wang <zhenyuw@linux.intel.com> > Cc: Hang Yuan <hang.yuan@linux.intel.com> > Cc: Colin Xu <colin.xu@intel.com> > Cc: Zhi Wang <zhi.a.wang@intel.com> > Cc: intel-gvt-dev@lists.freedesktop.org > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Pushed up to, but *excluding* this patch to dinq. Thanks for the reviews. Zhenyu, Zhi, may I have your review/ack for merging this one directly via dinq to not add a dependency on the gvt tree? BR, Jani. > --- > drivers/gpu/drm/i915/gvt/handlers.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c > index 6f0706e885cb..eba626ba640f 100644 > --- a/drivers/gpu/drm/i915/gvt/handlers.c > +++ b/drivers/gpu/drm/i915/gvt/handlers.c > @@ -3693,7 +3693,7 @@ static inline int mmio_pm_restore_handler(struct intel_gvt *gvt, > struct drm_i915_private *dev_priv = gvt->gt->i915; > > if (gvt->mmio.mmio_attribute[offset >> 2] & F_PM_SAVE) > - I915_WRITE(_MMIO(offset), vgpu_vreg(vgpu, offset)); > + intel_uncore_write(&dev_priv->uncore, _MMIO(offset), vgpu_vreg(vgpu, offset)); > > return 0; > }
On 2020.12.01 18:16:35 +0200, Jani Nikula wrote: > On Mon, 30 Nov 2020, Jani Nikula <jani.nikula@intel.com> wrote: > > Let's avoid adding new I915_WRITE uses while we try to get rid of them. > > > > Fixes: 5f60b12edcd0 ("drm/i915/gvt: Save/restore HW status to support GVT suspend/resume") > > Cc: Zhenyu Wang <zhenyuw@linux.intel.com> > > Cc: Hang Yuan <hang.yuan@linux.intel.com> > > Cc: Colin Xu <colin.xu@intel.com> > > Cc: Zhi Wang <zhi.a.wang@intel.com> > > Cc: intel-gvt-dev@lists.freedesktop.org > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Pushed up to, but *excluding* this patch to dinq. Thanks for the > reviews. > > Zhenyu, Zhi, may I have your review/ack for merging this one directly > via dinq to not add a dependency on the gvt tree? > Yep, that's fine to me. Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com> > > BR, > Jani. > > > > --- > > drivers/gpu/drm/i915/gvt/handlers.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c > > index 6f0706e885cb..eba626ba640f 100644 > > --- a/drivers/gpu/drm/i915/gvt/handlers.c > > +++ b/drivers/gpu/drm/i915/gvt/handlers.c > > @@ -3693,7 +3693,7 @@ static inline int mmio_pm_restore_handler(struct intel_gvt *gvt, > > struct drm_i915_private *dev_priv = gvt->gt->i915; > > > > if (gvt->mmio.mmio_attribute[offset >> 2] & F_PM_SAVE) > > - I915_WRITE(_MMIO(offset), vgpu_vreg(vgpu, offset)); > > + intel_uncore_write(&dev_priv->uncore, _MMIO(offset), vgpu_vreg(vgpu, offset)); > > > > return 0; > > } > > -- > Jani Nikula, Intel Open Source Graphics Center
On Wed, 02 Dec 2020, Zhenyu Wang <zhenyuw@linux.intel.com> wrote: > On 2020.12.01 18:16:35 +0200, Jani Nikula wrote: >> On Mon, 30 Nov 2020, Jani Nikula <jani.nikula@intel.com> wrote: >> > Let's avoid adding new I915_WRITE uses while we try to get rid of them. >> > >> > Fixes: 5f60b12edcd0 ("drm/i915/gvt: Save/restore HW status to support GVT suspend/resume") >> > Cc: Zhenyu Wang <zhenyuw@linux.intel.com> >> > Cc: Hang Yuan <hang.yuan@linux.intel.com> >> > Cc: Colin Xu <colin.xu@intel.com> >> > Cc: Zhi Wang <zhi.a.wang@intel.com> >> > Cc: intel-gvt-dev@lists.freedesktop.org >> > Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> >> Pushed up to, but *excluding* this patch to dinq. Thanks for the >> reviews. >> >> Zhenyu, Zhi, may I have your review/ack for merging this one directly >> via dinq to not add a dependency on the gvt tree? >> > > Yep, that's fine to me. > > Reviewed-by: Zhenyu Wang <zhenyuw@linux.intel.com> Thanks, pushed to dinq. BR, Jani. > >> >> BR, >> Jani. >> >> >> > --- >> > drivers/gpu/drm/i915/gvt/handlers.c | 2 +- >> > 1 file changed, 1 insertion(+), 1 deletion(-) >> > >> > diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c >> > index 6f0706e885cb..eba626ba640f 100644 >> > --- a/drivers/gpu/drm/i915/gvt/handlers.c >> > +++ b/drivers/gpu/drm/i915/gvt/handlers.c >> > @@ -3693,7 +3693,7 @@ static inline int mmio_pm_restore_handler(struct intel_gvt *gvt, >> > struct drm_i915_private *dev_priv = gvt->gt->i915; >> > >> > if (gvt->mmio.mmio_attribute[offset >> 2] & F_PM_SAVE) >> > - I915_WRITE(_MMIO(offset), vgpu_vreg(vgpu, offset)); >> > + intel_uncore_write(&dev_priv->uncore, _MMIO(offset), vgpu_vreg(vgpu, offset)); >> > >> > return 0; >> > } >> >> -- >> Jani Nikula, Intel Open Source Graphics Center
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c index 6f0706e885cb..eba626ba640f 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c @@ -3693,7 +3693,7 @@ static inline int mmio_pm_restore_handler(struct intel_gvt *gvt, struct drm_i915_private *dev_priv = gvt->gt->i915; if (gvt->mmio.mmio_attribute[offset >> 2] & F_PM_SAVE) - I915_WRITE(_MMIO(offset), vgpu_vreg(vgpu, offset)); + intel_uncore_write(&dev_priv->uncore, _MMIO(offset), vgpu_vreg(vgpu, offset)); return 0; }
Let's avoid adding new I915_WRITE uses while we try to get rid of them. Fixes: 5f60b12edcd0 ("drm/i915/gvt: Save/restore HW status to support GVT suspend/resume") Cc: Zhenyu Wang <zhenyuw@linux.intel.com> Cc: Hang Yuan <hang.yuan@linux.intel.com> Cc: Colin Xu <colin.xu@intel.com> Cc: Zhi Wang <zhi.a.wang@intel.com> Cc: intel-gvt-dev@lists.freedesktop.org Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/gvt/handlers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)