* [PATCH 0/2] drm/i915: initialize backlight pwm frequency from vbt if needed @ 2014-01-07 16:01 Jani Nikula 2014-01-07 16:01 ` [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c Jani Nikula 2014-01-07 16:01 ` [PATCH 2/2] drm/i915: initialize backlight max from vbt Jani Nikula 0 siblings, 2 replies; 9+ messages in thread From: Jani Nikula @ 2014-01-07 16:01 UTC (permalink / raw) To: intel-gfx, vathsala.nagaraju; +Cc: jani.nikula, rajneesh.bhardwaj, naveen.m Per inquiries from Vathsala et al, here's some early code for initializing the backlight PWM from VBT if it hasn't been initialized by the BIOS. I didn't have the chance to test this at all yet, just wanted to unblock others. Testing and comments welcome. Particularly the frequency in Hz to PWM register value conversions need eyeballs. BR, Jani. Jani Nikula (2): drm/i915: move intel_hrawclk() to intel_display.c drm/i915: initialize backlight max from vbt drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 33 ++++++ drivers/gpu/drm/i915/intel_dp.c | 34 ------ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_panel.c | 197 +++++++++++++++++++++++++++++----- 5 files changed, 204 insertions(+), 62 deletions(-) -- 1.7.10.4 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c 2014-01-07 16:01 [PATCH 0/2] drm/i915: initialize backlight pwm frequency from vbt if needed Jani Nikula @ 2014-01-07 16:01 ` Jani Nikula 2014-01-07 16:25 ` Daniel Vetter 2014-02-05 15:02 ` Jesse Barnes 2014-01-07 16:01 ` [PATCH 2/2] drm/i915: initialize backlight max from vbt Jani Nikula 1 sibling, 2 replies; 9+ messages in thread From: Jani Nikula @ 2014-01-07 16:01 UTC (permalink / raw) To: intel-gfx, vathsala.nagaraju; +Cc: jani.nikula, rajneesh.bhardwaj, naveen.m Make it available outside of intel_dp.c. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 34 ---------------------------------- drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a562eef..e784feb 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -78,6 +78,39 @@ intel_pch_rawclk(struct drm_device *dev) return I915_READ(PCH_RAWCLK_FREQ) & RAWCLK_FREQ_MASK; } +/* hrawclock is 1/4 the FSB frequency */ +int intel_hrawclk(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + uint32_t clkcfg; + + /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ + if (IS_VALLEYVIEW(dev)) + return 200; + + clkcfg = I915_READ(CLKCFG); + switch (clkcfg & CLKCFG_FSB_MASK) { + case CLKCFG_FSB_400: + return 100; + case CLKCFG_FSB_533: + return 133; + case CLKCFG_FSB_667: + return 166; + case CLKCFG_FSB_800: + return 200; + case CLKCFG_FSB_1067: + return 266; + case CLKCFG_FSB_1333: + return 333; + /* these two are just a guess; one of them might be right */ + case CLKCFG_FSB_1600: + case CLKCFG_FSB_1600_ALT: + return 400; + default: + return 133; + } +} + static inline u32 /* units of 100MHz */ intel_fdi_link_freq(struct drm_device *dev) { diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 7df5085..a36a2a3 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -203,40 +203,6 @@ unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes) dst[i] = src >> ((3-i) * 8); } -/* hrawclock is 1/4 the FSB frequency */ -static int -intel_hrawclk(struct drm_device *dev) -{ - struct drm_i915_private *dev_priv = dev->dev_private; - uint32_t clkcfg; - - /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ - if (IS_VALLEYVIEW(dev)) - return 200; - - clkcfg = I915_READ(CLKCFG); - switch (clkcfg & CLKCFG_FSB_MASK) { - case CLKCFG_FSB_400: - return 100; - case CLKCFG_FSB_533: - return 133; - case CLKCFG_FSB_667: - return 166; - case CLKCFG_FSB_800: - return 200; - case CLKCFG_FSB_1067: - return 266; - case CLKCFG_FSB_1333: - return 333; - /* these two are just a guess; one of them might be right */ - case CLKCFG_FSB_1600: - case CLKCFG_FSB_1600_ALT: - return 400; - default: - return 133; - } -} - static void intel_dp_init_panel_power_sequencer(struct drm_device *dev, struct intel_dp *intel_dp, diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 46aea6c..9c5e984 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -626,6 +626,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, /* intel_display.c */ int intel_pch_rawclk(struct drm_device *dev); +int intel_hrawclk(struct drm_device *dev); void intel_mark_busy(struct drm_device *dev); void intel_mark_fb_busy(struct drm_i915_gem_object *obj, struct intel_ring_buffer *ring); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c 2014-01-07 16:01 ` [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c Jani Nikula @ 2014-01-07 16:25 ` Daniel Vetter 2014-01-07 16:46 ` Jani Nikula 2014-02-05 15:02 ` Jesse Barnes 1 sibling, 1 reply; 9+ messages in thread From: Daniel Vetter @ 2014-01-07 16:25 UTC (permalink / raw) To: Jani Nikula; +Cc: vathsala.nagaraju, intel-gfx, naveen.m, rajneesh.bhardwaj On Tue, Jan 07, 2014 at 06:01:33PM +0200, Jani Nikula wrote: > Make it available outside of intel_dp.c. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Since this only really applies to gmch platforms I wonder whether we should give this a more platforms specific prefix. Established precedence would point towardy i9xx_ I think ... But I'm happy with other colors, too. Maybe a patch on top of this series for less fuzz? -Daniel > --- > drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_dp.c | 34 ---------------------------------- > drivers/gpu/drm/i915/intel_drv.h | 1 + > 3 files changed, 34 insertions(+), 34 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index a562eef..e784feb 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -78,6 +78,39 @@ intel_pch_rawclk(struct drm_device *dev) > return I915_READ(PCH_RAWCLK_FREQ) & RAWCLK_FREQ_MASK; > } > > +/* hrawclock is 1/4 the FSB frequency */ > +int intel_hrawclk(struct drm_device *dev) > +{ > + struct drm_i915_private *dev_priv = dev->dev_private; > + uint32_t clkcfg; > + > + /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ > + if (IS_VALLEYVIEW(dev)) > + return 200; > + > + clkcfg = I915_READ(CLKCFG); > + switch (clkcfg & CLKCFG_FSB_MASK) { > + case CLKCFG_FSB_400: > + return 100; > + case CLKCFG_FSB_533: > + return 133; > + case CLKCFG_FSB_667: > + return 166; > + case CLKCFG_FSB_800: > + return 200; > + case CLKCFG_FSB_1067: > + return 266; > + case CLKCFG_FSB_1333: > + return 333; > + /* these two are just a guess; one of them might be right */ > + case CLKCFG_FSB_1600: > + case CLKCFG_FSB_1600_ALT: > + return 400; > + default: > + return 133; > + } > +} > + > static inline u32 /* units of 100MHz */ > intel_fdi_link_freq(struct drm_device *dev) > { > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 7df5085..a36a2a3 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -203,40 +203,6 @@ unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes) > dst[i] = src >> ((3-i) * 8); > } > > -/* hrawclock is 1/4 the FSB frequency */ > -static int > -intel_hrawclk(struct drm_device *dev) > -{ > - struct drm_i915_private *dev_priv = dev->dev_private; > - uint32_t clkcfg; > - > - /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ > - if (IS_VALLEYVIEW(dev)) > - return 200; > - > - clkcfg = I915_READ(CLKCFG); > - switch (clkcfg & CLKCFG_FSB_MASK) { > - case CLKCFG_FSB_400: > - return 100; > - case CLKCFG_FSB_533: > - return 133; > - case CLKCFG_FSB_667: > - return 166; > - case CLKCFG_FSB_800: > - return 200; > - case CLKCFG_FSB_1067: > - return 266; > - case CLKCFG_FSB_1333: > - return 333; > - /* these two are just a guess; one of them might be right */ > - case CLKCFG_FSB_1600: > - case CLKCFG_FSB_1600_ALT: > - return 400; > - default: > - return 133; > - } > -} > - > static void > intel_dp_init_panel_power_sequencer(struct drm_device *dev, > struct intel_dp *intel_dp, > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 46aea6c..9c5e984 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -626,6 +626,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, > > /* intel_display.c */ > int intel_pch_rawclk(struct drm_device *dev); > +int intel_hrawclk(struct drm_device *dev); > void intel_mark_busy(struct drm_device *dev); > void intel_mark_fb_busy(struct drm_i915_gem_object *obj, > struct intel_ring_buffer *ring); > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c 2014-01-07 16:25 ` Daniel Vetter @ 2014-01-07 16:46 ` Jani Nikula 0 siblings, 0 replies; 9+ messages in thread From: Jani Nikula @ 2014-01-07 16:46 UTC (permalink / raw) To: Daniel Vetter; +Cc: vathsala.nagaraju, intel-gfx, rajneesh.bhardwaj, naveen.m On Tue, 07 Jan 2014, Daniel Vetter <daniel@ffwll.ch> wrote: > On Tue, Jan 07, 2014 at 06:01:33PM +0200, Jani Nikula wrote: >> Make it available outside of intel_dp.c. >> >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> > > Since this only really applies to gmch platforms I wonder whether we > should give this a more platforms specific prefix. Established precedence > would point towardy i9xx_ I think ... But I'm happy with other colors, > too. Maybe a patch on top of this series for less fuzz? Good point, will do (once we have this cleared up). BR, Jani. > -Daniel > >> --- >> drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++++++++++++++++ >> drivers/gpu/drm/i915/intel_dp.c | 34 ---------------------------------- >> drivers/gpu/drm/i915/intel_drv.h | 1 + >> 3 files changed, 34 insertions(+), 34 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c >> index a562eef..e784feb 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -78,6 +78,39 @@ intel_pch_rawclk(struct drm_device *dev) >> return I915_READ(PCH_RAWCLK_FREQ) & RAWCLK_FREQ_MASK; >> } >> >> +/* hrawclock is 1/4 the FSB frequency */ >> +int intel_hrawclk(struct drm_device *dev) >> +{ >> + struct drm_i915_private *dev_priv = dev->dev_private; >> + uint32_t clkcfg; >> + >> + /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ >> + if (IS_VALLEYVIEW(dev)) >> + return 200; >> + >> + clkcfg = I915_READ(CLKCFG); >> + switch (clkcfg & CLKCFG_FSB_MASK) { >> + case CLKCFG_FSB_400: >> + return 100; >> + case CLKCFG_FSB_533: >> + return 133; >> + case CLKCFG_FSB_667: >> + return 166; >> + case CLKCFG_FSB_800: >> + return 200; >> + case CLKCFG_FSB_1067: >> + return 266; >> + case CLKCFG_FSB_1333: >> + return 333; >> + /* these two are just a guess; one of them might be right */ >> + case CLKCFG_FSB_1600: >> + case CLKCFG_FSB_1600_ALT: >> + return 400; >> + default: >> + return 133; >> + } >> +} >> + >> static inline u32 /* units of 100MHz */ >> intel_fdi_link_freq(struct drm_device *dev) >> { >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index 7df5085..a36a2a3 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -203,40 +203,6 @@ unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes) >> dst[i] = src >> ((3-i) * 8); >> } >> >> -/* hrawclock is 1/4 the FSB frequency */ >> -static int >> -intel_hrawclk(struct drm_device *dev) >> -{ >> - struct drm_i915_private *dev_priv = dev->dev_private; >> - uint32_t clkcfg; >> - >> - /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ >> - if (IS_VALLEYVIEW(dev)) >> - return 200; >> - >> - clkcfg = I915_READ(CLKCFG); >> - switch (clkcfg & CLKCFG_FSB_MASK) { >> - case CLKCFG_FSB_400: >> - return 100; >> - case CLKCFG_FSB_533: >> - return 133; >> - case CLKCFG_FSB_667: >> - return 166; >> - case CLKCFG_FSB_800: >> - return 200; >> - case CLKCFG_FSB_1067: >> - return 266; >> - case CLKCFG_FSB_1333: >> - return 333; >> - /* these two are just a guess; one of them might be right */ >> - case CLKCFG_FSB_1600: >> - case CLKCFG_FSB_1600_ALT: >> - return 400; >> - default: >> - return 133; >> - } >> -} >> - >> static void >> intel_dp_init_panel_power_sequencer(struct drm_device *dev, >> struct intel_dp *intel_dp, >> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h >> index 46aea6c..9c5e984 100644 >> --- a/drivers/gpu/drm/i915/intel_drv.h >> +++ b/drivers/gpu/drm/i915/intel_drv.h >> @@ -626,6 +626,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, >> >> /* intel_display.c */ >> int intel_pch_rawclk(struct drm_device *dev); >> +int intel_hrawclk(struct drm_device *dev); >> void intel_mark_busy(struct drm_device *dev); >> void intel_mark_fb_busy(struct drm_i915_gem_object *obj, >> struct intel_ring_buffer *ring); >> -- >> 1.7.10.4 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > > -- > Daniel Vetter > Software Engineer, Intel Corporation > +41 (0) 79 365 57 48 - http://blog.ffwll.ch > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c 2014-01-07 16:01 ` [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c Jani Nikula 2014-01-07 16:25 ` Daniel Vetter @ 2014-02-05 15:02 ` Jesse Barnes 1 sibling, 0 replies; 9+ messages in thread From: Jesse Barnes @ 2014-02-05 15:02 UTC (permalink / raw) To: Jani Nikula; +Cc: vathsala.nagaraju, intel-gfx, naveen.m, rajneesh.bhardwaj On Tue, 7 Jan 2014 18:01:33 +0200 Jani Nikula <jani.nikula@intel.com> wrote: > Make it available outside of intel_dp.c. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_dp.c | 34 ---------------------------------- > drivers/gpu/drm/i915/intel_drv.h | 1 + > 3 files changed, 34 insertions(+), 34 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index a562eef..e784feb 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -78,6 +78,39 @@ intel_pch_rawclk(struct drm_device *dev) > return I915_READ(PCH_RAWCLK_FREQ) & RAWCLK_FREQ_MASK; > } > > +/* hrawclock is 1/4 the FSB frequency */ > +int intel_hrawclk(struct drm_device *dev) > +{ > + struct drm_i915_private *dev_priv = dev->dev_private; > + uint32_t clkcfg; > + > + /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ > + if (IS_VALLEYVIEW(dev)) > + return 200; > + > + clkcfg = I915_READ(CLKCFG); > + switch (clkcfg & CLKCFG_FSB_MASK) { > + case CLKCFG_FSB_400: > + return 100; > + case CLKCFG_FSB_533: > + return 133; > + case CLKCFG_FSB_667: > + return 166; > + case CLKCFG_FSB_800: > + return 200; > + case CLKCFG_FSB_1067: > + return 266; > + case CLKCFG_FSB_1333: > + return 333; > + /* these two are just a guess; one of them might be right */ > + case CLKCFG_FSB_1600: > + case CLKCFG_FSB_1600_ALT: > + return 400; > + default: > + return 133; > + } > +} > + > static inline u32 /* units of 100MHz */ > intel_fdi_link_freq(struct drm_device *dev) > { > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 7df5085..a36a2a3 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -203,40 +203,6 @@ unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes) > dst[i] = src >> ((3-i) * 8); > } > > -/* hrawclock is 1/4 the FSB frequency */ > -static int > -intel_hrawclk(struct drm_device *dev) > -{ > - struct drm_i915_private *dev_priv = dev->dev_private; > - uint32_t clkcfg; > - > - /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ > - if (IS_VALLEYVIEW(dev)) > - return 200; > - > - clkcfg = I915_READ(CLKCFG); > - switch (clkcfg & CLKCFG_FSB_MASK) { > - case CLKCFG_FSB_400: > - return 100; > - case CLKCFG_FSB_533: > - return 133; > - case CLKCFG_FSB_667: > - return 166; > - case CLKCFG_FSB_800: > - return 200; > - case CLKCFG_FSB_1067: > - return 266; > - case CLKCFG_FSB_1333: > - return 333; > - /* these two are just a guess; one of them might be right */ > - case CLKCFG_FSB_1600: > - case CLKCFG_FSB_1600_ALT: > - return 400; > - default: > - return 133; > - } > -} > - > static void > intel_dp_init_panel_power_sequencer(struct drm_device *dev, > struct intel_dp *intel_dp, > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 46aea6c..9c5e984 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -626,6 +626,7 @@ void intel_ddi_get_config(struct intel_encoder *encoder, > > /* intel_display.c */ > int intel_pch_rawclk(struct drm_device *dev); > +int intel_hrawclk(struct drm_device *dev); > void intel_mark_busy(struct drm_device *dev); > void intel_mark_fb_busy(struct drm_i915_gem_object *obj, > struct intel_ring_buffer *ring); Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 2/2] drm/i915: initialize backlight max from vbt 2014-01-07 16:01 [PATCH 0/2] drm/i915: initialize backlight pwm frequency from vbt if needed Jani Nikula 2014-01-07 16:01 ` [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c Jani Nikula @ 2014-01-07 16:01 ` Jani Nikula 1 sibling, 0 replies; 9+ messages in thread From: Jani Nikula @ 2014-01-07 16:01 UTC (permalink / raw) To: intel-gfx, vathsala.nagaraju; +Cc: jani.nikula, rajneesh.bhardwaj, naveen.m Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_panel.c | 197 +++++++++++++++++++++++++++++++----- 2 files changed, 170 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index a699efd..344f717 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4531,6 +4531,7 @@ #define SOUTH_CHICKEN2 0xc2004 #define FDI_MPHY_IOSFSB_RESET_STATUS (1<<13) #define FDI_MPHY_IOSFSB_RESET_CTL (1<<12) +#define PWM_GRANULARITY (1<<5) /* LPT */ #define DPLS_EDP_PPS_FIX_DIS (1<<0) #define _FDI_RXA_CHICKEN 0xc200c diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c index 1cf8085f..c020ab0 100644 --- a/drivers/gpu/drm/i915/intel_panel.c +++ b/drivers/gpu/drm/i915/intel_panel.c @@ -916,10 +916,93 @@ static void intel_backlight_device_unregister(struct intel_connector *connector) #endif /* CONFIG_BACKLIGHT_CLASS_DEVICE */ /* - * Note: The setup hooks can't assume pipe is set! + * HSW/BDW: This value represents the period of the PWM stream in clock periods + * multiplied by 128 (default increment) or 16 (alternate increment, selected in + * LPT SOUTH_CHICKEN2 register bit 5). * - * XXX: Query mode clock or hardware clock and program PWM modulation frequency - * appropriately when it's 0. Use VBT and/or sane defaults. + * XXX: This only works when driving the PCH PWM. When driving the CPU PWM on + * the utility pin, the granularity needs to be determined by BLC_PWM_CTL bit + * 27. + */ +static int hsw_hz_to_pwm(struct drm_device *dev, u16 pwm_freq_hz) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + u32 mul, clock; + + if (I915_READ(SOUTH_CHICKEN2) & PWM_GRANULARITY) + mul = 16; + else + mul = 128; + + if (dev_priv->pch_id == INTEL_PCH_LPT_DEVICE_ID_TYPE) + clock = MHz(135); /* LPT:H */ + else + clock = MHz(24); /* LPT:LP */ + + return clock / (pwm_freq_hz * mul); +} + +/* + * ILK/SNB/IVB: This value represents the period of the PWM stream in PCH + * display raw clocks multiplied by 128. + */ +static int pch_hz_to_pwm(struct drm_device *dev, u16 pwm_freq_hz) +{ + int clock = MHz(intel_pch_rawclk(dev)); + + return clock / (pwm_freq_hz * 128); +} + +/* + * Gen2: This field determines the number of time base events (display core + * clock frequency/32) in total for a complete cycle of modulated backlight + * control. + * + * Gen3: A time base event equals the display core clock ([DevPNV] HRAW clock) + * divided by 32. + */ +static int i9xx_hz_to_pwm(struct drm_device *dev, u16 pwm_freq_hz) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + int clock; + + if (IS_PINEVIEW(dev)) + clock = intel_hrawclk(dev); + else + clock = 1000 * dev_priv->display.get_display_clock_speed(dev); + + return clock / (pwm_freq_hz * 32); +} + +/* + * Gen4: This value represents the period of the PWM stream in display core + * clocks multiplied by 128. + */ +static int i965_hz_to_pwm(struct drm_device *dev, u16 pwm_freq_hz) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + int clock = 1000 * dev_priv->display.get_display_clock_speed(dev); + + return clock / (pwm_freq_hz * 128); +} + +/* + * VLV: This value represents the period of the PWM stream in display core + * clocks ([DevCTG] 100MHz HRAW clocks) multiplied by 128 or 25MHz S0IX clocks + * multiplied by 16. + * + * XXX: Where is this selected??? + */ +static int vlv_hz_to_pwm(struct drm_device *dev, u16 pwm_freq_hz) +{ + if (1) + return MHz(25) / (pwm_freq_hz * 16); + else + return MHz(100) / (pwm_freq_hz * 128); +} + +/* + * Note: The setup hooks can't assume pipe is set! */ static int bdw_setup_backlight(struct intel_connector *connector) { @@ -933,8 +1016,18 @@ static int bdw_setup_backlight(struct intel_connector *connector) pch_ctl2 = I915_READ(BLC_PWM_PCH_CTL2); panel->backlight.max = pch_ctl2 >> 16; - if (!panel->backlight.max) - return -ENODEV; + + if (!panel->backlight.max) { + u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz; + + if (!pwm_freq_hz) + return -ENODEV; + + DRM_DEBUG_KMS("setting backlight frequency to %u Hz from VBT\n", + pwm_freq_hz); + + panel->backlight.max = hsw_hz_to_pwm(dev, pwm_freq_hz); + } val = bdw_get_backlight(connector); panel->backlight.level = intel_panel_compute_brightness(connector, val); @@ -957,8 +1050,21 @@ static int pch_setup_backlight(struct intel_connector *connector) pch_ctl2 = I915_READ(BLC_PWM_PCH_CTL2); panel->backlight.max = pch_ctl2 >> 16; - if (!panel->backlight.max) - return -ENODEV; + + if (!panel->backlight.max) { + u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz; + + if (!pwm_freq_hz) + return -ENODEV; + + DRM_DEBUG_KMS("setting backlight frequency to %u Hz from VBT\n", + pwm_freq_hz); + + if (IS_HASWELL(dev)) + panel->backlight.max = hsw_hz_to_pwm(dev, pwm_freq_hz); + else + panel->backlight.max = pch_hz_to_pwm(dev, pwm_freq_hz); + } val = pch_get_backlight(connector); panel->backlight.level = intel_panel_compute_brightness(connector, val); @@ -986,12 +1092,23 @@ static int i9xx_setup_backlight(struct intel_connector *connector) panel->backlight.active_low_pwm = ctl & BLM_POLARITY_PNV; panel->backlight.max = ctl >> 17; + + if (!panel->backlight.max) { + u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz; + + if (!pwm_freq_hz) + return -ENODEV; + + DRM_DEBUG_KMS("setting backlight frequency to %u Hz from VBT\n", + pwm_freq_hz); + + panel->backlight.max = i9xx_hz_to_pwm(dev, pwm_freq_hz); + panel->backlight.max >>= 1; + } + if (panel->backlight.combination_mode) panel->backlight.max *= 0xff; - if (!panel->backlight.max) - return -ENODEV; - val = i9xx_get_backlight(connector); panel->backlight.level = intel_panel_compute_brightness(connector, val); @@ -1013,12 +1130,22 @@ static int i965_setup_backlight(struct intel_connector *connector) ctl = I915_READ(BLC_PWM_CTL); panel->backlight.max = ctl >> 16; + + if (!panel->backlight.max) { + u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz; + + if (!pwm_freq_hz) + return -ENODEV; + + DRM_DEBUG_KMS("setting backlight frequency to %u Hz from VBT\n", + pwm_freq_hz); + + panel->backlight.max = i965_hz_to_pwm(dev, pwm_freq_hz); + } + if (panel->backlight.combination_mode) panel->backlight.max *= 0xff; - if (!panel->backlight.max) - return -ENODEV; - val = i9xx_get_backlight(connector); panel->backlight.level = intel_panel_compute_brightness(connector, val); @@ -1033,30 +1160,44 @@ static int vlv_setup_backlight(struct intel_connector *connector) struct drm_device *dev = connector->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_panel *panel = &connector->panel; - enum pipe pipe; + enum pipe p, pipe = PIPE_A; u32 ctl, ctl2, val; - for_each_pipe(pipe) { - u32 cur_val = I915_READ(VLV_BLC_PWM_CTL(pipe)); - - /* Skip if the modulation freq is already set */ - if (cur_val & ~BACKLIGHT_DUTY_CYCLE_MASK) - continue; + /* prefer a pipe that's configured and enabled, fall back to A */ + for_each_pipe(p) { + ctl = I915_READ(VLV_BLC_PWM_CTL(p)); + if (ctl >> 16) { + pipe = p; - cur_val &= BACKLIGHT_DUTY_CYCLE_MASK; - I915_WRITE(VLV_BLC_PWM_CTL(pipe), (0xf42 << 16) | - cur_val); + ctl2 = I915_READ(VLV_BLC_PWM_CTL2(p)); + if (ctl2 & BLM_PWM_ENABLE) + break; + } } - ctl2 = I915_READ(VLV_BLC_PWM_CTL2(PIPE_A)); + ctl2 = I915_READ(VLV_BLC_PWM_CTL2(pipe)); panel->backlight.active_low_pwm = ctl2 & BLM_POLARITY_I965; - ctl = I915_READ(VLV_BLC_PWM_CTL(PIPE_A)); + ctl = I915_READ(VLV_BLC_PWM_CTL(pipe)); panel->backlight.max = ctl >> 16; - if (!panel->backlight.max) - return -ENODEV; - val = _vlv_get_backlight(dev, PIPE_A); + if (!panel->backlight.max) { + u16 pwm_freq_hz = dev_priv->vbt.backlight.pwm_freq_hz; + + if (!pwm_freq_hz) { + pwm_freq_hz = 400; + DRM_DEBUG_KMS("defaulting to %u Hz backlight on %s\n", + pwm_freq_hz, + drm_get_connector_name(&connector->base)); + } else { + DRM_DEBUG_KMS("setting backlight frequency to %u Hz from VBT\n", + pwm_freq_hz); + } + + panel->backlight.max = vlv_hz_to_pwm(dev, pwm_freq_hz); + } + + val = _vlv_get_backlight(dev, pipe); panel->backlight.level = intel_panel_compute_brightness(connector, val); panel->backlight.enabled = (ctl2 & BLM_PWM_ENABLE) && -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 0/2] drm/i915: initialize backlight pwm from vbt if needed @ 2015-08-26 7:58 Jani Nikula 2015-08-26 7:58 ` [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c Jani Nikula 0 siblings, 1 reply; 9+ messages in thread From: Jani Nikula @ 2015-08-26 7:58 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula This is a rebase of [1] and originally [2]. I haven't tried this in a year and I have no idea if it works on SKL, and it's not implemented for BXT. However there's renewed interest, so here's the rebase. BR, Jani. [1] http://mid.gmane.org/cover.1431003197.git.jani.nikula@intel.com [2] http://mid.gmane.org/cover.1389109881.git.jani.nikula@intel.com Jani Nikula (2): drm/i915: move intel_hrawclk() to intel_display.c drm/i915: initialize backlight max from VBT drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 1 + drivers/gpu/drm/i915/intel_display.c | 33 ++++++++ drivers/gpu/drm/i915/intel_dp.c | 34 -------- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_panel.c | 160 +++++++++++++++++++++++++++++++++-- 6 files changed, 190 insertions(+), 41 deletions(-) -- 2.1.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c 2015-08-26 7:58 [PATCH 0/2] drm/i915: initialize backlight pwm from vbt if needed Jani Nikula @ 2015-08-26 7:58 ` Jani Nikula 2015-08-26 21:22 ` Clint Taylor 0 siblings, 1 reply; 9+ messages in thread From: Jani Nikula @ 2015-08-26 7:58 UTC (permalink / raw) To: intel-gfx; +Cc: jani.nikula Make it available outside of intel_dp.c. Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 34 ---------------------------------- drivers/gpu/drm/i915/intel_drv.h | 1 + 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index cba6299b3450..f25a847bcbc5 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -135,6 +135,39 @@ intel_pch_rawclk(struct drm_device *dev) return I915_READ(PCH_RAWCLK_FREQ) & RAWCLK_FREQ_MASK; } +/* hrawclock is 1/4 the FSB frequency */ +int intel_hrawclk(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + uint32_t clkcfg; + + /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ + if (IS_VALLEYVIEW(dev)) + return 200; + + clkcfg = I915_READ(CLKCFG); + switch (clkcfg & CLKCFG_FSB_MASK) { + case CLKCFG_FSB_400: + return 100; + case CLKCFG_FSB_533: + return 133; + case CLKCFG_FSB_667: + return 166; + case CLKCFG_FSB_800: + return 200; + case CLKCFG_FSB_1067: + return 266; + case CLKCFG_FSB_1333: + return 333; + /* these two are just a guess; one of them might be right */ + case CLKCFG_FSB_1600: + case CLKCFG_FSB_1600_ALT: + return 400; + default: + return 133; + } +} + static inline u32 /* units of 100MHz */ intel_fdi_link_freq(struct drm_device *dev) { diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 67f0e291232f..0800d87e876c 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -253,40 +253,6 @@ static void intel_dp_unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes) dst[i] = src >> ((3-i) * 8); } -/* hrawclock is 1/4 the FSB frequency */ -static int -intel_hrawclk(struct drm_device *dev) -{ - struct drm_i915_private *dev_priv = dev->dev_private; - uint32_t clkcfg; - - /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ - if (IS_VALLEYVIEW(dev)) - return 200; - - clkcfg = I915_READ(CLKCFG); - switch (clkcfg & CLKCFG_FSB_MASK) { - case CLKCFG_FSB_400: - return 100; - case CLKCFG_FSB_533: - return 133; - case CLKCFG_FSB_667: - return 166; - case CLKCFG_FSB_800: - return 200; - case CLKCFG_FSB_1067: - return 266; - case CLKCFG_FSB_1333: - return 333; - /* these two are just a guess; one of them might be right */ - case CLKCFG_FSB_1600: - case CLKCFG_FSB_1600_ALT: - return 400; - default: - return 133; - } -} - static void intel_dp_init_panel_power_sequencer(struct drm_device *dev, struct intel_dp *intel_dp); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 81b7d77a3c8b..ca475f2a5f7c 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -993,6 +993,7 @@ void i915_audio_component_cleanup(struct drm_i915_private *dev_priv); extern const struct drm_plane_funcs intel_plane_funcs; bool intel_has_pending_fb_unpin(struct drm_device *dev); int intel_pch_rawclk(struct drm_device *dev); +int intel_hrawclk(struct drm_device *dev); void intel_mark_busy(struct drm_device *dev); void intel_mark_idle(struct drm_device *dev); void intel_crtc_restore_mode(struct drm_crtc *crtc); -- 2.1.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c 2015-08-26 7:58 ` [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c Jani Nikula @ 2015-08-26 21:22 ` Clint Taylor 2015-09-02 9:00 ` Daniel Vetter 0 siblings, 1 reply; 9+ messages in thread From: Clint Taylor @ 2015-08-26 21:22 UTC (permalink / raw) To: Jani Nikula, intel-gfx On 08/26/2015 12:58 AM, Jani Nikula wrote: > Make it available outside of intel_dp.c. > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++++++++++++++++ > drivers/gpu/drm/i915/intel_dp.c | 34 ---------------------------------- > drivers/gpu/drm/i915/intel_drv.h | 1 + > 3 files changed, 34 insertions(+), 34 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > index cba6299b3450..f25a847bcbc5 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -135,6 +135,39 @@ intel_pch_rawclk(struct drm_device *dev) > return I915_READ(PCH_RAWCLK_FREQ) & RAWCLK_FREQ_MASK; > } > > +/* hrawclock is 1/4 the FSB frequency */ > +int intel_hrawclk(struct drm_device *dev) > +{ > + struct drm_i915_private *dev_priv = dev->dev_private; > + uint32_t clkcfg; > + > + /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ > + if (IS_VALLEYVIEW(dev)) > + return 200; > + > + clkcfg = I915_READ(CLKCFG); > + switch (clkcfg & CLKCFG_FSB_MASK) { > + case CLKCFG_FSB_400: > + return 100; > + case CLKCFG_FSB_533: > + return 133; > + case CLKCFG_FSB_667: > + return 166; > + case CLKCFG_FSB_800: > + return 200; > + case CLKCFG_FSB_1067: > + return 266; > + case CLKCFG_FSB_1333: > + return 333; > + /* these two are just a guess; one of them might be right */ > + case CLKCFG_FSB_1600: > + case CLKCFG_FSB_1600_ALT: > + return 400; > + default: > + return 133; > + } > +} > + > static inline u32 /* units of 100MHz */ > intel_fdi_link_freq(struct drm_device *dev) > { > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > index 67f0e291232f..0800d87e876c 100644 > --- a/drivers/gpu/drm/i915/intel_dp.c > +++ b/drivers/gpu/drm/i915/intel_dp.c > @@ -253,40 +253,6 @@ static void intel_dp_unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes) > dst[i] = src >> ((3-i) * 8); > } > > -/* hrawclock is 1/4 the FSB frequency */ > -static int > -intel_hrawclk(struct drm_device *dev) > -{ > - struct drm_i915_private *dev_priv = dev->dev_private; > - uint32_t clkcfg; > - > - /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ > - if (IS_VALLEYVIEW(dev)) > - return 200; > - > - clkcfg = I915_READ(CLKCFG); > - switch (clkcfg & CLKCFG_FSB_MASK) { > - case CLKCFG_FSB_400: > - return 100; > - case CLKCFG_FSB_533: > - return 133; > - case CLKCFG_FSB_667: > - return 166; > - case CLKCFG_FSB_800: > - return 200; > - case CLKCFG_FSB_1067: > - return 266; > - case CLKCFG_FSB_1333: > - return 333; > - /* these two are just a guess; one of them might be right */ > - case CLKCFG_FSB_1600: > - case CLKCFG_FSB_1600_ALT: > - return 400; > - default: > - return 133; > - } > -} > - > static void > intel_dp_init_panel_power_sequencer(struct drm_device *dev, > struct intel_dp *intel_dp); > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index 81b7d77a3c8b..ca475f2a5f7c 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -993,6 +993,7 @@ void i915_audio_component_cleanup(struct drm_i915_private *dev_priv); > extern const struct drm_plane_funcs intel_plane_funcs; > bool intel_has_pending_fb_unpin(struct drm_device *dev); > int intel_pch_rawclk(struct drm_device *dev); > +int intel_hrawclk(struct drm_device *dev); > void intel_mark_busy(struct drm_device *dev); > void intel_mark_idle(struct drm_device *dev); > void intel_crtc_restore_mode(struct drm_crtc *crtc); > Simple move of the function with no change in functionality. Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com> Tested-by: Clint Taylor <Clinton.A.Taylor@intel.com> _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c 2015-08-26 21:22 ` Clint Taylor @ 2015-09-02 9:00 ` Daniel Vetter 0 siblings, 0 replies; 9+ messages in thread From: Daniel Vetter @ 2015-09-02 9:00 UTC (permalink / raw) To: Clint Taylor; +Cc: Jani Nikula, intel-gfx On Wed, Aug 26, 2015 at 02:22:13PM -0700, Clint Taylor wrote: > On 08/26/2015 12:58 AM, Jani Nikula wrote: > >Make it available outside of intel_dp.c. > > > >Signed-off-by: Jani Nikula <jani.nikula@intel.com> > >--- > > drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++++++++++++++++ > > drivers/gpu/drm/i915/intel_dp.c | 34 ---------------------------------- > > drivers/gpu/drm/i915/intel_drv.h | 1 + > > 3 files changed, 34 insertions(+), 34 deletions(-) > > > >diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c > >index cba6299b3450..f25a847bcbc5 100644 > >--- a/drivers/gpu/drm/i915/intel_display.c > >+++ b/drivers/gpu/drm/i915/intel_display.c > >@@ -135,6 +135,39 @@ intel_pch_rawclk(struct drm_device *dev) > > return I915_READ(PCH_RAWCLK_FREQ) & RAWCLK_FREQ_MASK; > > } > > > >+/* hrawclock is 1/4 the FSB frequency */ > >+int intel_hrawclk(struct drm_device *dev) > >+{ > >+ struct drm_i915_private *dev_priv = dev->dev_private; > >+ uint32_t clkcfg; > >+ > >+ /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ > >+ if (IS_VALLEYVIEW(dev)) > >+ return 200; > >+ > >+ clkcfg = I915_READ(CLKCFG); > >+ switch (clkcfg & CLKCFG_FSB_MASK) { > >+ case CLKCFG_FSB_400: > >+ return 100; > >+ case CLKCFG_FSB_533: > >+ return 133; > >+ case CLKCFG_FSB_667: > >+ return 166; > >+ case CLKCFG_FSB_800: > >+ return 200; > >+ case CLKCFG_FSB_1067: > >+ return 266; > >+ case CLKCFG_FSB_1333: > >+ return 333; > >+ /* these two are just a guess; one of them might be right */ > >+ case CLKCFG_FSB_1600: > >+ case CLKCFG_FSB_1600_ALT: > >+ return 400; > >+ default: > >+ return 133; > >+ } > >+} > >+ > > static inline u32 /* units of 100MHz */ > > intel_fdi_link_freq(struct drm_device *dev) > > { > >diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c > >index 67f0e291232f..0800d87e876c 100644 > >--- a/drivers/gpu/drm/i915/intel_dp.c > >+++ b/drivers/gpu/drm/i915/intel_dp.c > >@@ -253,40 +253,6 @@ static void intel_dp_unpack_aux(uint32_t src, uint8_t *dst, int dst_bytes) > > dst[i] = src >> ((3-i) * 8); > > } > > > >-/* hrawclock is 1/4 the FSB frequency */ > >-static int > >-intel_hrawclk(struct drm_device *dev) > >-{ > >- struct drm_i915_private *dev_priv = dev->dev_private; > >- uint32_t clkcfg; > >- > >- /* There is no CLKCFG reg in Valleyview. VLV hrawclk is 200 MHz */ > >- if (IS_VALLEYVIEW(dev)) > >- return 200; > >- > >- clkcfg = I915_READ(CLKCFG); > >- switch (clkcfg & CLKCFG_FSB_MASK) { > >- case CLKCFG_FSB_400: > >- return 100; > >- case CLKCFG_FSB_533: > >- return 133; > >- case CLKCFG_FSB_667: > >- return 166; > >- case CLKCFG_FSB_800: > >- return 200; > >- case CLKCFG_FSB_1067: > >- return 266; > >- case CLKCFG_FSB_1333: > >- return 333; > >- /* these two are just a guess; one of them might be right */ > >- case CLKCFG_FSB_1600: > >- case CLKCFG_FSB_1600_ALT: > >- return 400; > >- default: > >- return 133; > >- } > >-} > >- > > static void > > intel_dp_init_panel_power_sequencer(struct drm_device *dev, > > struct intel_dp *intel_dp); > >diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > >index 81b7d77a3c8b..ca475f2a5f7c 100644 > >--- a/drivers/gpu/drm/i915/intel_drv.h > >+++ b/drivers/gpu/drm/i915/intel_drv.h > >@@ -993,6 +993,7 @@ void i915_audio_component_cleanup(struct drm_i915_private *dev_priv); > > extern const struct drm_plane_funcs intel_plane_funcs; > > bool intel_has_pending_fb_unpin(struct drm_device *dev); > > int intel_pch_rawclk(struct drm_device *dev); > >+int intel_hrawclk(struct drm_device *dev); > > void intel_mark_busy(struct drm_device *dev); > > void intel_mark_idle(struct drm_device *dev); > > void intel_crtc_restore_mode(struct drm_crtc *crtc); > > > > Simple move of the function with no change in functionality. > > Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com> > Tested-by: Clint Taylor <Clinton.A.Taylor@intel.com> Queued for -next, thanks for the patch. -Daniel -- 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] 9+ messages in thread
end of thread, other threads:[~2015-09-02 9:00 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-01-07 16:01 [PATCH 0/2] drm/i915: initialize backlight pwm frequency from vbt if needed Jani Nikula 2014-01-07 16:01 ` [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c Jani Nikula 2014-01-07 16:25 ` Daniel Vetter 2014-01-07 16:46 ` Jani Nikula 2014-02-05 15:02 ` Jesse Barnes 2014-01-07 16:01 ` [PATCH 2/2] drm/i915: initialize backlight max from vbt Jani Nikula -- strict thread matches above, loose matches on Subject: below -- 2015-08-26 7:58 [PATCH 0/2] drm/i915: initialize backlight pwm from vbt if needed Jani Nikula 2015-08-26 7:58 ` [PATCH 1/2] drm/i915: move intel_hrawclk() to intel_display.c Jani Nikula 2015-08-26 21:22 ` Clint Taylor 2015-09-02 9:00 ` Daniel Vetter
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox