UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

* atomic helpers: Fix error messages 

* mipi-dbi: Fix buffer mapping
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmHhh2MACgkQaA3BHVML
 eiMkdwgArrrYctHSeaEjCBTA33JC3pyywX5cP+vojyEbSB6Pg35ytBJlKp0JPssF
 egGPAP4kFdh1WpVx9cy88QA8g07LqbYgiWeHQfULPGjMcKtuQc6fPuDRd0bHCdTa
 5KEkirDh/S7soB+jvsGyYbZsHXALkklxEbYCIJyic0iuuPdFcN1VXwTYOX6gYO2N
 sZgqWeP2lxfkU/5dxSXrh2+CyaMTskc43lJ9xENkGbmTu+uIeQoLWh2Vy5qqzWZM
 wGtM+s5z4j/B0ZQRL7pgcGYQs8I0Qs8sPOnUoVE91EZRhFmTNNzeU7FsGnTUqDN7
 3+acY0Tj11s5m5ertXdoTbmOnLUdqg==
 =QN5x
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-next-fixes-2022-01-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

 * atomic helpers: Fix error messages
 * mipi-dbi: Fix buffer mapping

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YeGHu7qU92pjuQOn@linux-uq9g
This commit is contained in:
Daniel Vetter 2022-01-14 15:41:47 +01:00
parent 71e4a70290 5d474cc501
commit 820e690e4e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/drm_atomic_helper.c
View File

@ -828,8 +828,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
}
if (!crtc_state->enable && !can_update_disabled) {
drm_dbg_kms(plane_state->crtc->dev,
"Cannot update plane of a disabled CRTC.\n");
drm_dbg_kms(plane_state->plane->dev,
"Cannot update plane of a disabled CRTC.\n");
return -EINVAL;
}
@ -839,8 +839,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
hscale = drm_rect_calc_hscale(src, dst, min_scale, max_scale);
vscale = drm_rect_calc_vscale(src, dst, min_scale, max_scale);
if (hscale < 0 || vscale < 0) {
drm_dbg_kms(plane_state->crtc->dev,
"Invalid scaling of plane\n");
drm_dbg_kms(plane_state->plane->dev,
"Invalid scaling of plane\n");
drm_rect_debug_print("src: ", &plane_state->src, true);
drm_rect_debug_print("dst: ", &plane_state->dst, false);
return -ERANGE;
@ -864,8 +864,8 @@ int drm_atomic_helper_check_plane_state(struct drm_plane_state *plane_state,
return 0;
if (!can_position && !drm_rect_equals(dst, &clip)) {
drm_dbg_kms(plane_state->crtc->dev,
"Plane must cover entire CRTC\n");
drm_dbg_kms(plane_state->plane->dev,
"Plane must cover entire CRTC\n");
drm_rect_debug_print("dst: ", dst, false);
drm_rect_debug_print("clip: ", &clip, false);
return -EINVAL;

2
drivers/gpu/drm/drm_mipi_dbi.c
View File

@ -209,11 +209,11 @@ int mipi_dbi_buf_copy(void *dst, struct drm_framebuffer *fb,
ret = drm_gem_fb_begin_cpu_access(fb, DMA_FROM_DEVICE);
if (ret)
return ret;
src = data[0].vaddr; /* TODO: Use mapping abstraction properly */
ret = drm_gem_fb_vmap(fb, map, data);
if (ret)
goto out_drm_gem_fb_end_cpu_access;
src = data[0].vaddr; /* TODO: Use mapping abstraction properly */
switch (fb->format->format) {
case DRM_FORMAT_RGB565: