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

Commit 83fb8b05 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2016-11-30' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes 

single drm fix.

* tag 'drm-misc-fixes-2016-11-30' of git://anongit.freedesktop.org/git/drm-misc:
  drm: Don't call drm_for_each_crtc with a non-KMS driver
parents b14fd8ef e94bd173

drivers/gpu/drm/drm_ioctl.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -254,11 +254,13 @@ static int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_ 
		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)