* [PATCH] drm/i915: garbage-collect vlv refclk function
@ 2013-09-16 9:29 Daniel Vetter
2013-09-16 10:41 ` Damien Lespiau
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2013-09-16 9:29 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter
Simply inline the 100MHz default we're using. Having gunk around that
has leftover LVDS support on a platform that just doesn't have this
isn't of any use.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
drivers/gpu/drm/i915/intel_display.c | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2e74ccc..fb04f3d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4288,28 +4288,6 @@ static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)
&& !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE);
}
-static int vlv_get_refclk(struct drm_crtc *crtc)
-{
- struct drm_device *dev = crtc->dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
- int refclk = 27000; /* for DP & HDMI */
-
- return 100000; /* only one validated so far */
-
- if (intel_pipe_has_type(crtc, INTEL_OUTPUT_ANALOG)) {
- refclk = 96000;
- } else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
- if (intel_panel_use_ssc(dev_priv))
- refclk = 100000;
- else
- refclk = 96000;
- } else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) {
- refclk = 100000;
- }
-
- return refclk;
-}
-
static int i9xx_get_refclk(struct drm_crtc *crtc, int num_connectors)
{
struct drm_device *dev = crtc->dev;
@@ -4317,7 +4295,7 @@ static int i9xx_get_refclk(struct drm_crtc *crtc, int num_connectors)
int refclk;
if (IS_VALLEYVIEW(dev)) {
- refclk = vlv_get_refclk(crtc);
+ refclk = 100000;
} else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
intel_panel_use_ssc(dev_priv) && num_connectors < 2) {
refclk = dev_priv->vbt.lvds_ssc_freq * 1000;
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: garbage-collect vlv refclk function
2013-09-16 9:29 [PATCH] drm/i915: garbage-collect vlv refclk function Daniel Vetter
@ 2013-09-16 10:41 ` Damien Lespiau
2013-09-16 22:02 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Damien Lespiau @ 2013-09-16 10:41 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Intel Graphics Development
On Mon, Sep 16, 2013 at 11:29:34AM +0200, Daniel Vetter wrote:
> Simply inline the 100MHz default we're using. Having gunk around that
> has leftover LVDS support on a platform that just doesn't have this
> isn't of any use.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
--
Damien
> ---
> drivers/gpu/drm/i915/intel_display.c | 24 +-----------------------
> 1 file changed, 1 insertion(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 2e74ccc..fb04f3d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4288,28 +4288,6 @@ static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv)
> && !(dev_priv->quirks & QUIRK_LVDS_SSC_DISABLE);
> }
>
> -static int vlv_get_refclk(struct drm_crtc *crtc)
> -{
> - struct drm_device *dev = crtc->dev;
> - struct drm_i915_private *dev_priv = dev->dev_private;
> - int refclk = 27000; /* for DP & HDMI */
> -
> - return 100000; /* only one validated so far */
> -
> - if (intel_pipe_has_type(crtc, INTEL_OUTPUT_ANALOG)) {
> - refclk = 96000;
> - } else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)) {
> - if (intel_panel_use_ssc(dev_priv))
> - refclk = 100000;
> - else
> - refclk = 96000;
> - } else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_EDP)) {
> - refclk = 100000;
> - }
> -
> - return refclk;
> -}
> -
> static int i9xx_get_refclk(struct drm_crtc *crtc, int num_connectors)
> {
> struct drm_device *dev = crtc->dev;
> @@ -4317,7 +4295,7 @@ static int i9xx_get_refclk(struct drm_crtc *crtc, int num_connectors)
> int refclk;
>
> if (IS_VALLEYVIEW(dev)) {
> - refclk = vlv_get_refclk(crtc);
> + refclk = 100000;
> } else if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) &&
> intel_panel_use_ssc(dev_priv) && num_connectors < 2) {
> refclk = dev_priv->vbt.lvds_ssc_freq * 1000;
> --
> 1.8.4.rc3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: garbage-collect vlv refclk function
2013-09-16 10:41 ` Damien Lespiau
@ 2013-09-16 22:02 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2013-09-16 22:02 UTC (permalink / raw)
To: Damien Lespiau; +Cc: Daniel Vetter, Intel Graphics Development
On Mon, Sep 16, 2013 at 11:41:16AM +0100, Damien Lespiau wrote:
> On Mon, Sep 16, 2013 at 11:29:34AM +0200, Daniel Vetter wrote:
> > Simply inline the 100MHz default we're using. Having gunk around that
> > has leftover LVDS support on a platform that just doesn't have this
> > isn't of any use.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
>
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Queued for -next, thanks for the review.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-16 22:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-16 9:29 [PATCH] drm/i915: garbage-collect vlv refclk function Daniel Vetter
2013-09-16 10:41 ` Damien Lespiau
2013-09-16 22:02 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox