drm/i915: Only run idle processing from i915_gem_retire_requests_worker
When adding the fb idle detection to mark-inactive, it was forgotten that userspace can drive the processing of retire-requests. We assumed that it would be principally driven by the retire requests worker, running once every second whilst active and so we would get the deferred timer for free. Instead we spend too many CPU cycles reclocking the LVDS preventing real work from being done. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reported-and-tested-by: Alexander Lam <lambchop468@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58843 Cc: stable@vger.kernel.org Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
f82855d342
commit
725a5b5402
|
@ -1899,9 +1899,6 @@ i915_gem_object_move_to_inactive(struct drm_i915_gem_object *obj)
|
||||||
BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
|
BUG_ON(obj->base.write_domain & ~I915_GEM_GPU_DOMAINS);
|
||||||
BUG_ON(!obj->active);
|
BUG_ON(!obj->active);
|
||||||
|
|
||||||
if (obj->pin_count) /* are we a framebuffer? */
|
|
||||||
intel_mark_fb_idle(obj);
|
|
||||||
|
|
||||||
list_move_tail(&obj->mm_list, &dev_priv->mm.inactive_list);
|
list_move_tail(&obj->mm_list, &dev_priv->mm.inactive_list);
|
||||||
|
|
||||||
list_del_init(&obj->ring_list);
|
list_del_init(&obj->ring_list);
|
||||||
|
|
|
@ -6725,6 +6725,17 @@ void intel_mark_busy(struct drm_device *dev)
|
||||||
|
|
||||||
void intel_mark_idle(struct drm_device *dev)
|
void intel_mark_idle(struct drm_device *dev)
|
||||||
{
|
{
|
||||||
|
struct drm_crtc *crtc;
|
||||||
|
|
||||||
|
if (!i915_powersave)
|
||||||
|
return;
|
||||||
|
|
||||||
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
|
||||||
|
if (!crtc->fb)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
intel_decrease_pllclock(crtc);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void intel_mark_fb_busy(struct drm_i915_gem_object *obj)
|
void intel_mark_fb_busy(struct drm_i915_gem_object *obj)
|
||||||
|
@ -6744,23 +6755,6 @@ void intel_mark_fb_busy(struct drm_i915_gem_object *obj)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void intel_mark_fb_idle(struct drm_i915_gem_object *obj)
|
|
||||||
{
|
|
||||||
struct drm_device *dev = obj->base.dev;
|
|
||||||
struct drm_crtc *crtc;
|
|
||||||
|
|
||||||
if (!i915_powersave)
|
|
||||||
return;
|
|
||||||
|
|
||||||
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
|
|
||||||
if (!crtc->fb)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
if (to_intel_framebuffer(crtc->fb)->obj == obj)
|
|
||||||
intel_decrease_pllclock(crtc);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void intel_crtc_destroy(struct drm_crtc *crtc)
|
static void intel_crtc_destroy(struct drm_crtc *crtc)
|
||||||
{
|
{
|
||||||
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
|
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
|
||||||
|
|
|
@ -452,9 +452,8 @@ extern bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg,
|
||||||
extern void intel_dvo_init(struct drm_device *dev);
|
extern void intel_dvo_init(struct drm_device *dev);
|
||||||
extern void intel_tv_init(struct drm_device *dev);
|
extern void intel_tv_init(struct drm_device *dev);
|
||||||
extern void intel_mark_busy(struct drm_device *dev);
|
extern void intel_mark_busy(struct drm_device *dev);
|
||||||
extern void intel_mark_idle(struct drm_device *dev);
|
|
||||||
extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj);
|
extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj);
|
||||||
extern void intel_mark_fb_idle(struct drm_i915_gem_object *obj);
|
extern void intel_mark_idle(struct drm_device *dev);
|
||||||
extern bool intel_lvds_init(struct drm_device *dev);
|
extern bool intel_lvds_init(struct drm_device *dev);
|
||||||
extern bool intel_is_dual_link_lvds(struct drm_device *dev);
|
extern bool intel_is_dual_link_lvds(struct drm_device *dev);
|
||||||
extern void intel_dp_init(struct drm_device *dev, int output_reg,
|
extern void intel_dp_init(struct drm_device *dev, int output_reg,
|
||||||
|
|
Loading…
Reference in a new issue