| Message ID | 1448383645-7615-1-git-send-email-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 24, 2015 at 06:47:25PM +0200, Jani Nikula wrote: > commit b04c5bd6fda54703e56f29569e4bca489d6c5a5c > Author: Borun Fu <borun.fu@intel.com> > Date: Sat Jul 12 10:02:27 2014 +0530 > > drm/i915: Power gating display wells during i915_pm_suspend > > moved for_each_power_domain from intel_display.c to i915_drv.h but we > still have the definition around in intel_display.c, presumably due to a > merge conflict resolution gone wrong (that I didn't bother to try to > find). Just remove the extra definition left behind. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> It was me in commit 4dac3edfe68e5e1b3c2216b84ba160572420fa40 Merge: 487777673e35 e05444be705b Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Tue Jul 29 20:49:36 2014 +0200 Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next Somehow git isn't too awesome at displaying screwed-up resolotions. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/i915/intel_display.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index 21f703397f09..75f03e5bee51 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -5232,10 +5232,6 @@ static enum intel_display_power_domain port_to_aux_power_domain(enum port port) > } > } > > -#define for_each_power_domain(domain, mask) \ > - for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++) \ > - if ((1 << (domain)) & (mask)) > - > enum intel_display_power_domain > intel_display_port_power_domain(struct intel_encoder *intel_encoder) > { > -- > 2.1.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Tue, 24 Nov 2015, Daniel Vetter <daniel@ffwll.ch> wrote: > On Tue, Nov 24, 2015 at 06:47:25PM +0200, Jani Nikula wrote: >> commit b04c5bd6fda54703e56f29569e4bca489d6c5a5c >> Author: Borun Fu <borun.fu@intel.com> >> Date: Sat Jul 12 10:02:27 2014 +0530 >> >> drm/i915: Power gating display wells during i915_pm_suspend >> >> moved for_each_power_domain from intel_display.c to i915_drv.h but we >> still have the definition around in intel_display.c, presumably due to a >> merge conflict resolution gone wrong (that I didn't bother to try to >> find). Just remove the extra definition left behind. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > It was me in > > commit 4dac3edfe68e5e1b3c2216b84ba160572420fa40 > Merge: 487777673e35 e05444be705b > Author: Daniel Vetter <daniel.vetter@ffwll.ch> > Date: Tue Jul 29 20:49:36 2014 +0200 > > Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next > > Somehow git isn't too awesome at displaying screwed-up resolotions. > > Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Pushed to drm-intel-next-queued, with the commit message amended, thanks for the review. BR, Jani. > >> --- >> drivers/gpu/drm/i915/intel_display.c | 4 ---- >> 1 file changed, 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >> index 21f703397f09..75f03e5bee51 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -5232,10 +5232,6 @@ static enum intel_display_power_domain port_to_aux_power_domain(enum port port) >> } >> } >> >> -#define for_each_power_domain(domain, mask) \ >> - for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++) \ >> - if ((1 << (domain)) & (mask)) >> - >> enum intel_display_power_domain >> intel_display_port_power_domain(struct intel_encoder *intel_encoder) >> { >> -- >> 2.1.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 21f703397f09..75f03e5bee51 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5232,10 +5232,6 @@ static enum intel_display_power_domain port_to_aux_power_domain(enum port port) } } -#define for_each_power_domain(domain, mask) \ - for ((domain) = 0; (domain) < POWER_DOMAIN_NUM; (domain)++) \ - if ((1 << (domain)) & (mask)) - enum intel_display_power_domain intel_display_port_power_domain(struct intel_encoder *intel_encoder) {
commit b04c5bd6fda54703e56f29569e4bca489d6c5a5c Author: Borun Fu <borun.fu@intel.com> Date: Sat Jul 12 10:02:27 2014 +0530 drm/i915: Power gating display wells during i915_pm_suspend moved for_each_power_domain from intel_display.c to i915_drv.h but we still have the definition around in intel_display.c, presumably due to a merge conflict resolution gone wrong (that I didn't bother to try to find). Just remove the extra definition left behind. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 4 ---- 1 file changed, 4 deletions(-)