mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: Read FB2_MODIFIERS capability

Browse Source 
Not all drivers support fb2 modifiers so read the capability before
using drmModeAddFB2WithModifiers.

Signed-off-by: Deepak Rawat <drawat@vmware.com>
This commit is contained in:
Deepak Rawat
2018-08-24 13:16:03 -07:00
committed by Daniel Stone
parent d93a52a6f9
commit a864f58f44
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-drm.c
+15 -5
View File
@@ -346,6 +346,8 @@ struct drm_backend {
bool aspect_ratio_supported; bool aspect_ratio_supported;
bool fb_modifiers;
struct weston_debug_scope *debug; struct weston_debug_scope *debug;
}; };
@@ -961,7 +963,7 @@ drm_fb_destroy_gbm(struct gbm_bo *bo, void *data)
} }
static int static int
drm_fb_addfb(struct drm_fb *fb) drm_fb_addfb(struct drm_backend *b, struct drm_fb *fb)
{ {
int ret = -EINVAL; int ret = -EINVAL;
#ifdef HAVE_DRM_ADDFB2_MODIFIERS #ifdef HAVE_DRM_ADDFB2_MODIFIERS
@@ -971,7 +973,7 @@ drm_fb_addfb(struct drm_fb *fb)
/* If we have a modifier set, we must only use the WithModifiers /* If we have a modifier set, we must only use the WithModifiers
* entrypoint; we cannot import it through legacy ioctls. */ * entrypoint; we cannot import it through legacy ioctls. */
if (fb->modifier != DRM_FORMAT_MOD_INVALID) { if (b->fb_modifiers && fb->modifier != DRM_FORMAT_MOD_INVALID) {
/* KMS demands that if a modifier is set, it must be the same /* KMS demands that if a modifier is set, it must be the same
* for all planes. */ * for all planes. */
#ifdef HAVE_DRM_ADDFB2_MODIFIERS #ifdef HAVE_DRM_ADDFB2_MODIFIERS
@@ -1055,7 +1057,7 @@ drm_fb_create_dumb(struct drm_backend *b, int width, int height,
fb->height = height; fb->height = height;
fb->fd = b->drm.fd; fb->fd = b->drm.fd;
if (drm_fb_addfb(fb) != 0) { if (drm_fb_addfb(b, fb) != 0) {
weston_log("failed to create kms fb: %m\n"); weston_log("failed to create kms fb: %m\n");
goto err_bo; goto err_bo;
} }
@@ -1228,7 +1230,7 @@ drm_fb_get_from_dmabuf(struct linux_dmabuf_buffer *dmabuf,
goto err_free; goto err_free;
} }
if (drm_fb_addfb(fb) != 0) if (drm_fb_addfb(backend, fb) != 0)
goto err_free; goto err_free;
return fb; return fb;
@@ -1301,7 +1303,7 @@ drm_fb_get_from_bo(struct gbm_bo *bo, struct drm_backend *backend,
goto err_free; goto err_free;
} }
if (drm_fb_addfb(fb) != 0) { if (drm_fb_addfb(backend, fb) != 0) {
if (type == BUFFER_GBM_SURFACE) if (type == BUFFER_GBM_SURFACE)
weston_log("failed to create kms fb: %m\n"); weston_log("failed to create kms fb: %m\n");
goto err_free; goto err_free;
@@ -4062,6 +4064,14 @@ init_kms_caps(struct drm_backend *b)
weston_log("DRM: %s atomic modesetting\n", weston_log("DRM: %s atomic modesetting\n",
b->atomic_modeset ? "supports" : "does not support"); b->atomic_modeset ? "supports" : "does not support");
#ifdef HAVE_DRM_ADDFB2_MODIFIERS
ret = drmGetCap(b->drm.fd, DRM_CAP_ADDFB2_MODIFIERS, &cap);
if (ret == 0)
b->fb_modifiers = cap;
else
#endif
b->fb_modifiers = 0;
/* /*
* KMS support for hardware planes cannot properly synchronize * KMS support for hardware planes cannot properly synchronize
* without nuclear page flip. Without nuclear/atomic, hw plane * without nuclear page flip. Without nuclear/atomic, hw plane