[PATCH 1/2] drm/i915: Use for_each_pipe in intel_display_crc_init

[PATCH 1/2] drm/i915: Use for_each_pipe in intel_display_crc_init

[Daniel Vetter]

We have a nice macro, so use it.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 6875b7a0f0cd..09e7f7beeb61 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3099,10 +3099,10 @@ static const struct i915_debugfs_files {
 void intel_display_crc_init(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	int i;
+	enum pipe pipe;
 
-	for (i = 0; i < INTEL_INFO(dev)->num_pipes; i++) {
-		struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[i];
+	for_each_pipe(pipe) {
+		struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];
 
 		pipe_crc->opened = false;
 		spin_lock_init(&pipe_crc->lock);
-- 
1.8.1.4

[PATCH 2/2] drm/i915: Reject opening of pipe crc files for invalid pipes

[Daniel Vetter]

We don't init the lock nor set up all the other state. And it doesn't
make sense anyway.

This appeases lockdep when running the igt/drv_debugfs_reader test.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/i915_debugfs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 09e7f7beeb61..d1491f8e0f39 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1856,6 +1856,9 @@ static int i915_pipe_crc_open(struct inode *inode, struct file *filep)
 	struct drm_i915_private *dev_priv = info->dev->dev_private;
 	struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe];
 
+	if (info->pipe >= INTEL_INFO(info->dev)->num_pipes)
+		return -ENODEV;
+
 	spin_lock_irq(&pipe_crc->lock);
 
 	if (pipe_crc->opened) {
-- 
1.8.1.4

Re: [PATCH 1/2] drm/i915: Use for_each_pipe in intel_display_crc_init

[Damien Lespiau]

On Thu, Nov 14, 2013 at 11:30:42AM +0100, Daniel Vetter wrote:
> We have a nice macro, so use it.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

For both patches:

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

-- 
Damien

Re: [PATCH 1/2] drm/i915: Use for_each_pipe in intel_display_crc_init

[Daniel Vetter]

On Thu, Nov 14, 2013 at 10:53:10AM +0000, Damien Lespiau wrote:
> On Thu, Nov 14, 2013 at 11:30:42AM +0100, Daniel Vetter wrote:
> > We have a nice macro, so use it.
> > 
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> 
> For both patches:
> 
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>

Thanks for the review, both merged to dinq.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch