[PATCH 1/2] drm/i915: simplify pipe checking

[PATCH 1/2] drm/i915: simplify pipe checking

[Eugeni Dodonov]

This is also handled by i915_reg.h, so just reuse this trick to reduce
universe enthropy.

Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/i915_suspend.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index 7886e4f..c0b945c 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -28,6 +28,7 @@
 #include "drm.h"
 #include "i915_drm.h"
 #include "intel_drv.h"
+#include "i915_reg.h"
 
 static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
 {
@@ -35,7 +36,7 @@ static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
 	u32	dpll_reg;
 
 	if (HAS_PCH_SPLIT(dev))
-		dpll_reg = (pipe == PIPE_A) ? _PCH_DPLL_A : _PCH_DPLL_B;
+		dpll_reg = PCH_DPLL(pipe);
 	else
 		dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B;
 
-- 
1.7.8

[PATCH 2/2] drm/i915: handle 3rd pipe

[Eugeni Dodonov]

We don't need to check 3rd pipe specifically, as it shares PLL with some
other one.

Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
 drivers/gpu/drm/i915/i915_suspend.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
index c0b945c..30d924f 100644
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
@@ -35,6 +35,10 @@ static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u32	dpll_reg;
 
+	/* On IVB, 3rd pipe shares PLL with another one */
+	if (pipe > 1)
+		return false;
+
 	if (HAS_PCH_SPLIT(dev))
 		dpll_reg = PCH_DPLL(pipe);
 	else
-- 
1.7.8

Re: [PATCH 1/2] drm/i915: simplify pipe checking

[Cyril Brulebois]

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

Eugeni Dodonov <eugeni.dodonov@intel.com> (07/01/2012):
> This is also handled by i915_reg.h, so just reuse this trick to reduce
> universe enthropy.

entropy.

Besides that:

Reviewed-by: Cyril Brulebois <kibi@debian.org>

> Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
> ---
>  drivers/gpu/drm/i915/i915_suspend.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c
> index 7886e4f..c0b945c 100644
> --- a/drivers/gpu/drm/i915/i915_suspend.c
> +++ b/drivers/gpu/drm/i915/i915_suspend.c
> @@ -28,6 +28,7 @@
>  #include "drm.h"
>  #include "i915_drm.h"
>  #include "intel_drv.h"
> +#include "i915_reg.h"
>  
>  static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
>  {
> @@ -35,7 +36,7 @@ static bool i915_pipe_enabled(struct drm_device *dev, enum pipe pipe)
>  	u32	dpll_reg;
>  
>  	if (HAS_PCH_SPLIT(dev))
> -		dpll_reg = (pipe == PIPE_A) ? _PCH_DPLL_A : _PCH_DPLL_B;
> +		dpll_reg = PCH_DPLL(pipe);
>  	else
>  		dpll_reg = (pipe == PIPE_A) ? _DPLL_A : _DPLL_B;
>  

Mraw,
KiBi.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 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: simplify pipe checking

[Daniel Vetter]

On Sun, Jan 08, 2012 at 03:01:12AM +0100, Cyril Brulebois wrote:
> Eugeni Dodonov <eugeni.dodonov@intel.com> (07/01/2012):
> > This is also handled by i915_reg.h, so just reuse this trick to reduce
> > universe enthropy.
> 
> entropy.
> 
> Besides that:
> 
> Reviewed-by: Cyril Brulebois <kibi@debian.org>

Both patches queued for -next, thanks.
-Daniel
-- 
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48

Re: [PATCH 1/2] drm/i915: simplify pipe checking

[Daniel Vetter]

On Mon, Jan 16, 2012 at 21:28, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Sun, Jan 08, 2012 at 03:01:12AM +0100, Cyril Brulebois wrote:
>> Eugeni Dodonov <eugeni.dodonov@intel.com> (07/01/2012):
>> > This is also handled by i915_reg.h, so just reuse this trick to reduce
>> > universe enthropy.
>>
>> entropy.
>>
>> Besides that:
>>
>> Reviewed-by: Cyril Brulebois <kibi@debian.org>
>
> Both patches queued for -next, thanks.

I've botched my cross-checking with Keith's -fixes, these two are
already there. Dropped them from my queue.
-Daniel
-- 
Daniel Vetter
daniel.vetter@ffwll.ch - +41 (0) 79 364 57 48 - http://blog.ffwll.ch