On Tue, 08 Feb 2022, Namhyung Kim <namhyung@xxxxxxxxxx> wrote: > With upcoming lock tracepoints config, it'd define some of lockdep > functions without enabling CONFIG_LOCKDEP actually. The existing code > assumes those functions will be removed by the preprocessor but it's > not the case anymore. Let's protect the code with #ifdef's explicitly. I don't understand why you can't keep the no-op stubs for CONFIG_LOCKDEP=n. BR, Jani. > > Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx> > Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> > Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> > Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxxxxx> > Cc: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_wakeref.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/intel_wakeref.c b/drivers/gpu/drm/i915/intel_wakeref.c > index dfd87d082218..6e4b8d036283 100644 > --- a/drivers/gpu/drm/i915/intel_wakeref.c > +++ b/drivers/gpu/drm/i915/intel_wakeref.c > @@ -106,8 +106,11 @@ void __intel_wakeref_init(struct intel_wakeref *wf, > wf->wakeref = 0; > > INIT_DELAYED_WORK(&wf->work, __intel_wakeref_put_work); > + > +#ifdef CONFIG_LOCKDEP > lockdep_init_map(&wf->work.work.lockdep_map, > "wakeref.work", &key->work, 0); > +#endif > } > > int intel_wakeref_wait_for_idle(struct intel_wakeref *wf) -- Jani Nikula, Intel Open Source Graphics Center
