* [PATCH 1/2] drm/i915: Remove excess inline keywords @ 2015-05-11 17:49 ville.syrjala 2015-05-11 17:49 ` [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV ville.syrjala 2015-05-12 8:52 ` [PATCH 1/2] drm/i915: Remove excess inline keywords Jani Nikula 0 siblings, 2 replies; 8+ messages in thread From: ville.syrjala @ 2015-05-11 17:49 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> Remove some inline keywords. One of the functions has clearly outgrown it anyway, so let's just leave it to the compiler. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/i915_irq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 9da955e..9c5371b 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1386,7 +1386,7 @@ static int i915_port_to_hotplug_shift(enum port port) } } -static inline enum port get_port_from_pin(enum hpd_pin pin) +static enum port get_port_from_pin(enum hpd_pin pin) { switch (pin) { case HPD_PORT_B: @@ -1400,10 +1400,10 @@ static inline enum port get_port_from_pin(enum hpd_pin pin) } } -static inline void intel_hpd_irq_handler(struct drm_device *dev, - u32 hotplug_trigger, - u32 dig_hotplug_reg, - const u32 hpd[HPD_NUM_PINS]) +static void intel_hpd_irq_handler(struct drm_device *dev, + u32 hotplug_trigger, + u32 dig_hotplug_reg, + const u32 hpd[HPD_NUM_PINS]) { struct drm_i915_private *dev_priv = dev->dev_private; int i; -- 2.0.5 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV 2015-05-11 17:49 [PATCH 1/2] drm/i915: Remove excess inline keywords ville.syrjala @ 2015-05-11 17:49 ` ville.syrjala 2015-05-12 8:54 ` Jani Nikula 2015-05-15 4:40 ` shuang.he 2015-05-12 8:52 ` [PATCH 1/2] drm/i915: Remove excess inline keywords Jani Nikula 1 sibling, 2 replies; 8+ messages in thread From: ville.syrjala @ 2015-05-11 17:49 UTC (permalink / raw) To: intel-gfx From: Ville Syrjälä <ville.syrjala@linux.intel.com> Use HOTPLUG_INT_STATUS_G4X instead of HOTPLUG_INT_STATUS_I915 on VLV/CHV so that we don't confuse the AUX status bits with SDVO status bits. Avoid pointless log spam as below while handling AUX interrupts: [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 [drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/gpu/drm/i915/i915_irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 9c5371b..557af88 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -79,7 +79,7 @@ static const u32 hpd_status_g4x[HPD_NUM_PINS] = { [HPD_PORT_D] = PORTD_HOTPLUG_INT_STATUS }; -static const u32 hpd_status_i915[HPD_NUM_PINS] = { /* i915 and valleyview are the same */ +static const u32 hpd_status_i915[HPD_NUM_PINS] = { [HPD_CRT] = CRT_HOTPLUG_INT_STATUS, [HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_I915, [HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_I915, @@ -1743,7 +1743,7 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev) */ POSTING_READ(PORT_HOTPLUG_STAT); - if (IS_G4X(dev)) { + if (IS_G4X(dev) || IS_VALLEYVIEW(dev)) { u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X; intel_hpd_irq_handler(dev, hotplug_trigger, 0, hpd_status_g4x); -- 2.0.5 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV 2015-05-11 17:49 ` [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV ville.syrjala @ 2015-05-12 8:54 ` Jani Nikula 2015-05-12 10:24 ` Daniel Vetter 2015-05-12 10:27 ` Ville Syrjälä 2015-05-15 4:40 ` shuang.he 1 sibling, 2 replies; 8+ messages in thread From: Jani Nikula @ 2015-05-12 8:54 UTC (permalink / raw) To: ville.syrjala, intel-gfx On Mon, 11 May 2015, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Use HOTPLUG_INT_STATUS_G4X instead of HOTPLUG_INT_STATUS_I915 on VLV/CHV > so that we don't confuse the AUX status bits with SDVO status bits. > > Avoid pointless log spam as below while handling AUX interrupts: > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > [drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064 > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> Shouldn't we also have bugs about missing hotplug on BYT...? Like, there's a lot of talk about power management on https://bugs.freedesktop.org/show_bug.cgi?id=89008 but could this make a difference? BR, Jani. > --- > drivers/gpu/drm/i915/i915_irq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 9c5371b..557af88 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -79,7 +79,7 @@ static const u32 hpd_status_g4x[HPD_NUM_PINS] = { > [HPD_PORT_D] = PORTD_HOTPLUG_INT_STATUS > }; > > -static const u32 hpd_status_i915[HPD_NUM_PINS] = { /* i915 and valleyview are the same */ > +static const u32 hpd_status_i915[HPD_NUM_PINS] = { > [HPD_CRT] = CRT_HOTPLUG_INT_STATUS, > [HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_I915, > [HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_I915, > @@ -1743,7 +1743,7 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev) > */ > POSTING_READ(PORT_HOTPLUG_STAT); > > - if (IS_G4X(dev)) { > + if (IS_G4X(dev) || IS_VALLEYVIEW(dev)) { > u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X; > > intel_hpd_irq_handler(dev, hotplug_trigger, 0, hpd_status_g4x); > -- > 2.0.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV 2015-05-12 8:54 ` Jani Nikula @ 2015-05-12 10:24 ` Daniel Vetter 2015-05-12 10:27 ` Ville Syrjälä 1 sibling, 0 replies; 8+ messages in thread From: Daniel Vetter @ 2015-05-12 10:24 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx On Tue, May 12, 2015 at 11:54:23AM +0300, Jani Nikula wrote: > On Mon, 11 May 2015, ville.syrjala@linux.intel.com wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Use HOTPLUG_INT_STATUS_G4X instead of HOTPLUG_INT_STATUS_I915 on VLV/CHV > > so that we don't confuse the AUX status bits with SDVO status bits. > > > > Avoid pointless log spam as below while handling AUX interrupts: > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064 > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> Both applied to dinq, thanks. -Daniel > Shouldn't we also have bugs about missing hotplug on BYT...? Like, > there's a lot of talk about power management on > > https://bugs.freedesktop.org/show_bug.cgi?id=89008 > > but could this make a difference? > > BR, > Jani. > > > > --- > > drivers/gpu/drm/i915/i915_irq.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > > index 9c5371b..557af88 100644 > > --- a/drivers/gpu/drm/i915/i915_irq.c > > +++ b/drivers/gpu/drm/i915/i915_irq.c > > @@ -79,7 +79,7 @@ static const u32 hpd_status_g4x[HPD_NUM_PINS] = { > > [HPD_PORT_D] = PORTD_HOTPLUG_INT_STATUS > > }; > > > > -static const u32 hpd_status_i915[HPD_NUM_PINS] = { /* i915 and valleyview are the same */ > > +static const u32 hpd_status_i915[HPD_NUM_PINS] = { > > [HPD_CRT] = CRT_HOTPLUG_INT_STATUS, > > [HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_I915, > > [HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_I915, > > @@ -1743,7 +1743,7 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev) > > */ > > POSTING_READ(PORT_HOTPLUG_STAT); > > > > - if (IS_G4X(dev)) { > > + if (IS_G4X(dev) || IS_VALLEYVIEW(dev)) { > > u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X; > > > > intel_hpd_irq_handler(dev, hotplug_trigger, 0, hpd_status_g4x); > > -- > > 2.0.5 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Jani Nikula, Intel Open Source Technology Center > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV 2015-05-12 8:54 ` Jani Nikula 2015-05-12 10:24 ` Daniel Vetter @ 2015-05-12 10:27 ` Ville Syrjälä 2015-05-12 11:42 ` Daniel Vetter 1 sibling, 1 reply; 8+ messages in thread From: Ville Syrjälä @ 2015-05-12 10:27 UTC (permalink / raw) To: Jani Nikula; +Cc: intel-gfx On Tue, May 12, 2015 at 11:54:23AM +0300, Jani Nikula wrote: > On Mon, 11 May 2015, ville.syrjala@linux.intel.com wrote: > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Use HOTPLUG_INT_STATUS_G4X instead of HOTPLUG_INT_STATUS_I915 on VLV/CHV > > so that we don't confuse the AUX status bits with SDVO status bits. > > > > Avoid pointless log spam as below while handling AUX interrupts: > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > [drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064 > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > Shouldn't we also have bugs about missing hotplug on BYT...? Like, > there's a lot of talk about power management on > > https://bugs.freedesktop.org/show_bug.cgi?id=89008 > > but could this make a difference? Both HOTPLUG_INT_STATUS_G4X and HOTPLUG_INT_STATUS_I915 have the required bits to have working hpd on VLV/CHV. Only the SDVO bits differ, and we don't care about those. So the only issue is that the i915 SDVO bits overlap with the AUX bits, so every time we get an AUX interrupt we also think we get an SDVO hpd. > > BR, > Jani. > > > > --- > > drivers/gpu/drm/i915/i915_irq.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > > index 9c5371b..557af88 100644 > > --- a/drivers/gpu/drm/i915/i915_irq.c > > +++ b/drivers/gpu/drm/i915/i915_irq.c > > @@ -79,7 +79,7 @@ static const u32 hpd_status_g4x[HPD_NUM_PINS] = { > > [HPD_PORT_D] = PORTD_HOTPLUG_INT_STATUS > > }; > > > > -static const u32 hpd_status_i915[HPD_NUM_PINS] = { /* i915 and valleyview are the same */ > > +static const u32 hpd_status_i915[HPD_NUM_PINS] = { > > [HPD_CRT] = CRT_HOTPLUG_INT_STATUS, > > [HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_I915, > > [HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_I915, > > @@ -1743,7 +1743,7 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev) > > */ > > POSTING_READ(PORT_HOTPLUG_STAT); > > > > - if (IS_G4X(dev)) { > > + if (IS_G4X(dev) || IS_VALLEYVIEW(dev)) { > > u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X; > > > > intel_hpd_irq_handler(dev, hotplug_trigger, 0, hpd_status_g4x); > > -- > > 2.0.5 > > > > _______________________________________________ > > Intel-gfx mailing list > > Intel-gfx@lists.freedesktop.org > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Jani Nikula, Intel Open Source Technology Center -- Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV 2015-05-12 10:27 ` Ville Syrjälä @ 2015-05-12 11:42 ` Daniel Vetter 0 siblings, 0 replies; 8+ messages in thread From: Daniel Vetter @ 2015-05-12 11:42 UTC (permalink / raw) To: Ville Syrjälä; +Cc: intel-gfx On Tue, May 12, 2015 at 01:27:08PM +0300, Ville Syrjälä wrote: > On Tue, May 12, 2015 at 11:54:23AM +0300, Jani Nikula wrote: > > On Mon, 11 May 2015, ville.syrjala@linux.intel.com wrote: > > > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > > > Use HOTPLUG_INT_STATUS_G4X instead of HOTPLUG_INT_STATUS_I915 on VLV/CHV > > > so that we don't confuse the AUX status bits with SDVO status bits. > > > > > > Avoid pointless log spam as below while handling AUX interrupts: > > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > > [drm:intel_hpd_irq_handler] hotplug event received, stat 0x00000040, dig 0x00000000 > > > [drm:intel_dp_aux_ch] dp_aux_ch timeout status 0x71450064 > > > > > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > > > > Reviewed-by: Jani Nikula <jani.nikula@intel.com> > > > > Shouldn't we also have bugs about missing hotplug on BYT...? Like, > > there's a lot of talk about power management on > > > > https://bugs.freedesktop.org/show_bug.cgi?id=89008 > > > > but could this make a difference? > > Both HOTPLUG_INT_STATUS_G4X and HOTPLUG_INT_STATUS_I915 have the > required bits to have working hpd on VLV/CHV. Only the SDVO bits > differ, and we don't care about those. So the only issue is that > the i915 SDVO bits overlap with the AUX bits, so every time we > get an AUX interrupt we also think we get an SDVO hpd. I've added this to the commit message as a note. -Daniel > > > > > BR, > > Jani. > > > > > > > --- > > > drivers/gpu/drm/i915/i915_irq.c | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > > > index 9c5371b..557af88 100644 > > > --- a/drivers/gpu/drm/i915/i915_irq.c > > > +++ b/drivers/gpu/drm/i915/i915_irq.c > > > @@ -79,7 +79,7 @@ static const u32 hpd_status_g4x[HPD_NUM_PINS] = { > > > [HPD_PORT_D] = PORTD_HOTPLUG_INT_STATUS > > > }; > > > > > > -static const u32 hpd_status_i915[HPD_NUM_PINS] = { /* i915 and valleyview are the same */ > > > +static const u32 hpd_status_i915[HPD_NUM_PINS] = { > > > [HPD_CRT] = CRT_HOTPLUG_INT_STATUS, > > > [HPD_SDVO_B] = SDVOB_HOTPLUG_INT_STATUS_I915, > > > [HPD_SDVO_C] = SDVOC_HOTPLUG_INT_STATUS_I915, > > > @@ -1743,7 +1743,7 @@ static void i9xx_hpd_irq_handler(struct drm_device *dev) > > > */ > > > POSTING_READ(PORT_HOTPLUG_STAT); > > > > > > - if (IS_G4X(dev)) { > > > + if (IS_G4X(dev) || IS_VALLEYVIEW(dev)) { > > > u32 hotplug_trigger = hotplug_status & HOTPLUG_INT_STATUS_G4X; > > > > > > intel_hpd_irq_handler(dev, hotplug_trigger, 0, hpd_status_g4x); > > > -- > > > 2.0.5 > > > > > > _______________________________________________ > > > Intel-gfx mailing list > > > Intel-gfx@lists.freedesktop.org > > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > > > -- > > Jani Nikula, Intel Open Source Technology Center > > -- > Ville Syrjälä > Intel OTC > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV 2015-05-11 17:49 ` [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV ville.syrjala 2015-05-12 8:54 ` Jani Nikula @ 2015-05-15 4:40 ` shuang.he 1 sibling, 0 replies; 8+ messages in thread From: shuang.he @ 2015-05-15 4:40 UTC (permalink / raw) To: shuang.he, ethan.gao, intel-gfx, ville.syrjala Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) Task id: 6382 -------------------------------------Summary------------------------------------- Platform Delta drm-intel-nightly Series Applied PNV 276/276 276/276 ILK 302/302 302/302 SNB -1 314/314 313/314 IVB 338/338 338/338 BYT 286/286 286/286 BDW 320/320 320/320 -------------------------------------Detailed------------------------------------- Platform Test drm-intel-nightly Series Applied SNB igt@pm_rpm@dpms-mode-unset-non-lpsp DMESG_WARN(13)PASS(1) DMESG_WARN(1) (dmesg patch applied)WARNING:at_drivers/gpu/drm/i915/intel_uncore.c:#assert_device_not_suspended[i915]()@WARNING:.* at .* assert_device_not_suspended+0x Note: You need to pay more attention to line start with '*' _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] drm/i915: Remove excess inline keywords 2015-05-11 17:49 [PATCH 1/2] drm/i915: Remove excess inline keywords ville.syrjala 2015-05-11 17:49 ` [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV ville.syrjala @ 2015-05-12 8:52 ` Jani Nikula 1 sibling, 0 replies; 8+ messages in thread From: Jani Nikula @ 2015-05-12 8:52 UTC (permalink / raw) To: ville.syrjala, intel-gfx On Mon, 11 May 2015, ville.syrjala@linux.intel.com wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Remove some inline keywords. One of the functions has clearly outgrown > it anyway, so let's just leave it to the compiler. > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/i915_irq.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index 9da955e..9c5371b 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -1386,7 +1386,7 @@ static int i915_port_to_hotplug_shift(enum port port) > } > } > > -static inline enum port get_port_from_pin(enum hpd_pin pin) > +static enum port get_port_from_pin(enum hpd_pin pin) > { > switch (pin) { > case HPD_PORT_B: > @@ -1400,10 +1400,10 @@ static inline enum port get_port_from_pin(enum hpd_pin pin) > } > } > > -static inline void intel_hpd_irq_handler(struct drm_device *dev, > - u32 hotplug_trigger, > - u32 dig_hotplug_reg, > - const u32 hpd[HPD_NUM_PINS]) > +static void intel_hpd_irq_handler(struct drm_device *dev, > + u32 hotplug_trigger, > + u32 dig_hotplug_reg, > + const u32 hpd[HPD_NUM_PINS]) > { > struct drm_i915_private *dev_priv = dev->dev_private; > int i; > -- > 2.0.5 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-05-15 4:40 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-05-11 17:49 [PATCH 1/2] drm/i915: Remove excess inline keywords ville.syrjala 2015-05-11 17:49 ` [PATCH 2/2] drm/i915: Use HOTPLUG_INT_STATUS_G4X on VLV/CHV ville.syrjala 2015-05-12 8:54 ` Jani Nikula 2015-05-12 10:24 ` Daniel Vetter 2015-05-12 10:27 ` Ville Syrjälä 2015-05-12 11:42 ` Daniel Vetter 2015-05-15 4:40 ` shuang.he 2015-05-12 8:52 ` [PATCH 1/2] drm/i915: Remove excess inline keywords Jani Nikula
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox