[Intel-gfx] [PATCH v12 01/11] drm/i915: Create GEM runtime resume helper and handle GEM suspend/resume errors

Chris Wilson chris at chris-wilson.co.uk
Fri Sep 29 11:49:55 UTC 2017


Quoting Joonas Lahtinen (2017-09-29 12:43:48)
> On Thu, 2017-09-28 at 12:18 +0530, Sagar Arun Kamble wrote:
> > These changes are preparation to handle GuC suspend/resume. Prepared
> > helper i915_gem_runtime_resume to reinitialize suspended gem setup.
> > Returning status from i915_gem_runtime_suspend and i915_gem_resume.
> > This will be placeholder for handling any errors from uC suspend/resume
> > in upcoming patches. Restructured the suspend/resume routines w.r.t setup
> > creation and rollback order.
> > This also fixes issue of ordering of i915_gem_runtime_resume with
> > intel_runtime_pm_enable_interrupts.
> > 
> > v2: Fixed return from intel_runtime_resume. (Michał Winiarski)
> > 
> > v3: Not returning status from gem_runtime_resume. (Chris)
> > 
> > v4: Refined return from i915_gem_runtime_suspend. (Michal Wajdeczko)
> > 
> > Signed-off-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> > Cc: Chris Wilson <chris at chris-wilson.co.uk>
> > Cc: Imre Deak <imre.deak at intel.com>
> > Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> > Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> > Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> > Cc: Michał Winiarski <michal.winiarski at intel.com>
> 
> <SNIP>
> 
> > @@ -1666,7 +1667,9 @@ static int i915_drm_resume(struct drm_device *dev)
> >  
> >       intel_csr_ucode_resume(dev_priv);
> >  
> > -     i915_gem_resume(dev_priv);
> > +     ret = i915_gem_resume(dev_priv);
> > +     if (ret)
> > +             dev_err(&pdev->dev, "GEM resume failed\n");
> 
> Not DRM_ERROR like other paths?

Bah, we really need to migrate to dev_err() like all the other cool
drivers.

DRM_DEV_ERROR()

The uppercase is an eyesore, but for an error message, acceptable.
Similarly any user output like DRM_DEV_INFO() could reasonably be shouty
so that it is not missed. So maybe the uppercase is always justified.
-Chris


More information about the Intel-gfx mailing list