]> git.baikalelectronics.ru Git - kernel.git/commit
drm/nouveau/kms/gk104-gp1xx: Fix > 64x64 cursors
authorLyude Paul <lyude@redhat.com>
Tue, 19 Jan 2021 01:54:14 +0000 (20:54 -0500)
committerBen Skeggs <bskeggs@redhat.com>
Fri, 29 Jan 2021 01:03:11 +0000 (11:03 +1000)
commit6a0268ca701c0a0018b3d287d0fa64c8155e46c7
tree30f26b912a2e5b6a9510a86b5e51a0755bb1d7a9
parentae8ce11332aebb4679bbcf483f29d9d3085d44af
drm/nouveau/kms/gk104-gp1xx: Fix > 64x64 cursors

While we do handle the additional cursor sizes introduced in NVE4, it looks
like we accidentally broke this when converting over to use Nvidia's
display headers. Since we now use NVVAL in dispnv50/head907d.c in order to
format the value for the cursor layout and NVD9 only had one byte reserved
vs. the 2 bytes reserved in later generations, we end up accidentally
stripping the second bit in the cursor layout format parameter - causing us
to set the wrong cursor size.

This fixes that by adding our own curs_set hook for 917d which uses the
NV917D headers.

Cc: Martin Peres <martin.peres@free.fr>
Cc: Jeremy Cline <jcline@redhat.com>
Cc: Simon Ser <contact@emersion.fr>
Cc: <stable@vger.kernel.org> # v5.9+
Signed-off-by: Lyude Paul <lyude@redhat.com>
Fixes: 390704f224e4 ("drm/nouveau/kms/nv50-: use NVIDIA's headers for core head_curs_set()")
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/dispnv50/head917d.c
drivers/gpu/drm/nouveau/include/nvhw/class/cl917d.h