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

drm: Return -ENOTSUPP when called for KMS cap with a non-KMS driver 

This is an attempt to make the previous fix a bit more robust going
forward.

v2:
* Only allow DRM_CAP_TIMESTAMP_MONOTONIC with UMS drivers (Daniel
  Vetter, Alex Deucher)
* Different logic to keep DRM_CAP_TIMESTAMP_MONOTONIC separate from
  the other caps (Daniel Vetter)

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161201073731.5716-1-michel@daenzer.net
This commit is contained in:
Michel Dänzer 2016-12-01 16:37:31 +09:00 committed by Daniel Vetter
parent 75e75cbd55
commit d5264ed382
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/gpu/drm/drm_ioctl.c
View File

@ -229,6 +229,17 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_
struct drm_crtc *crtc; struct drm_crtc *crtc;
req->value = 0; req->value = 0;
/* Only one cap makes sense with a UMS driver: */
if (req->capability == DRM_CAP_TIMESTAMP_MONOTONIC) {
req->value = drm_timestamp_monotonic;
return 0;
}
/* Other caps only work with KMS drivers */
if (!drm_core_check_feature(dev, DRIVER_MODESET))
return -ENOTSUPP;
switch (req->capability) { switch (req->capability) {
case DRM_CAP_DUMB_BUFFER: case DRM_CAP_DUMB_BUFFER:
if (dev->driver->dumb_create) if (dev->driver->dumb_create)
@ -247,19 +258,14 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_
req->value |= dev->driver->prime_fd_to_handle ? DRM_PRIME_CAP_IMPORT : 0; req->value |= dev->driver->prime_fd_to_handle ? DRM_PRIME_CAP_IMPORT : 0;
req->value |= dev->driver->prime_handle_to_fd ? DRM_PRIME_CAP_EXPORT : 0; req->value |= dev->driver->prime_handle_to_fd ? DRM_PRIME_CAP_EXPORT : 0;
break; break;
case DRM_CAP_TIMESTAMP_MONOTONIC:
req->value = drm_timestamp_monotonic;
break;
case DRM_CAP_ASYNC_PAGE_FLIP: case DRM_CAP_ASYNC_PAGE_FLIP:
req->value = dev->mode_config.async_page_flip; req->value = dev->mode_config.async_page_flip;
break; break;
case DRM_CAP_PAGE_FLIP_TARGET: case DRM_CAP_PAGE_FLIP_TARGET:
if (drm_core_check_feature(dev, DRIVER_MODESET)) { req->value = 1;
req->value = 1; drm_for_each_crtc(crtc, dev) {
drm_for_each_crtc(crtc, dev) { if (!crtc->funcs->page_flip_target)
if (!crtc->funcs->page_flip_target) req->value = 0;
req->value = 0;
}
} }
break; break;
case DRM_CAP_CURSOR_WIDTH: case DRM_CAP_CURSOR_WIDTH: