mirror of
https://github.com/torvalds/linux.git
synced 2026-05-02 13:32:40 -04:00
For a while, I've been seeing a strange issue where some (usually not all)
of the display DMA channels will suddenly hang, particularly when there is
a visible cursor on the screen that is being frequently updated, and
especially when said cursor happens to go between two screens. While this
brings back lovely memories of fixing Intel Skylake bugs, I would quite
like to fix it :).
It turns out the problem that's happening here is that we're managing to
reach nv50_head_flush_set() in our atomic commit path without actually
holding nv50_disp->mutex. This means that cursor updates happening in
parallel (along with any other atomic updates that need to use the core
channel) will race with eachother, which eventually causes us to corrupt
the pushbuffer - leading to a plethora of various GSP errors, usually:
nouveau 0000:c1:00.0: gsp: Xid:56 CMDre 00000000 00000218 00102680 00000004 00800003
nouveau 0000:c1:00.0: gsp: Xid:56 CMDre 00000000 0000021c 00040509 00000004 00000001
nouveau 0000:c1:00.0: gsp: Xid:56 CMDre 00000000 00000000 00000000 00000001 00000001
The reason this is happening is because generally we check whether we need
to set nv50_atom->lock_core at the end of nv50_head_atomic_check().
However, curs507a_prepare is called from the fb_prepare callback, which
happens after the atomic check phase. As a result, this can lead to commits
that both touch the core channel but also don't grab nv50_disp->mutex.
So, fix this by making sure that we set nv50_atom->lock_core in
cus507a_prepare().
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Fixes: 1590700d94 ("drm/nouveau/kms/nv50-: split each resource type into their own source files")
Cc: <stable@vger.kernel.org> # v4.18+
Link: https://patch.msgid.link/20251219215344.170852-2-lyude@redhat.com
207 lines
5.7 KiB
C
207 lines
5.7 KiB
C
/*
|
|
* Copyright 2018 Red Hat Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
#include "curs.h"
|
|
#include "core.h"
|
|
#include "head.h"
|
|
|
|
#include <nvif/if0014.h>
|
|
#include <nvif/timer.h>
|
|
|
|
#include <nvhw/class/cl507a.h>
|
|
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_fourcc.h>
|
|
|
|
bool
|
|
curs507a_space(struct nv50_wndw *wndw)
|
|
{
|
|
nvif_msec(&nouveau_drm(wndw->plane.dev)->client.device, 100,
|
|
if (NVIF_TV32(&wndw->wimm.base.user, NV507A, FREE, COUNT, >=, 4))
|
|
return true;
|
|
);
|
|
|
|
WARN_ON(1);
|
|
return false;
|
|
}
|
|
|
|
static int
|
|
curs507a_update(struct nv50_wndw *wndw, u32 *interlock)
|
|
{
|
|
struct nvif_object *user = &wndw->wimm.base.user;
|
|
int ret = nvif_chan_wait(&wndw->wimm, 1);
|
|
if (ret == 0) {
|
|
NVIF_WR32(user, NV507A, UPDATE,
|
|
NVDEF(NV507A, UPDATE, INTERLOCK_WITH_CORE, DISABLE));
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
curs507a_point(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
|
|
{
|
|
struct nvif_object *user = &wndw->wimm.base.user;
|
|
int ret = nvif_chan_wait(&wndw->wimm, 1);
|
|
if (ret == 0) {
|
|
NVIF_WR32(user, NV507A, SET_CURSOR_HOT_SPOT_POINT_OUT,
|
|
NVVAL(NV507A, SET_CURSOR_HOT_SPOT_POINT_OUT, X, asyw->point.x) |
|
|
NVVAL(NV507A, SET_CURSOR_HOT_SPOT_POINT_OUT, Y, asyw->point.y));
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
const struct nv50_wimm_func
|
|
curs507a = {
|
|
.point = curs507a_point,
|
|
.update = curs507a_update,
|
|
};
|
|
|
|
static void
|
|
curs507a_prepare(struct nv50_wndw *wndw, struct nv50_head_atom *asyh,
|
|
struct nv50_wndw_atom *asyw)
|
|
{
|
|
u32 handle = nv50_disp(wndw->plane.dev)->core->chan.vram.handle;
|
|
u32 offset = asyw->image.offset[0];
|
|
if (asyh->curs.handle != handle || asyh->curs.offset != offset) {
|
|
asyh->curs.handle = handle;
|
|
asyh->curs.offset = offset;
|
|
asyh->set.curs = asyh->curs.visible;
|
|
nv50_atom(asyh->state.state)->lock_core = true;
|
|
}
|
|
}
|
|
|
|
static void
|
|
curs507a_release(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
|
|
struct nv50_head_atom *asyh)
|
|
{
|
|
asyh->curs.visible = false;
|
|
}
|
|
|
|
static int
|
|
curs507a_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
|
|
struct nv50_head_atom *asyh)
|
|
{
|
|
struct nouveau_drm *drm = nouveau_drm(wndw->plane.dev);
|
|
struct nv50_head *head = nv50_head(asyw->state.crtc);
|
|
struct drm_framebuffer *fb = asyw->state.fb;
|
|
int ret;
|
|
|
|
ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
|
|
DRM_PLANE_NO_SCALING,
|
|
DRM_PLANE_NO_SCALING,
|
|
true, true);
|
|
asyh->curs.visible = asyw->state.visible;
|
|
if (ret || !asyh->curs.visible)
|
|
return ret;
|
|
|
|
if (asyw->state.crtc_w != asyw->state.crtc_h) {
|
|
NV_ATOMIC(drm, "Plane width/height must be equal for cursors\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (asyw->image.w != asyw->state.crtc_w) {
|
|
NV_ATOMIC(drm, "Plane width must be equal to fb width for cursors (height can be larger though)\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (asyw->state.src_x || asyw->state.src_y) {
|
|
NV_ATOMIC(drm, "Cursor planes do not support framebuffer offsets\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
if (asyw->image.pitch[0] != asyw->image.w * fb->format->cpp[0]) {
|
|
NV_ATOMIC(drm,
|
|
"%s: invalid cursor image pitch: image must be packed (pitch = %d, width = %d)\n",
|
|
wndw->plane.name, asyw->image.pitch[0], asyw->image.w);
|
|
return -EINVAL;
|
|
}
|
|
|
|
ret = head->func->curs_layout(head, asyw, asyh);
|
|
if (ret) {
|
|
NV_ATOMIC(drm,
|
|
"%s: invalid cursor image size: unsupported size %dx%d\n",
|
|
wndw->plane.name, asyw->image.w, asyw->image.h);
|
|
return ret;
|
|
}
|
|
|
|
ret = head->func->curs_format(head, asyw, asyh);
|
|
if (ret) {
|
|
NV_ATOMIC(drm,
|
|
"%s: invalid cursor image format 0x%X\n",
|
|
wndw->plane.name, fb->format->format);
|
|
return ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const u32
|
|
curs507a_format[] = {
|
|
DRM_FORMAT_ARGB8888,
|
|
0
|
|
};
|
|
|
|
static const struct nv50_wndw_func
|
|
curs507a_wndw = {
|
|
.acquire = curs507a_acquire,
|
|
.release = curs507a_release,
|
|
.prepare = curs507a_prepare,
|
|
};
|
|
|
|
int
|
|
curs507a_new_(const struct nv50_wimm_func *func, struct nouveau_drm *drm,
|
|
int head, s32 oclass, u32 interlock_data,
|
|
struct nv50_wndw **pwndw)
|
|
{
|
|
struct nvif_disp_chan_v0 args = {
|
|
.id = head,
|
|
};
|
|
struct nv50_disp *disp = nv50_disp(drm->dev);
|
|
struct nv50_wndw *wndw;
|
|
int ret;
|
|
|
|
ret = nv50_wndw_new_(&curs507a_wndw, drm->dev, DRM_PLANE_TYPE_CURSOR,
|
|
"curs", head, curs507a_format, BIT(head),
|
|
NV50_DISP_INTERLOCK_CURS, interlock_data, &wndw);
|
|
if (*pwndw = wndw, ret)
|
|
return ret;
|
|
|
|
ret = nvif_object_ctor(&disp->disp->object, "kmsCurs", 0, oclass,
|
|
&args, sizeof(args), &wndw->wimm.base.user);
|
|
if (ret) {
|
|
NV_ERROR(drm, "curs%04x allocation failed: %d\n", oclass, ret);
|
|
return ret;
|
|
}
|
|
|
|
nvif_object_map(&wndw->wimm.base.user, NULL, 0);
|
|
wndw->immd = func;
|
|
wndw->ctxdma.parent = NULL;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
curs507a_new(struct nouveau_drm *drm, int head, s32 oclass,
|
|
struct nv50_wndw **pwndw)
|
|
{
|
|
return curs507a_new_(&curs507a, drm, head, oclass,
|
|
0x00000001 << (head * 8), pwndw);
|
|
}
|