Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5264ed3 authored by Michel Dänzer's avatar Michel Dänzer Committed by Daniel Vetter
Browse files

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: default avatarMichel Dänzer <michel.daenzer@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161201073731.5716-1-michel@daenzer.net
parent 75e75cbd

drivers/gpu/drm/drm_ioctl.c

+15 −9
Original line number Original line Diff line number Diff line
@@ -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,20 +258,15 @@ 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:

		if (dev->mode_config.cursor_width)

		if (dev->mode_config.cursor_width)