* [PATCH 1/2] drm/i915: simplify pipe checking
@ 2012-01-08 1:40 Eugeni Dodonov
2012-01-08 1:40 ` [PATCH 2/2] drm/i915: handle 3rd pipe Eugeni Dodonov
2012-01-08 2:01 ` [PATCH 1/2] drm/i915: simplify pipe checking Cyril Brulebois
0 siblings, 2 replies; 5+ messages in thread
From: Eugeni Dodonov @ 2012-01-08 1:40 UTC (permalink / raw)
To: intel-gfx; +Cc: 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] drm/i915: handle 3rd pipe
2012-01-08 1:40 [PATCH 1/2] drm/i915: simplify pipe checking Eugeni Dodonov
@ 2012-01-08 1:40 ` Eugeni Dodonov
2012-01-08 2:01 ` [PATCH 1/2] drm/i915: simplify pipe checking Cyril Brulebois
1 sibling, 0 replies; 5+ messages in thread
From: Eugeni Dodonov @ 2012-01-08 1:40 UTC (permalink / raw)
To: intel-gfx; +Cc: 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm/i915: simplify pipe checking
2012-01-08 1:40 [PATCH 1/2] drm/i915: simplify pipe checking Eugeni Dodonov
2012-01-08 1:40 ` [PATCH 2/2] drm/i915: handle 3rd pipe Eugeni Dodonov
@ 2012-01-08 2:01 ` Cyril Brulebois
2012-01-16 20:28 ` Daniel Vetter
1 sibling, 1 reply; 5+ messages in thread
From: Cyril Brulebois @ 2012-01-08 2:01 UTC (permalink / raw)
To: Eugeni Dodonov; +Cc: intel-gfx
[-- 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm/i915: simplify pipe checking
2012-01-08 2:01 ` [PATCH 1/2] drm/i915: simplify pipe checking Cyril Brulebois
@ 2012-01-16 20:28 ` Daniel Vetter
2012-01-17 10:05 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Daniel Vetter @ 2012-01-16 20:28 UTC (permalink / raw)
To: Cyril Brulebois; +Cc: intel-gfx, Eugeni Dodonov
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] drm/i915: simplify pipe checking
2012-01-16 20:28 ` Daniel Vetter
@ 2012-01-17 10:05 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2012-01-17 10:05 UTC (permalink / raw)
To: Cyril Brulebois; +Cc: intel-gfx, Eugeni Dodonov
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-01-17 10:05 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-08 1:40 [PATCH 1/2] drm/i915: simplify pipe checking Eugeni Dodonov
2012-01-08 1:40 ` [PATCH 2/2] drm/i915: handle 3rd pipe Eugeni Dodonov
2012-01-08 2:01 ` [PATCH 1/2] drm/i915: simplify pipe checking Cyril Brulebois
2012-01-16 20:28 ` Daniel Vetter
2012-01-17 10:05 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.