mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 09:35:25 +07:00
1264f8325e
Ctxdmas for cursors from all heads are setup in the core channel, and due
to us tracking allocated handles per-window, we were failing with -EEXIST
on multiple-head setups trying to allocate duplicate handles.
The cursor code is hardcoded to use the core channel vram ctxdma already,
so just skip ctxdma allocation for cursor fbs to fix the issue.
Fixes: 5bca1621c0 ("drm/nouveau/kms/nv50-: move fb ctxdma tracking into windows")
Reported-by: Adam Borowski <kilobyte@angband.pl>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
146 lines
4.0 KiB
C
146 lines
4.0 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/cl507a.h>
|
|
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_plane_helper.h>
|
|
|
|
static void
|
|
curs507a_update(struct nv50_wndw *wndw, u32 *interlock)
|
|
{
|
|
nvif_wr32(&wndw->wimm.base.user, 0x0080, 0x00000000);
|
|
}
|
|
|
|
static void
|
|
curs507a_point(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
|
|
{
|
|
nvif_wr32(&wndw->wimm.base.user, 0x0084, asyw->point.y << 16 |
|
|
asyw->point.x);
|
|
}
|
|
|
|
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;
|
|
}
|
|
}
|
|
|
|
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 nv50_head *head = nv50_head(asyw->state.crtc);
|
|
int ret;
|
|
|
|
ret = drm_atomic_helper_check_plane_state(&asyw->state, &asyh->state,
|
|
DRM_PLANE_HELPER_NO_SCALING,
|
|
DRM_PLANE_HELPER_NO_SCALING,
|
|
true, true);
|
|
asyh->curs.visible = asyw->state.visible;
|
|
if (ret || !asyh->curs.visible)
|
|
return ret;
|
|
|
|
if (asyw->image.w != asyw->image.h)
|
|
return -EINVAL;
|
|
|
|
ret = head->func->curs_layout(head, asyw, asyh);
|
|
if (ret)
|
|
return ret;
|
|
|
|
return head->func->curs_format(head, asyw, asyh);
|
|
}
|
|
|
|
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 nv50_disp_cursor_v0 args = {
|
|
.head = 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_init(&disp->disp->object, 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);
|
|
}
|