| Message ID | 1253865689-4847-2-git-send-email-zhenyuw@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, 25 Sep 2009 16:01:29 +0800 Zhenyu Wang <zhenyuw@linux.intel.com> wrote: > Until we figure out the right setting for powersave features on > Ironlake, disable it for now, also disable watermark update, > which has new registers for it on Ironlake too. > > Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_dma.c | 3 +++ > drivers/gpu/drm/i915/intel_display.c | 3 +++ > 2 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c > b/drivers/gpu/drm/i915/i915_dma.c index 45d507e..733f051 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1202,6 +1202,9 @@ static int i915_load_modeset_init(struct > drm_device *dev, if (IS_I965G(dev) || IS_G33(dev)) > dev_priv->cursor_needs_physical = false; > > + if (IS_IGDNG(dev)) > + i915_powersave = 0; Can you use the new function pointer code instead? Just make no-ops for the watermark update functions and the other stuff that doesn't work... Thanks, Jesse
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 45d507e..733f051 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -1202,6 +1202,9 @@ static int i915_load_modeset_init(struct drm_device *dev, if (IS_I965G(dev) || IS_G33(dev)) dev_priv->cursor_needs_physical = false; + if (IS_IGDNG(dev)) + i915_powersave = 0; + /* Basic memrange allocator for stolen space (aka vram) */ drm_mm_init(&dev_priv->vram, 0, prealloc_size); DRM_INFO("set up %ldM of stolen space\n", prealloc_size / (1024*1024)); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 10c42e5..af8189f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2587,6 +2587,9 @@ static void intel_update_watermarks(struct drm_device *dev) unsigned long planea_clock = 0, planeb_clock = 0, sr_clock = 0; int enabled = 0, pixel_size = 0; + if (IS_IGDNG(dev)) + return; + /* Get the clock config from both planes */ list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { intel_crtc = to_intel_crtc(crtc);
Until we figure out the right setting for powersave features on Ironlake, disable it for now, also disable watermark update, which has new registers for it on Ironlake too. Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> --- drivers/gpu/drm/i915/i915_dma.c | 3 +++ drivers/gpu/drm/i915/intel_display.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-)