Commits · fb457e02f0ec09162734d7a0add1b0e39280c8d1 · Mirrors / github.com / c-sky_csky-linux

Apr 01, 2021

Merge tag 'exynos-drm-next-for-v5.13' of... · fb457e02

Dave Airlie authored Apr 01, 2021

Merge tag 'exynos-drm-next-for-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

One cleanup
- Based on the patch[1], clean up the use of request_irq function
  series.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next-history.git/commit/?id=cbe16f35bee6880becca6f20d2ebf6b457148552



Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1617092998-23645-1-git-send-email-inki.dae@samsung.com

fb457e02

Merge tag 'topic/i915-gem-next-2021-03-26' of ssh://git.freedesktop.org/git/drm/drm into drm-next · 2f835b5d

Dave Airlie authored Apr 01, 2021



special i915-gem-next pull as requested

- Conversion to dma_resv_locking, obj->mm.lock is gone (Maarten, with
  help from Thomas Hellström)
- watchdog (Tvrtko, one patch to cancel individual request from Chris)
- legacy ioctl cleanup (Jason+Ashutosh)
- i915-gem TODO and RFC process doc (me)
- i915_ prefix for vma_lookup (Liam Howlett) just because I spotted it
  and put it in here too

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/YF24MHoOSjpKFEXA@phenom.ffwll.local

2f835b5d

Mar 29, 2021

drm/exynos: move to use request_irq by IRQF_NO_AUTOEN flag · a4e5eed2

Tian Tao authored Mar 15, 2021



After this patch cbe16f35 genirq: Add IRQF_NO_AUTOEN for
request_irq/nmi() is merged. request_irq() after setting
IRQ_NOAUTOEN as below

irq_set_status_flags(irq, IRQ_NOAUTOEN);
request_irq(dev, irq...);
can be replaced by request_irq() with IRQF_NO_AUTOEN flag.

v2:
Fix the problem of using wrong flags

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

a4e5eed2

Merge tag 'irq-no-autoen-2021-03-25' of... · 99e5730d

Inki Dae authored Mar 29, 2021

Merge tag 'irq-no-autoen-2021-03-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into exynos-drm-next

Tag for the input subsystem to pick up

99e5730d

Merge tag 'drm-next-20210322' of git://linuxtv.org/pinchartl/media into drm-next · fe8a0578

Dave Airlie authored Mar 29, 2021

Conversion of misc display DT bindings to YAML

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YFgOFL/yMUkyxqK3@pendragon.ideasonboard.com

fe8a0578

Mar 26, 2021

Merge tag 'amd-drm-next-5.13-2021-03-23' of... · 2cbcb78c

Daniel Vetter authored Mar 26, 2021

Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-5.13-2021-03-23:

amdgpu:
- Debugfs cleanup
- Various cleanups and spelling fixes
- Flexible array cleanups
- Initial AMD Freesync HDMI
- Display fixes
- 10bpc dithering improvements
- Display ASSR support
- Clean up and unify powerplay and swsmu interfaces
- Vangogh fixes
- Add SMU gfx busy queues for RV/PCO
- PCIE DPM fixes
- S0ix fixes
- GPU metrics data fixes
- DCN secure display support
- Backlight type override
- Add initial support for Aldebaran
- RAS fixes
- Prime fixes for A+A systems
- Reset fixes
- Initial resource cursor support
- Drop legacy IO BAR requirements
- Various power fixes

amdkfd:
- MMU notifier fixes
- APU fixes

radeon:
- Debugfs cleanups
- Flexible array cleanups

UAPI:
- amdgpu: Add a new INFO ioctl interface to query video capabilities
  rather than hardcoding them in userspace.  This allows us to provide
  fine grained asic capabilities (e.g., if a particular part is
  bandwidth limited, we can limit the capabilities).  Proposed userspace:
  https://gitlab.freedesktop.org/leoliu/drm/-/commits/info_video_caps
  https://gitlab.freedesktop.org/leoliu/mesa/-/commits/info_video_caps
- amdkfd: bump the driver version.  There was a problem with reporting
  some RAS features on older versions of the driver. Proposed userspace:
  https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/commit/7cdd63475c36bb9f49bb960f90f9a8cdb7e80a21



Danvet: A bunch of conflicts all over, but it seems to compile ... I
did put the call to dc_allow_idle_optimizations() on a single line
since it looked a bit too jarring to be left alone.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324040147.1990338-1-alexander.deucher@amd.com

2cbcb78c

drm/doc: Add RFC section · e1a5e6a8

Daniel Vetter authored Mar 25, 2021



Motivated by the pre-review process for i915 gem/gt features, but
probably useful in general for complex stuff.

v2: Add reminder to not forget userspace projects in the discussion
(Simon, Jason)

v3: Actually put this into a folder, so we have it all (.rst files and
headers for kerneldoc) contained somewhere separate (Jason)

Cc: Simon Ser <contact@emersion.fr>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Cc: Dave Airlie <airlied@redhat.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Acked-by: Simon Ser <contact@emersion.fr>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210325225859.1684116-1-daniel.vetter@ffwll.ch

e1a5e6a8

drm/i915: add gem/gt TODO · 6ab61ad5

Daniel Vetter authored Mar 24, 2021



We've discussed a bit how to get the gem/gt team better integrated
and collaborate more with the wider community and agreed to the
following:

- all gem/gt patches are reviewed on dri-devel for now. That's
  overkill, but in the past there was definitely too little of that.

- i915-gem folks are encouraged to cross review core patches from
  other teams

- big features (especially uapi changes) need to be discussed in an
  rfc patch that documents the interface and big picture design,
  before we get lost in the details of the code

- Also a rough TODO (can be refined as we go ofc) to get gem/gt back
  on track, like we've e.g. done with DAL/DC to get that in shape.

v2:
- add dma_fence annotations (Dave)
- tasklet helpers (Jani on irc)

There was also a discussion about moving these into gitlab issues, or
gitlab issues as additional discussion place at least. For now it's
just the TODO file

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Cc: Dave Airlie <airlied@redhat.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324211041.1354941-1-daniel.vetter@ffwll.ch

6ab61ad5

drm/i915: Allow configuring default request expiry via modparam · 54d4e9f5

Tvrtko Ursulin authored Mar 24, 2021



Module parameter is added (request_timeout_ms) to allow configuring the
default request/fence expiry.

Default value is inherited from CONFIG_DRM_I915_REQUEST_TIMEOUT.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324121335.2307063-8-tvrtko.ursulin@linux.intel.com

54d4e9f5

drm/i915: Fail too long user submissions by default · e8dbb566

Tvrtko Ursulin authored Mar 24, 2021



A new Kconfig option CONFIG_DRM_I915_REQUEST_TIMEOUT is added, defaulting
to 20s, and this timeout is applied to all users contexts using the
previously added watchdog facility.

Result of this is that any user submission will simply fail after this
timeout, either causing a reset (for non-preemptable), or incomplete
results.

This can have an effect that workloads which used to work fine will
suddenly start failing. Even workloads comprised of short batches but in
long dependency chains can be terminated.

And because of lack of agreement on usefulness and safety of fence error
propagation this partial execution can be invisible to userspace even if
it is "listening" to returned fence status.

Another interaction is with hangcheck where care needs to be taken timeout
is not set lower or close to three times the heartbeat interval. Otherwise
a hang in any application can cause complete termination of all
submissions from unrelated clients. Any users modifying the per engine
heartbeat intervals therefore need to be aware of this potential denial of
service to avoid inadvertently enabling it.

Given all this I am personally not convinced the scheme is a good idea.
Intuitively it feels object importers would be better positioned to
enforce the time they are willing to wait for something to complete.

v2:
 * Improved commit message and Kconfig text.
 * Pull in some helper code from patch which got dropped.

v3:
 * Bump timeout to 20s to see if it helps Tigerlake.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324121335.2307063-7-tvrtko.ursulin@linux.intel.com

e8dbb566

drm/i915: Request watchdog infrastructure · 9b4d0598

Tvrtko Ursulin authored Mar 24, 2021



Prepares the plumbing for setting request/fence expiration time. All code
is put in place but is never activated due yet missing ability to actually
configure the timer.

Outline of the basic operation:

A timer is started when request is ready for execution. If the request
completes (retires) before the timer fires, timer is cancelled and nothing
further happens.

If the timer fires request is added to a lockless list and worker queued.
Purpose of this is twofold: a) It allows request cancellation from a more
friendly context and b) coalesces multiple expirations into a single event
of consuming the list.

Worker locklessly consumes the list of expired requests and cancels them
all using previous added i915_request_cancel().

Associated timeout value is stored in rq->context.watchdog.timeout_us.

v2:
 * Log expiration.

v3:
 * Include more information about user timeline in the log message.

v4:
 * Remove obsolete comment and fix formatting. (Matt)

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324121335.2307063-6-tvrtko.ursulin@linux.intel.com

9b4d0598

drm/i915: Handle async cancellation in sentinel assert · 90a79a91

Tvrtko Ursulin authored Mar 24, 2021



With the watchdog cancelling requests asynchronously to preempt-to-busy we
need to relax one assert making it apply only to requests not in error.

v2:
 * Check against the correct request!

v3:
 * Simplify the check to avoid the question of when to sample the fence
   error vs sentinel bit.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324121335.2307063-5-tvrtko.ursulin@linux.intel.com

90a79a91

drm/i915: Restrict sentinel requests further · 8f922e42

Tvrtko Ursulin authored Mar 24, 2021



Disallow sentinel requests follow previous sentinels to make request
cancellation work better when faced with a chain of requests which have
all been marked as in error.

Because in cases where we end up with a stream of cancelled requests we
want to turn off request coalescing so they each will get individually
skipped by the execlists_schedule_in (which is called per ELSP port, not
per request).

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
[danvet: Fix typo in the commit message that Matthew spotted.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324121335.2307063-4-tvrtko.ursulin@linux.intel.com

8f922e42

drm/i915: Individual request cancellation · 38b237ea

Chris Wilson authored Mar 24, 2021



Currently, we cancel outstanding requests within a context when the
context is closed. We may also want to cancel individual requests using
the same graceful preemption mechanism.

v2 (Tvrtko):
 * Cancel waiters carefully considering no timeline lock and RCU.
 * Fixed selftests.

v3 (Tvrtko):
 * Remove error propagation to waiters for now.

v4 (Tvrtko):
 * Rebase for extracted i915_request_active_engine. (Matt)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
[danvet: Resolve conflict because intel_engine_flush_scheduler is
still called intel_engine_flush_submission]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324121335.2307063-3-tvrtko.ursulin@linux.intel.com

38b237ea

drm/i915: Extract active lookup engine to a helper · 7dbc19da

Tvrtko Ursulin authored Mar 24, 2021



Move active engine lookup to exported i915_request_active_engine.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
[danvet: Slight rebase, engine->sched.lock is still called
engine->active.lock.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210324121335.2307063-2-tvrtko.ursulin@linux.intel.com

7dbc19da

Mar 25, 2021

drm/i915: Move gt_revoke() slightly · 5b0a78ec

Maarten Lankhorst authored Mar 23, 2021



We get a lockdep splat when the reset mutex is held, because it can be
taken from fence_wait. This conflicts with the mmu notifier we have,
because we recurse between reset mutex and mmap lock -> mmu notifier.

Remove this recursion by calling revoke_mmaps before taking the lock.

The reset code still needs fixing, as taking mmap locks during reset
is not allowed.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
[danvet: Add FIXME.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-64-maarten.lankhorst@linux.intel.com

5b0a78ec

drm/i915: Keep userpointer bindings if seqcount is unchanged, v2. · fd995a3c

Maarten Lankhorst authored Mar 23, 2021



Instead of force unbinding and rebinding every time, we try to check
if our notifier seqcount is still correct when pages are bound. This
way we only rebind userptr when we need to, and prevent stalls.

Changes since v1:
- Missing mutex_unlock, reported by kbuild.

Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@intel.com>
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-63-maarten.lankhorst@linux.intel.com

fd995a3c

drm/i915: Finally remove obj->mm.lock. · cf41a8f1

Maarten Lankhorst authored Mar 23, 2021

With all callers and selftests fixed to use ww locking, we can now
finally remove this lock.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-62-maarten.lankhorst@linux.intel.com

cf41a8f1

drm/i915/selftests: Prepare gtt tests for obj->mm.lock removal · 480ae795

Maarten Lankhorst authored Mar 23, 2021

We need to lock the global gtt dma_resv, use i915_vm_lock_objects
to handle this correctly. Add ww handling for this where required.

Add the object lock around unpin/put pages, and use the unlocked
versions of pin_pages and pin_map where required.

480ae795

drm/i915/selftests: Prepare cs engine tests for obj->mm.lock removal · b91e1b11

Maarten Lankhorst authored Mar 23, 2021

Same as other tests, use pin_map_unlocked.

b91e1b11

drm/i915/selftests: Prepare memory region tests for obj->mm.lock removal · e70a27d7

Maarten Lankhorst authored Mar 23, 2021

Use the unlocked variants for pin_map and pin_pages, and add lock
around unpinning/putting pages.

e70a27d7

drm/i915/selftests: Prepare i915_request tests for obj->mm.lock removal · aa8b70be

Maarten Lankhorst authored Mar 23, 2021

Straightforward conversion by using unlocked versions.

aa8b70be

drm/i915/selftests: Prepare timeline tests for obj->mm.lock removal · 1060974c

Maarten Lankhorst authored Mar 23, 2021

We can no longer call intel_timeline_pin with a null argument,
so add a ww loop that locks the backing object.

1060974c

drm/i915/selftests: Prepare ring submission for obj->mm.lock removal · 9aa6de99

Maarten Lankhorst authored Mar 23, 2021

Use unlocked versions when the ww lock is not held.

9aa6de99

drm/i915/selftests: Prepare mocs tests for obj->mm.lock removal · e20e9b15

Maarten Lankhorst authored Mar 23, 2021

Use pin_map_unlocked when we're not holding locks.

e20e9b15

drm/i915/selftests: Prepare execlists and lrc selftests for obj->mm.lock removal · e09e903a

Maarten Lankhorst authored Mar 23, 2021

Convert normal functions to unlocked versions where needed.

e09e903a

drm/i915/selftests: Prepare hangcheck for obj->mm.lock removal · 17b7ab92

Maarten Lankhorst authored Mar 23, 2021

Convert a few calls to use the unlocked versions.

17b7ab92

drm/i915/selftests: Prepare context selftest for obj->mm.lock removal · d3ad2956

Maarten Lankhorst authored Mar 23, 2021

Only needs to convert a single call to the unlocked version.

d3ad2956

drm/i915/selftests: Prepare igt_gem_utils for obj->mm.lock removal · af10e5a5

Maarten Lankhorst authored Mar 23, 2021

igt_emit_store_dw needs to use the unlocked version, as it's not
holding a lock. This fixes igt_gpu_fill_dw() which is used by
some other selftests.

af10e5a5

drm/i915/selftests: Prepare object blit tests for obj->mm.lock removal. · fa7371c3

Maarten Lankhorst authored Mar 23, 2021

Use some unlocked versions where we're not holding the ww lock.

fa7371c3

drm/i915/selftests: Prepare object tests for obj->mm.lock removal. · 30272919

Maarten Lankhorst authored Mar 23, 2021

Convert a single pin_pages call to use the unlocked version.

30272919

drm/i915/selftests: Prepare mman testcases for obj->mm.lock removal. · 6f791ffe

Maarten Lankhorst authored Mar 23, 2021

Ensure we hold the lock around put_pages, and use the unlocked wrappers
for pinning pages and mappings.

6f791ffe

drm/i915/selftests: Prepare execbuf tests for obj->mm.lock removal. · 1832f886

Maarten Lankhorst authored Mar 23, 2021

Also quite simple, a single call needs to use the unlocked version.

1832f886

drm/i915/selftests: Prepare dma-buf tests for obj->mm.lock removal. · e3729844

Maarten Lankhorst authored Mar 23, 2021

Use pin_pages_unlocked() where we don't have a lock.

e3729844

drm/i915/selftests: Prepare context tests for obj->mm.lock removal. · c2d0e9de

Maarten Lankhorst authored Jan 28, 2021

Straightforward conversion, just convert a bunch of calls to
unlocked versions.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210128162612.927917-45-maarten.lankhorst@linux.intel.com
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-45-maarten.lankhorst@linux.intel.com

c2d0e9de

drm/i915/selftests: Prepare coherency tests for obj->mm.lock removal. · 5521458d

Maarten Lankhorst authored Mar 23, 2021

Straightforward conversion, just convert a bunch of calls to
unlocked versions.

5521458d

drm/i915/selftests: Prepare client blit for obj->mm.lock removal. · 86f2f8df

Maarten Lankhorst authored Mar 23, 2021

Straightforward conversion, just convert a bunch of calls to
unlocked versions.

86f2f8df

drm/i915/selftests: Prepare huge_pages testcases for obj->mm.lock removal. · 6c12ada0

Maarten Lankhorst authored Mar 23, 2021

Straightforward conversion, just convert a bunch of calls to
unlocked versions.

6c12ada0

drm/i915: Use a single page table lock for each gtt. · 26ad4f8b

Maarten Lankhorst authored Mar 23, 2021



We may create page table objects on the fly, but we may need to
wait with the ww lock held. Instead of waiting on a freed obj
lock, ensure we have the same lock for each object to keep
-EDEADLK working. This ensures that i915_vma_pin_ww can lock
the page tables when required.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-41-maarten.lankhorst@linux.intel.com

26ad4f8b

drm/i915: Fix ww locking in shmem_create_from_object · 988d4ff6

Maarten Lankhorst authored Mar 23, 2021

Quick fix, just use the unlocked version.

988d4ff6