[Intel-xe] [PATCH 1/8] fixup! drm/xe/display: Implement display support

[Jani Nikula]

On Tue, 07 Nov 2023, "Hogander, Jouni" <jouni.hogander at intel.com> wrote:
> On Tue, 2023-11-07 at 14:54 +0200, Jani Nikula wrote:
>> On Mon, 06 Nov 2023, Jouni Högander <jouni.hogander at intel.com> wrote:
>> > Using i915_fence_timeout causes linking error as
>> > i915_fence_context_timeout
>> > doesn't exist for Xe. Return just MAX_SCHEDULE_TIMEOUT.
>> 
>> Considering the implementation of i915_fence_context_timeout(), isn't
>> 0
>> more appropriate?
>
> I choose MAX_SCHEDULE_TIMEOUT as current Xe code is using that:
>
> dma_resv_wait_timeout(bo->ttm.base.resv, DMA_RESV_USAGE_KERNEL, false,
> MAX_SCHEDULE_TIMEOUT);
>
> 0 would just return immediately.

So xe and i915 behave differently here. Okay.

I guess go with what xe does. Ack.

>
> BR,
>
> Jouni Högander
>
>> 
>> BR,
>> Jani.
>> 
>> > 
>> > Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
>> > ---
>> >  drivers/gpu/drm/xe/compat-i915-headers/i915_config.h | 8 ++------
>> >  1 file changed, 2 insertions(+), 6 deletions(-)
>> > 
>> > diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h
>> > b/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h
>> > index 10e18b036489..e835bea08d1b 100644
>> > --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h
>> > +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_config.h
>> > @@ -6,18 +6,14 @@
>> >  #ifndef __I915_CONFIG_H__
>> >  #define __I915_CONFIG_H__
>> >  
>> > -#include <linux/types.h>
>> > -#include <linux/limits.h>
>> > +#include <linux/sched.h>
>> >  
>> >  struct drm_i915_private;
>> >  
>> > -unsigned long i915_fence_context_timeout(const struct
>> > drm_i915_private *i915,
>> > -                                        u64 context);
>> > -
>> >  static inline unsigned long
>> >  i915_fence_timeout(const struct drm_i915_private *i915)
>> >  {
>> > -       return i915_fence_context_timeout(i915, U64_MAX);
>> > +       return MAX_SCHEDULE_TIMEOUT;
>> >  }
>> >  
>> >  #endif /* __I915_CONFIG_H__ */
>> 
>

-- 
Jani Nikula, Intel