[PATCH 1/2] drm/i915: allow userspace forcewake references also on gen7

[PATCH 1/2] drm/i915: allow userspace forcewake references also on gen7

[Daniel Vetter]

We need this to correctly access registers in the gt power well from
userspace.

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/i915/i915_debugfs.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 6c3be86..4a93dfc 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1666,7 +1666,7 @@ static int i915_forcewake_open(struct inode *inode, struct file *file)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int ret;
 
-	if (!IS_GEN6(dev))
+	if (INTEL_INFO(dev)->gen < 6)
 		return 0;
 
 	ret = mutex_lock_interruptible(&dev->struct_mutex);
@@ -1683,7 +1683,7 @@ int i915_forcewake_release(struct inode *inode, struct file *file)
 	struct drm_device *dev = inode->i_private;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	if (!IS_GEN6(dev))
+	if (INTEL_INFO(dev)->gen < 6)
 		return 0;
 
 	/*
-- 
1.7.8.3

[PATCH 2/2] drm/i915: debugfs: show semaphore registers also on gen7

[Daniel Vetter]

Corresponding changes to improve our error_state are pending
some other patches to clean up things first.

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

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 4a93dfc..a480935 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -654,7 +654,7 @@ static int i915_ringbuffer_info(struct seq_file *m, void *data)
 	seq_printf(m, "  Size :    %08x\n", ring->size);
 	seq_printf(m, "  Active :  %08x\n", intel_ring_get_active_head(ring));
 	seq_printf(m, "  NOPID :   %08x\n", I915_READ_NOPID(ring));
-	if (IS_GEN6(dev)) {
+	if (IS_GEN6(dev) || IS_GEN7(dev)) {
 		seq_printf(m, "  Sync 0 :   %08x\n", I915_READ_SYNC_0(ring));
 		seq_printf(m, "  Sync 1 :   %08x\n", I915_READ_SYNC_1(ring));
 	}
-- 
1.7.8.3

Re: [PATCH 1/2] drm/i915: allow userspace forcewake references also on gen7

[Chris Wilson]

On Tue, 24 Jan 2012 09:44:28 +0100, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> We need this to correctly access registers in the gt power well from
> userspace.

How about a INTEL_INFO(dev)->has_forcewake or check for the
 ->forcewake_get? That would be more self-documenting, and we are less
likely to miss one in the future, than adding more random generation
checks.
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [PATCH 1/2] drm/i915: allow userspace forcewake references also on gen7

[Daniel Vetter]

On Tue, Jan 24, 2012 at 10:35:04AM +0000, Chris Wilson wrote:
> On Tue, 24 Jan 2012 09:44:28 +0100, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > We need this to correctly access registers in the gt power well from
> > userspace.
> 
> How about a INTEL_INFO(dev)->has_forcewake or check for the
>  ->forcewake_get? That would be more self-documenting, and we are less
> likely to miss one in the future, than adding more random generation
> checks.

I'll jot down a todo to create a cleanup patch for -next that introduce
some feature flags like has_forcewake has_rc6 and such to avoid such
gaffles (hopefully).
-Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

Re: [PATCH 2/2] drm/i915: debugfs: show semaphore registers also on gen7

[Eugeni Dodonov]

[-- Attachment #1.1: Type: text/plain, Size: 1002 bytes --]

On Tue, Jan 24, 2012 at 06:44, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> Corresponding changes to improve our error_state are pending
> some other patches to clean up things first.
>
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>

Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>

I've send the patches to provide .has_semaphores and .has_rc6 features not
that long ago, perhaps it is time to reconsider them to simplify such
checks?

The logic behind their rejection at that time was that it not the right
things to rely on such flags for feature functionality status (in that
time, I intended to use them to make rc6/semaphores available on IVB by
default - in yet another attempt to have somewhat working default for each
gpu generation). But perhaps we could use those just to announce which GPUs
has the features instead of relying on IS_GEN checks? This would cover the
RC6, Turbo and Semaphores items for now for example.

-- 
Eugeni Dodonov
<http://eugeni.dodonov.net/>

[-- Attachment #1.2: Type: text/html, Size: 1435 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 1/2] drm/i915: allow userspace forcewake references also on gen7

[Eugeni Dodonov]

[-- Attachment #1.1: Type: text/plain, Size: 327 bytes --]

On Tue, Jan 24, 2012 at 06:44, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> We need this to correctly access registers in the gt power well from
> userspace.
>
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>

Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com>

-- 
Eugeni Dodonov
<http://eugeni.dodonov.net/>

[-- Attachment #1.2: Type: text/html, Size: 740 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 1/2] drm/i915: allow userspace forcewake references also on gen7

[Eugeni Dodonov]

[-- Attachment #1.1: Type: text/plain, Size: 849 bytes --]

On Tue, Jan 24, 2012 at 09:04, Daniel Vetter <daniel@ffwll.ch> wrote:

> On Tue, Jan 24, 2012 at 10:35:04AM +0000, Chris Wilson wrote:
> > On Tue, 24 Jan 2012 09:44:28 +0100, Daniel Vetter <
> daniel.vetter@ffwll.ch> wrote:
> > > We need this to correctly access registers in the gt power well from
> > > userspace.
> >
> > How about a INTEL_INFO(dev)->has_forcewake or check for the
> >  ->forcewake_get? That would be more self-documenting, and we are less
> > likely to miss one in the future, than adding more random generation
> > checks.
>
> I'll jot down a todo to create a cleanup patch for -next that introduce
> some feature flags like has_forcewake has_rc6 and such to avoid such
> gaffles (hopefully).
>

I actually wrote about the very same idea in my previous email :). So +1 to
that!

-- 
Eugeni Dodonov
 <http://eugeni.dodonov.net/>

[-- Attachment #1.2: Type: text/html, Size: 1287 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 1/2] drm/i915: allow userspace forcewake references also on gen7

[Keith Packard]

[-- Attachment #1.1: Type: text/plain, Size: 253 bytes --]

On Tue, 24 Jan 2012 09:44:28 +0100, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> We need this to correctly access registers in the gt power well from
> userspace.

Reviewed-by: Keith Packard <keithp@keithp.com>

-- 
keith.packard@intel.com

[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 2/2] drm/i915: debugfs: show semaphore registers also on gen7

[Keith Packard]

[-- Attachment #1.1: Type: text/plain, Size: 279 bytes --]

On Tue, 24 Jan 2012 09:44:29 +0100, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:

> Corresponding changes to improve our error_state are pending
> some other patches to clean up things first.

Reviewed-by: Keith Packard <keithp@keithp.com>

-- 
keith.packard@intel.com

[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 1/2] drm/i915: allow userspace forcewake references also on gen7

[Keith Packard]

[-- Attachment #1.1: Type: text/plain, Size: 236 bytes --]

On Tue, 24 Jan 2012 09:44:28 +0100, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> We need this to correctly access registers in the gt power well from
> userspace.

I've merged this and to -fixes.

-- 
keith.packard@intel.com

[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH 2/2] drm/i915: debugfs: show semaphore registers also on gen7

[Keith Packard]

[-- Attachment #1.1: Type: text/plain, Size: 267 bytes --]

On Tue, 24 Jan 2012 09:44:29 +0100, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Corresponding changes to improve our error_state are pending
> some other patches to clean up things first.

I've applied this to drm-intel-fixes

-- 
keith.packard@intel.com

[-- Attachment #1.2: Type: application/pgp-signature, Size: 827 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx