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

Commit fb9775aa authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next 

Disable perfmon ioctls for now in etnaviv

* 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux:
  drm/etnaviv: short-circuit perfmon ioctls
  Revert "drm/etnaviv: submit supports performance monitor requests"
parents fef1aa48 330b52bd

drivers/gpu/drm/etnaviv/etnaviv_drv.c

+7 −1
Original line number Diff line number Diff line
@@ -459,6 +459,9 @@ static int etnaviv_ioctl_pm_query_dom(struct drm_device *dev, void *data, 
	struct drm_etnaviv_pm_domain *args = data;

	struct etnaviv_gpu *gpu;



	/* reject as long as the feature isn't stable */

	return -EINVAL;



	if (args->pipe >= ETNA_MAX_PIPES)

		return -EINVAL;
@@ -476,6 +479,9 @@ static int etnaviv_ioctl_pm_query_sig(struct drm_device *dev, void *data, 
	struct drm_etnaviv_pm_signal *args = data;

	struct etnaviv_gpu *gpu;



	/* reject as long as the feature isn't stable */

	return -EINVAL;



	if (args->pipe >= ETNA_MAX_PIPES)

		return -EINVAL;
@@ -550,7 +556,7 @@ static struct drm_driver etnaviv_drm_driver = { 
	.desc               = "etnaviv DRM",

	.date               = "20151214",

	.major              = 1,

	.minor              = 2,

	.minor              = 1,

};



/*