浏览代码

drm/etnaviv: re-enable perfmon support

Now that the PMR lifetime issues are solved we can safely re-enable
performance counter profiling support.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Lucas Stach 7 年之前
父节点
当前提交
a7cfa565d4
共有 1 个文件被更改,包括 1 次插入7 次删除
  1. 1 7
      drivers/gpu/drm/etnaviv/etnaviv_drv.c

+ 1 - 7
drivers/gpu/drm/etnaviv/etnaviv_drv.c

@@ -459,9 +459,6 @@ static int etnaviv_ioctl_pm_query_dom(struct drm_device *dev, void *data,
 	struct drm_etnaviv_pm_domain *args = data;
 	struct drm_etnaviv_pm_domain *args = data;
 	struct etnaviv_gpu *gpu;
 	struct etnaviv_gpu *gpu;
 
 
-	/* reject as long as the feature isn't stable */
-	return -EINVAL;
-
 	if (args->pipe >= ETNA_MAX_PIPES)
 	if (args->pipe >= ETNA_MAX_PIPES)
 		return -EINVAL;
 		return -EINVAL;
 
 
@@ -479,9 +476,6 @@ static int etnaviv_ioctl_pm_query_sig(struct drm_device *dev, void *data,
 	struct drm_etnaviv_pm_signal *args = data;
 	struct drm_etnaviv_pm_signal *args = data;
 	struct etnaviv_gpu *gpu;
 	struct etnaviv_gpu *gpu;
 
 
-	/* reject as long as the feature isn't stable */
-	return -EINVAL;
-
 	if (args->pipe >= ETNA_MAX_PIPES)
 	if (args->pipe >= ETNA_MAX_PIPES)
 		return -EINVAL;
 		return -EINVAL;
 
 
@@ -556,7 +550,7 @@ static struct drm_driver etnaviv_drm_driver = {
 	.desc               = "etnaviv DRM",
 	.desc               = "etnaviv DRM",
 	.date               = "20151214",
 	.date               = "20151214",
 	.major              = 1,
 	.major              = 1,
-	.minor              = 1,
+	.minor              = 2,
 };
 };
 
 
 /*
 /*