All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <0d30dc$km57aq@orsmga001.jf.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 90cccbb..7663747 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,22 +11,22 @@ On Thu, 6 Jan 2011 21:55:23 +0100, Alex Riesen <raa.lkml@gmail.com> wrote:
 > > --- a/drivers/gpu/drm/i915/intel_lvds.c
 > > +++ b/drivers/gpu/drm/i915/intel_lvds.c
 > > @@ -106,6 +106,12 @@ static void intel_lvds_enable(struct intel_lvds *intel_lvds)
-> >        I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON);
-> >        POSTING_READ(lvds_reg);
+> >        I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON);
+> >        POSTING_READ(lvds_reg);
 > >
-> > +       {
-> > +               u32 reg = HAS_PCH_SPLIT(dev) ? PCH_PP_STATUS : PPS_STATUS;
-> > +               if (wait_for(I915_READ(reg) & PP_ON, 1000))
-> > +                       DRM_ERROR("timed out waiting for panel to power up\n");
-> > +       }
+> > +       {
+> > +               u32 reg = HAS_PCH_SPLIT(dev) ? PCH_PP_STATUS : PPS_STATUS;
+> > +               if (wait_for(I915_READ(reg) & PP_ON, 1000))
+> > +                       DRM_ERROR("timed out waiting for panel to power up\n");
+> > +       }
 > > +
-> >        intel_panel_set_backlight(dev, dev_priv->backlight_level);
-> >  }
+> >        intel_panel_set_backlight(dev, dev_priv->backlight_level);
+> >  }
 > 
 > FWIW it does not compile:
 >   CC      drivers/gpu/drm/i915/intel_lvds.o
-> drivers/gpu/drm/i915/intel_lvds.c: In function ‘intel_lvds_enable’:
-> drivers/gpu/drm/i915/intel_lvds.c:110: error: ‘PPS_STATUS’ undeclared
+> drivers/gpu/drm/i915/intel_lvds.c: In function ‘intel_lvds_enable’:
+> drivers/gpu/drm/i915/intel_lvds.c:110: error: ‘PPS_STATUS’ undeclared
 > (first use in this function)
 > drivers/gpu/drm/i915/intel_lvds.c:110: error: (Each undeclared
 > identifier is reported only once
diff --git a/a/content_digest b/N1/content_digest
index 29c27e1..3e5147a 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -26,22 +26,22 @@
  "> > --- a/drivers/gpu/drm/i915/intel_lvds.c\n"
  "> > +++ b/drivers/gpu/drm/i915/intel_lvds.c\n"
  "> > @@ -106,6 +106,12 @@ static void intel_lvds_enable(struct intel_lvds *intel_lvds)\n"
- "> > \302\240 \302\240 \302\240 \302\240I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON);\n"
- "> > \302\240 \302\240 \302\240 \302\240POSTING_READ(lvds_reg);\n"
+ "> > \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240I915_WRITE(ctl_reg, I915_READ(ctl_reg) | POWER_TARGET_ON);\n"
+ "> > \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240POSTING_READ(lvds_reg);\n"
  "> >\n"
- "> > + \302\240 \302\240 \302\240 {\n"
- "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 u32 reg = HAS_PCH_SPLIT(dev) ? PCH_PP_STATUS : PPS_STATUS;\n"
- "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 if (wait_for(I915_READ(reg) & PP_ON, 1000))\n"
- "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 DRM_ERROR(\"timed out waiting for panel to power up\\n\");\n"
- "> > + \302\240 \302\240 \302\240 }\n"
+ "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 {\n"
+ "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 u32 reg = HAS_PCH_SPLIT(dev) ? PCH_PP_STATUS : PPS_STATUS;\n"
+ "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 if (wait_for(I915_READ(reg) & PP_ON, 1000))\n"
+ "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240 DRM_ERROR(\"timed out waiting for panel to power up\\n\");\n"
+ "> > + \303\202\302\240 \303\202\302\240 \303\202\302\240 }\n"
  "> > +\n"
- "> > \302\240 \302\240 \302\240 \302\240intel_panel_set_backlight(dev, dev_priv->backlight_level);\n"
- "> > \302\240}\n"
+ "> > \303\202\302\240 \303\202\302\240 \303\202\302\240 \303\202\302\240intel_panel_set_backlight(dev, dev_priv->backlight_level);\n"
+ "> > \303\202\302\240}\n"
  "> \n"
  "> FWIW it does not compile:\n"
  ">   CC      drivers/gpu/drm/i915/intel_lvds.o\n"
- "> drivers/gpu/drm/i915/intel_lvds.c: In function \342\200\230intel_lvds_enable\342\200\231:\n"
- "> drivers/gpu/drm/i915/intel_lvds.c:110: error: \342\200\230PPS_STATUS\342\200\231 undeclared\n"
+ "> drivers/gpu/drm/i915/intel_lvds.c: In function \303\242\302\200\302\230intel_lvds_enable\303\242\302\200\302\231:\n"
+ "> drivers/gpu/drm/i915/intel_lvds.c:110: error: \303\242\302\200\302\230PPS_STATUS\303\242\302\200\302\231 undeclared\n"
  "> (first use in this function)\n"
  "> drivers/gpu/drm/i915/intel_lvds.c:110: error: (Each undeclared\n"
  "> identifier is reported only once\n"
@@ -56,4 +56,4 @@
  "-- \n"
  Chris Wilson, Intel Open Source Technology Centre
 
-88014755bc2027feb569416368c03d47015a366c3baa91d94909a429c67a11f4
+a96364fc7c35c26e1b310190e0546fe616a872ccffb86b550ea9e745f2987006

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.