iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
984,806 Commits 104 Branches 1,843 Tags
Commit Graph

984806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Airlie
ef23d5008b drm-misc-next-fixes cherry picked from drm-misc-next for v5.12: 
- Assorted small fixes.
 - Disable and remove gma3600 support.
 - Fix CEC for vc4/hdmi.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEuXvWqAysSYEJGuVH/lWMcqZwE8MFAmAlT9AACgkQ/lWMcqZw
 E8OJWg//S98XkPuGyjuvGuBdjc5RU8mU76Zu849y7PYb0IW0Ep4QSss3Ustw1gu1
 9b7TaLzn9trU9L2p7DIKxPM1PypnkFtg+dY4EFeQk5mgSMwoybhe6vqaKV3M6d/v
 XjvDWHKuawLeMmoxg+l8X/YehLMzIIfd+EHWIH6NmqYClf4onzxntmsnH4oWy78c
 boVe1wkjyQIbgB8rp24QJlFpy2Eo/HofWjRHMgSIYm5hm985B3S9/xFlYf1WTXMw
 nTtbhzAyolYtYiw2obGKJvikrpaDPP1gz5ylWF+o5O4dtg1DH+OcDQ/g/sQhOcf1
 e6UD4NlwvIgOyn9OByPlxwjCJMMxiFJS0Nccp3kpGk35TnNK5t/i/jByadk92P+W
 if38lAHoVGkVEEfSYKhsSvgLJr43cV4O6/Nz0ZcNfi9XZLIsF7jXM6iVYrIK+Dns
 UQ6QIKSgag4RWeiqZFYmNx1oE2B/UEE2crwziAP1WymuK33idtAAJ5vazLTVLsNc
 exIxbVmw5/obUdblZNpFgRSM6KzucAeOlvdb6hPASJ9/Z2D3Uecp7L8fiQypSPAK
 vpXbQrrfDu0fFemwIyfMeCwfW0RkZmlaHXDAFh6fl9SUREeG6cNedYme62MDfr3h
 3tnoQkfiP/+hi1EiK42I7UGUAp+SZMZ5sGW9ENY/p0WKWSQTkGI=
 =YN2m
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-next-fixes-2021-02-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

drm-misc-next-fixes cherry picked from drm-misc-next for v5.12:
- Assorted small fixes.
- Disable and remove gma3600 support.
- Fix CEC for vc4/hdmi.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/dac2ae30-c5d9-4222-39e2-f64067310491@linux.intel.com
 2021-02-12 10:59:03 +10:00
Dave Airlie
ac35d19fe8 Merge branch '00.00-inst' of git://github.com/skeggsb/linux into drm-next 
Ben wrote:
The problem is that GA100 added enough new engine types and instances
that we would have begun to overflow various u64 bitfields used to
track the connections between various engines.

Rather than addressing subdevs by a unique index, we give
each subdev a type and instance id, and replace the use of bitfields
tied to subdev index with other methods.

Notable changes:
- replace subdev index with subdev type + instance id
- engines that turn out to be fused-off (can't detect until later in
init) no longer leave dangling pointers around
- new subdev/instance additions no longer need to be made in multiple places
- ampere engine topology is now being parsed

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv4c_Y923ng0rT1y23wktHHyjEMsusb0=9Z7kQaVbxyPyQ@mail.gmail.com
 2021-02-12 10:53:47 +10:00
Ben Skeggs
f6df392ddd drm/nouveau/top/ga100: initial support 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:50:04 +10:00
Ben Skeggs
18618fc6d1 drm/nouveau/top: add ioctrl/nvjpg 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:50:04 +10:00
Ben Skeggs
26fbb4c8c7 drm/nouveau/privring: rename from ibus 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:50:04 +10:00
Ben Skeggs
5ef25f068c drm/nouveau/nvkm: remove nvkm_subdev.index 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:50:04 +10:00
Ben Skeggs
be0ed63f9b drm/nouveau/nvkm: determine subdev id/order from layout 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:50:00 +10:00
Ben Skeggs
0fa5680c28 drm/nouveau/vic: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:50:00 +10:00
Ben Skeggs
8d6461d832 drm/nouveau/sw: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:50:00 +10:00
Ben Skeggs
d1866250a2 drm/nouveau/sec2: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:59 +10:00
Ben Skeggs
400c2a456c drm/nouveau/sec: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:59 +10:00
Ben Skeggs
e73d371a73 drm/nouveau/pm: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:59 +10:00
Ben Skeggs
ee532a8d0e drm/nouveau/nvenc: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:59 +10:00
Ben Skeggs
f8aeb13303 drm/nouveau/nvdec: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:59 +10:00
Ben Skeggs
b15147bd71 drm/nouveau/msvld: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:59 +10:00
Ben Skeggs
07a356bbe7 drm/nouveau/msppp: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:58 +10:00
Ben Skeggs
963216061c drm/nouveau/mspdec: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:58 +10:00
Ben Skeggs
e9e9a219e4 drm/nouveau/msenc: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:58 +10:00
Ben Skeggs
e5e95a7639 drm/nouveau/mpeg: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:58 +10:00
Ben Skeggs
aba5e97b89 drm/nouveau/me: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:58 +10:00
Ben Skeggs
ee307030e9 drm/nouveau/ifb: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:58 +10:00
Ben Skeggs
864d37c3d8 drm/nouveau/gr: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:58 +10:00
Ben Skeggs
f8fabd31fa drm/nouveau/fifo/gk104-: remove use of subdev index in runlist topology info 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:58 +10:00
Ben Skeggs
ba083ec7a6 drm/nouveau/fifo/gk104-: switch dev_top fault handling to type+inst 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:57 +10:00
Ben Skeggs
088bfe43f0 drm/nouveau/fifo/gf100-: switch static mmu fault id list to type+inst 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:57 +10:00
Ben Skeggs
c6198d3465 drm/nouveau/fifo/gf100: use fifo engine id for engine recovery mask 
Instead of subdev index.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:57 +10:00
Ben Skeggs
73529dffb6 drm/nouveau/fifo: use type+inst to determine context pointer offsets 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:57 +10:00
Ben Skeggs
ad3b0d331f drm/nouveau/fifo: turn chan subdev mask into engine mask 
This data is used to know which engines/classes are reachable on a given
channel's runlist, and needs to be replaced with something that doesn't
rely on subdev index.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:57 +10:00
Ben Skeggs
496162037c drm/nouveau/fifo: add id_engine hook 
Will be used by common code in subsequent commits to lookup driver
engine state from HW engine ID.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:57 +10:00
Ben Skeggs
3e7d4a0cad drm/nouveau/fifo: index backend engctx by engine id 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:57 +10:00
Ben Skeggs
2546db0e0f drm/nouveau/fifo: index base engctx by engine id 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:56 +10:00
Ben Skeggs
64f7c698be drm/nouveau/fifo: add engine_id hook 
Will be used by common code in subsequent commits to replace arrays
indexed by subdev index.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:56 +10:00
Ben Skeggs
ab0db2bd85 drm/nouveau/fifo: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:56 +10:00
Ben Skeggs
09f409d74d drm/nouveau/dma: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:56 +10:00
Ben Skeggs
a7f000ec56 drm/nouveau/disp: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:56 +10:00
Ben Skeggs
0b26ca68c9 drm/nouveau/cipher: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:56 +10:00
Ben Skeggs
608a29c2cb drm/nouveau/ce: make use of nvkm_subdev.inst 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:56 +10:00
Ben Skeggs
50551b15c7 drm/nouveau/ce: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:56 +10:00
Ben Skeggs
b7da823a3e drm/nouveau/falcon: use split type+inst when looking up PRI addr 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:55 +10:00
Ben Skeggs
fcc08a7c0d drm/nouveau/bsp,vp: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:55 +10:00
Ben Skeggs
d07be5d788 drm/nouveau/volt: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:55 +10:00
Ben Skeggs
601c2a06d2 drm/nouveau/top: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:55 +10:00
Ben Skeggs
9aad54d5c7 drm/nouveau/tmr: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:55 +10:00
Ben Skeggs
93834cb92d drm/nouveau/therm/gk104: use split subdev type+inst in cg engine lists 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:55 +10:00
Ben Skeggs
0aec69c76e drm/nouveau/therm: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:55 +10:00
Ben Skeggs
e4b15b4ca0 drm/nouveau/pmu: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:55 +10:00
Ben Skeggs
9b70cd54a1 drm/nouveau/pci: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:55 +10:00
Ben Skeggs
0a7bff10ae drm/nouveau/mxm: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:54 +10:00
Ben Skeggs
353108a49f drm/nouveau/mmu: index engref by subdev type 
None of the chipsets we use this on have instanced engines, so this is fine.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:54 +10:00
Ben Skeggs
6dd123ba8a drm/nouveau/mmu: switch to instanced constructor 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>
 2021-02-11 11:49:54 +10:00