* [PATCH] drm/i915: Fix up some stray to_i915(dev) after a recent merge
@ 2016-07-27 18:32 Chris Wilson
2016-07-28 5:39 ` ✗ Ro.CI.BAT: failure for " Patchwork
2016-07-28 6:11 ` [PATCH] " Joonas Lahtinen
0 siblings, 2 replies; 5+ messages in thread
From: Chris Wilson @ 2016-07-27 18:32 UTC (permalink / raw)
To: intel-gfx
The merge conflict resolution caused some dev->dev_private to return
from the dead. Kill them with to_i915().
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
drivers/gpu/drm/i915/i915_sysfs.c | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
index d47281b4b1c1..f1ffde7f7c0b 100644
--- a/drivers/gpu/drm/i915/i915_sysfs.c
+++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -323,7 +323,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
{
struct drm_minor *minor = dev_to_drm_minor(kdev);
struct drm_device *dev = minor->dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(dev);
u32 val;
ssize_t ret;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index a807e1045b1d..94f41e72cf52 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -57,7 +57,7 @@
static void gen9_init_clock_gating(struct drm_device *dev)
{
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(dev);
/* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */
I915_WRITE(CHICKEN_PAR1_1,
@@ -7056,7 +7056,7 @@ static void kabylake_init_clock_gating(struct drm_device *dev)
static void skylake_init_clock_gating(struct drm_device *dev)
{
- struct drm_i915_private *dev_priv = dev->dev_private;
+ struct drm_i915_private *dev_priv = to_i915(dev);
gen9_init_clock_gating(dev);
--
2.8.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* ✗ Ro.CI.BAT: failure for drm/i915: Fix up some stray to_i915(dev) after a recent merge
2016-07-27 18:32 [PATCH] drm/i915: Fix up some stray to_i915(dev) after a recent merge Chris Wilson
@ 2016-07-28 5:39 ` Patchwork
2016-07-28 6:11 ` [PATCH] " Joonas Lahtinen
1 sibling, 0 replies; 5+ messages in thread
From: Patchwork @ 2016-07-28 5:39 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Fix up some stray to_i915(dev) after a recent merge
URL : https://patchwork.freedesktop.org/series/10327/
State : failure
== Summary ==
Series 10327v1 drm/i915: Fix up some stray to_i915(dev) after a recent merge
http://patchwork.freedesktop.org/api/1.0/series/10327/revisions/1/mbox
Test kms_cursor_legacy:
Subgroup basic-flip-vs-cursor-legacy:
fail -> PASS (ro-bdw-i5-5250u)
fail -> PASS (fi-skl-i7-6700k)
Subgroup basic-flip-vs-cursor-varying-size:
pass -> FAIL (ro-hsw-i7-4770r)
fail -> PASS (ro-snb-i7-2620M)
pass -> FAIL (ro-bdw-i5-5250u)
fi-hsw-i7-4770k total:239 pass:217 dwarn:0 dfail:0 fail:0 skip:22
fi-kbl-qkkr total:239 pass:180 dwarn:29 dfail:0 fail:3 skip:27
fi-skl-i5-6260u total:239 pass:223 dwarn:0 dfail:0 fail:2 skip:14
fi-skl-i7-6700k total:239 pass:208 dwarn:0 dfail:0 fail:3 skip:28
fi-snb-i7-2600 total:239 pass:197 dwarn:0 dfail:0 fail:0 skip:42
ro-bdw-i5-5250u total:239 pass:218 dwarn:4 dfail:0 fail:1 skip:16
ro-bdw-i7-5557U total:239 pass:222 dwarn:1 dfail:0 fail:0 skip:16
ro-bdw-i7-5600u total:239 pass:206 dwarn:0 dfail:0 fail:1 skip:32
ro-bsw-n3050 total:239 pass:193 dwarn:0 dfail:0 fail:4 skip:42
ro-byt-n2820 total:239 pass:196 dwarn:0 dfail:0 fail:3 skip:40
ro-hsw-i3-4010u total:239 pass:213 dwarn:0 dfail:0 fail:0 skip:26
ro-hsw-i7-4770r total:239 pass:212 dwarn:0 dfail:0 fail:1 skip:26
ro-ilk-i7-620lm total:239 pass:172 dwarn:1 dfail:0 fail:1 skip:65
ro-ilk1-i5-650 total:234 pass:172 dwarn:0 dfail:0 fail:2 skip:60
ro-ivb2-i7-3770 total:239 pass:208 dwarn:0 dfail:0 fail:0 skip:31
ro-skl3-i5-6260u total:239 pass:221 dwarn:0 dfail:0 fail:4 skip:14
ro-snb-i7-2620M total:239 pass:197 dwarn:0 dfail:0 fail:1 skip:41
Results at /archive/results/CI_IGT_test/RO_Patchwork_1626/
e52c742 drm-intel-nightly: 2016y-07m-27d-15h-23m-38s UTC integration manifest
b0a01aa drm/i915: Fix up some stray to_i915(dev) after a recent merge
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Fix up some stray to_i915(dev) after a recent merge
2016-07-27 18:32 [PATCH] drm/i915: Fix up some stray to_i915(dev) after a recent merge Chris Wilson
2016-07-28 5:39 ` ✗ Ro.CI.BAT: failure for " Patchwork
@ 2016-07-28 6:11 ` Joonas Lahtinen
2016-07-28 6:30 ` Chris Wilson
1 sibling, 1 reply; 5+ messages in thread
From: Joonas Lahtinen @ 2016-07-28 6:11 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On ke, 2016-07-27 at 19:32 +0100, Chris Wilson wrote:
> The merge conflict resolution caused some dev->dev_private to return
> from the dead. Kill them with to_i915().
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_sysfs.c | 2 +-
> drivers/gpu/drm/i915/intel_pm.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
> index d47281b4b1c1..f1ffde7f7c0b 100644
> --- a/drivers/gpu/drm/i915/i915_sysfs.c
> +++ b/drivers/gpu/drm/i915/i915_sysfs.c
> @@ -323,7 +323,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
> {
> struct drm_minor *minor = dev_to_drm_minor(kdev);
> struct drm_device *dev = minor->dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(dev);
> u32 val;
> ssize_t ret;
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index a807e1045b1d..94f41e72cf52 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -57,7 +57,7 @@
>
> static void gen9_init_clock_gating(struct drm_device *dev)
> {
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(dev);
>
> /* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */
> I915_WRITE(CHICKEN_PAR1_1,
> @@ -7056,7 +7056,7 @@ static void kabylake_init_clock_gating(struct drm_device *dev)
>
> static void skylake_init_clock_gating(struct drm_device *dev)
> {
> - struct drm_i915_private *dev_priv = dev->dev_private;
> + struct drm_i915_private *dev_priv = to_i915(dev);
>
> gen9_init_clock_gating(dev);
>
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Fix up some stray to_i915(dev) after a recent merge
2016-07-28 6:11 ` [PATCH] " Joonas Lahtinen
@ 2016-07-28 6:30 ` Chris Wilson
2016-07-28 12:01 ` Daniel Vetter
0 siblings, 1 reply; 5+ messages in thread
From: Chris Wilson @ 2016-07-28 6:30 UTC (permalink / raw)
To: Joonas Lahtinen; +Cc: intel-gfx
On Thu, Jul 28, 2016 at 09:11:31AM +0300, Joonas Lahtinen wrote:
> On ke, 2016-07-27 at 19:32 +0100, Chris Wilson wrote:
> > The merge conflict resolution caused some dev->dev_private to return
> > from the dead. Kill them with to_i915().
> >
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>
> > ---
> > drivers/gpu/drm/i915/i915_sysfs.c | 2 +-
> > drivers/gpu/drm/i915/intel_pm.c | 4 ++--
> > 2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
> > index d47281b4b1c1..f1ffde7f7c0b 100644
> > --- a/drivers/gpu/drm/i915/i915_sysfs.c
> > +++ b/drivers/gpu/drm/i915/i915_sysfs.c
> > @@ -323,7 +323,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
> > {
> > struct drm_minor *minor = dev_to_drm_minor(kdev);
> > struct drm_device *dev = minor->dev;
> > - struct drm_i915_private *dev_priv = dev->dev_private;
> > + struct drm_i915_private *dev_priv = to_i915(dev);
> > u32 val;
> > ssize_t ret;
> >
> > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > index a807e1045b1d..94f41e72cf52 100644
> > --- a/drivers/gpu/drm/i915/intel_pm.c
> > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > @@ -57,7 +57,7 @@
> >
> > static void gen9_init_clock_gating(struct drm_device *dev)
> > {
> > - struct drm_i915_private *dev_priv = dev->dev_private;
> > + struct drm_i915_private *dev_priv = to_i915(dev);
> >
> > /* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */
> > I915_WRITE(CHICKEN_PAR1_1,
> > @@ -7056,7 +7056,7 @@ static void kabylake_init_clock_gating(struct drm_device *dev)
> >
> > static void skylake_init_clock_gating(struct drm_device *dev)
> > {
> > - struct drm_i915_private *dev_priv = dev->dev_private;
> > + struct drm_i915_private *dev_priv = to_i915(dev);
> >
> > gen9_init_clock_gating(dev);
> >
Hmm, Daniel these are actually somewhere between drm-intel-next-queued
and drm-intel-nightly. Probably simpler if we just wait for the eventual
merge and fix up any residual afterwards.
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/i915: Fix up some stray to_i915(dev) after a recent merge
2016-07-28 6:30 ` Chris Wilson
@ 2016-07-28 12:01 ` Daniel Vetter
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Vetter @ 2016-07-28 12:01 UTC (permalink / raw)
To: Chris Wilson, Joonas Lahtinen, intel-gfx
On Thu, Jul 28, 2016 at 07:30:46AM +0100, Chris Wilson wrote:
> On Thu, Jul 28, 2016 at 09:11:31AM +0300, Joonas Lahtinen wrote:
> > On ke, 2016-07-27 at 19:32 +0100, Chris Wilson wrote:
> > > The merge conflict resolution caused some dev->dev_private to return
> > > from the dead. Kill them with to_i915().
> > >
> > > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> >
> > Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> >
> > > ---
> > > drivers/gpu/drm/i915/i915_sysfs.c | 2 +-
> > > drivers/gpu/drm/i915/intel_pm.c | 4 ++--
> > > 2 files changed, 3 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c
> > > index d47281b4b1c1..f1ffde7f7c0b 100644
> > > --- a/drivers/gpu/drm/i915/i915_sysfs.c
> > > +++ b/drivers/gpu/drm/i915/i915_sysfs.c
> > > @@ -323,7 +323,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev,
> > > {
> > > struct drm_minor *minor = dev_to_drm_minor(kdev);
> > > struct drm_device *dev = minor->dev;
> > > - struct drm_i915_private *dev_priv = dev->dev_private;
> > > + struct drm_i915_private *dev_priv = to_i915(dev);
> > > u32 val;
> > > ssize_t ret;
> > >
> > > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> > > index a807e1045b1d..94f41e72cf52 100644
> > > --- a/drivers/gpu/drm/i915/intel_pm.c
> > > +++ b/drivers/gpu/drm/i915/intel_pm.c
> > > @@ -57,7 +57,7 @@
> > >
> > > static void gen9_init_clock_gating(struct drm_device *dev)
> > > {
> > > - struct drm_i915_private *dev_priv = dev->dev_private;
> > > + struct drm_i915_private *dev_priv = to_i915(dev);
> > >
> > > /* See Bspec note for PSR2_CTL bit 31, Wa#828:skl,bxt,kbl */
> > > I915_WRITE(CHICKEN_PAR1_1,
> > > @@ -7056,7 +7056,7 @@ static void kabylake_init_clock_gating(struct drm_device *dev)
> > >
> > > static void skylake_init_clock_gating(struct drm_device *dev)
> > > {
> > > - struct drm_i915_private *dev_priv = dev->dev_private;
> > > + struct drm_i915_private *dev_priv = to_i915(dev);
> > >
> > > gen9_init_clock_gating(dev);
> > >
>
> Hmm, Daniel these are actually somewhere between drm-intel-next-queued
> and drm-intel-nightly. Probably simpler if we just wait for the eventual
> merge and fix up any residual afterwards.
Yup, I plan to backmerge drm-next as soon as Dave finalizes the 4.8 pull
request. We need to sync up a bit ;-)
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-07-28 12:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-27 18:32 [PATCH] drm/i915: Fix up some stray to_i915(dev) after a recent merge Chris Wilson
2016-07-28 5:39 ` ✗ Ro.CI.BAT: failure for " Patchwork
2016-07-28 6:11 ` [PATCH] " Joonas Lahtinen
2016-07-28 6:30 ` Chris Wilson
2016-07-28 12:01 ` 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.