korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-22 10:34:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

nouveau/dispnv50: add cursor pitch check

Browse Source 
The hardware needs a FB which is packed. Add checks to make sure
this is the case.

While at it, add debug logs for the existing checks. This allows
user-space to more easily figure out why a configuration is
rejected.

v2:
- Use drm_format_info instead of hardcoding bytes-per-pixel (Ilia)
- Remove unnecessary size check (Ilia)

v3:
- Add missing newlines in debug messages (Lyude)
- Use NV_ATOMIC (Lyude)
- Add missing debug log for invalid format (Ilia)

v4: add plane name in debug messages (Ilia)

Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: Ben Skeggs <bskeggs@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210205224140.28174-1-contact@emersion.fr
This commit is contained in:
Simon Ser 2021-02-05 23:41:40 +01:00
parent 70d1ace56d
commit 815d091f90
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/gpu/drm/nouveau/dispnv50/curs507a.c
View File

@ -29,6 +29,7 @@
#include <nvhw/class/cl507a.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_fourcc.h>
bool
curs507a_space(struct nv50_wndw *wndw)
@ -99,6 +100,7 @@ curs507a_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
{
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,
@ -124,11 +126,30 @@ curs507a_acquire(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
return -EINVAL;
}
ret = head->func->curs_layout(head, asyw, asyh);
if (ret)
return ret;
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;
}
return head->func->curs_format(head, asyw, asyh);
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