diff for duplicates of <20160418090403.GC4329@intel.com> diff --git a/a/1.txt b/N1/1.txt index 68828b5..08af1b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On Mon, Apr 18, 2016 at 11:54:31AM +0300, Imre Deak wrote: -> On ma, 2016-04-18 at 11:44 +0300, Ville Syrjälä wrote: +> On ma, 2016-04-18 at 11:44 +0300, Ville Syrj�l� wrote: > > On Mon, Apr 18, 2016 at 11:32:38AM +0300, Imre Deak wrote: -> > > On ma, 2016-04-18 at 11:28 +0300, Ville Syrjälä wrote: +> > > On ma, 2016-04-18 at 11:28 +0300, Ville Syrj�l� wrote: > > > > On Mon, Apr 18, 2016 at 10:04:20AM +0300, Imre Deak wrote: > > > > > During system resume we depended on pci_enable_device() also > > > > > putting the @@ -31,12 +31,12 @@ On Mon, Apr 18, 2016 at 11:54:31AM +0300, Imre Deak wrote: > > > > > in > > > > > this patch is valid regardless of the problem in DRM core. > > > > > -> > > > > CC: Ville Syrjälä <ville.syrjala@linux.intel.com> +> > > > > CC: Ville Syrj�l� <ville.syrjala@linux.intel.com> > > > > > CC: stable@vger.kernel.org > > > > > Signed-off-by: Imre Deak <imre.deak@intel.com> > > > > > --- -> > > > > drivers/gpu/drm/i915/i915_drv.c | 9 ++++++++- -> > > > > 1 file changed, 8 insertions(+), 1 deletion(-) +> > > > > �drivers/gpu/drm/i915/i915_drv.c | 9 ++++++++- +> > > > > �1 file changed, 8 insertions(+), 1 deletion(-) > > > > > > > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.c > > > > > b/drivers/gpu/drm/i915/i915_drv.c @@ -45,21 +45,21 @@ On Mon, Apr 18, 2016 at 11:54:31AM +0300, Imre Deak wrote: > > > > > +++ b/drivers/gpu/drm/i915/i915_drv.c > > > > > @@ -803,7 +803,7 @@ static int i915_drm_resume(struct drm_device > > > > > *dev) -> > > > > static int i915_drm_resume_early(struct drm_device *dev) -> > > > > { -> > > > > struct drm_i915_private *dev_priv = dev->dev_private; +> > > > > �static int i915_drm_resume_early(struct drm_device *dev) +> > > > > �{ +> > > > > � struct drm_i915_private *dev_priv = dev->dev_private; > > > > > - int ret = 0; > > > > > + int ret; -> > > > > -> > > > > /* -> > > > > * We have a resume ordering issue with the snd-hda driver +> > > > > � +> > > > > � /* +> > > > > � �* We have a resume ordering issue with the snd-hda driver > > > > > also > > > > > @@ -814,6 +814,13 @@ static int i915_drm_resume_early(struct > > > > > drm_device *dev) -> > > > > * FIXME: This should be solved with a special hdmi sink +> > > > > � �* FIXME: This should be solved with a special hdmi sink > > > > > device or -> > > > > * similar so that power domains can be employed. -> > > > > */ +> > > > > � �* similar so that power domains can be employed. +> > > > > � �*/ > > > > > + > > > > > + ret = pci_set_power_state(dev->pdev, PCI_D0); > > > > > + if (ret) { @@ -87,9 +87,5 @@ Yeah, was thinking that we could assert that we're in D0, required BARs, BM, pci int/msi etc. are enabled. -- -Ville Syrjälä +Ville Syrj�l� Intel OTC -_______________________________________________ -Intel-gfx mailing list -Intel-gfx@lists.freedesktop.org -https://lists.freedesktop.org/mailman/listinfo/intel-gfx diff --git a/a/content_digest b/N1/content_digest index 8dd294f..c74b4f6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -13,9 +13,9 @@ "\00:1\0" "b\0" "On Mon, Apr 18, 2016 at 11:54:31AM +0300, Imre Deak wrote:\n" - "> On ma, 2016-04-18 at 11:44 +0300, Ville Syrj\303\244l\303\244 wrote:\n" + "> On ma, 2016-04-18 at 11:44 +0300, Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275 wrote:\n" "> > On Mon, Apr 18, 2016 at 11:32:38AM +0300, Imre Deak wrote:\n" - "> > > On ma, 2016-04-18 at 11:28 +0300, Ville Syrj\303\244l\303\244 wrote:\n" + "> > > On ma, 2016-04-18 at 11:28 +0300, Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275 wrote:\n" "> > > > On Mon, Apr 18, 2016 at 10:04:20AM +0300, Imre Deak wrote:\n" "> > > > > During system resume we depended on pci_enable_device() also\n" "> > > > > putting the\n" @@ -45,12 +45,12 @@ "> > > > > in\n" "> > > > > this patch is valid regardless of the problem in DRM core.\n" "> > > > > \n" - "> > > > > CC: Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>\n" + "> > > > > CC: Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275 <ville.syrjala@linux.intel.com>\n" "> > > > > CC: stable@vger.kernel.org\n" "> > > > > Signed-off-by: Imre Deak <imre.deak@intel.com>\n" "> > > > > ---\n" - "> > > > > \302\240drivers/gpu/drm/i915/i915_drv.c | 9 ++++++++-\n" - "> > > > > \302\2401 file changed, 8 insertions(+), 1 deletion(-)\n" + "> > > > > \303\257\302\277\302\275drivers/gpu/drm/i915/i915_drv.c | 9 ++++++++-\n" + "> > > > > \303\257\302\277\302\2751 file changed, 8 insertions(+), 1 deletion(-)\n" "> > > > > \n" "> > > > > diff --git a/drivers/gpu/drm/i915/i915_drv.c\n" "> > > > > b/drivers/gpu/drm/i915/i915_drv.c\n" @@ -59,21 +59,21 @@ "> > > > > +++ b/drivers/gpu/drm/i915/i915_drv.c\n" "> > > > > @@ -803,7 +803,7 @@ static int i915_drm_resume(struct drm_device\n" "> > > > > *dev)\n" - "> > > > > \302\240static int i915_drm_resume_early(struct drm_device *dev)\n" - "> > > > > \302\240{\n" - "> > > > > \302\240\tstruct drm_i915_private *dev_priv = dev->dev_private;\n" + "> > > > > \303\257\302\277\302\275static int i915_drm_resume_early(struct drm_device *dev)\n" + "> > > > > \303\257\302\277\302\275{\n" + "> > > > > \303\257\302\277\302\275\tstruct drm_i915_private *dev_priv = dev->dev_private;\n" "> > > > > -\tint ret = 0;\n" "> > > > > +\tint ret;\n" - "> > > > > \302\240\n" - "> > > > > \302\240\t/*\n" - "> > > > > \302\240\t\302\240* We have a resume ordering issue with the snd-hda driver\n" + "> > > > > \303\257\302\277\302\275\n" + "> > > > > \303\257\302\277\302\275\t/*\n" + "> > > > > \303\257\302\277\302\275\t\303\257\302\277\302\275* We have a resume ordering issue with the snd-hda driver\n" "> > > > > also\n" "> > > > > @@ -814,6 +814,13 @@ static int i915_drm_resume_early(struct\n" "> > > > > drm_device *dev)\n" - "> > > > > \302\240\t\302\240* FIXME: This should be solved with a special hdmi sink\n" + "> > > > > \303\257\302\277\302\275\t\303\257\302\277\302\275* FIXME: This should be solved with a special hdmi sink\n" "> > > > > device or\n" - "> > > > > \302\240\t\302\240* similar so that power domains can be employed.\n" - "> > > > > \302\240\t\302\240*/\n" + "> > > > > \303\257\302\277\302\275\t\303\257\302\277\302\275* similar so that power domains can be employed.\n" + "> > > > > \303\257\302\277\302\275\t\303\257\302\277\302\275*/\n" "> > > > > +\n" "> > > > > +\tret = pci_set_power_state(dev->pdev, PCI_D0);\n" "> > > > > +\tif (ret) {\n" @@ -101,11 +101,7 @@ "BM, pci int/msi etc. are enabled.\n" "\n" "-- \n" - "Ville Syrj\303\244l\303\244\n" - "Intel OTC\n" - "_______________________________________________\n" - "Intel-gfx mailing list\n" - "Intel-gfx@lists.freedesktop.org\n" - https://lists.freedesktop.org/mailman/listinfo/intel-gfx + "Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275\n" + Intel OTC -916aaa6205c2b212bc226888c812876c9aa474ac355ca7d29063cce6e268bb36 +be474357cecd443bd69b64ce4e05fec71885e7447d2bfd969048e833a2d070f3
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.