diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-24 09:58:39 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-24 09:58:39 +0300 |
| commit | fb9775aab2a79d09906f841ab8316379c20e5322 (patch) | |
| tree | 95c7edada5588c1ac3f5eece5047ee33c24dd738 | |
| parent | fef1aa48f488fedbbecd28995f1fd9a2ea2a7ef2 (diff) | |
| parent | 330b52bd9bba1d66028772dfe08c053a34c5069a (diff) | |
| download | linux-fb9775aab2a79d09906f841ab8316379c20e5322.tar.xz | |
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"
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index 3fadb8d45e51..491eddf9b150 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -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, }; /* |