diff options
| author | Keith Packard <keithp@keithp.com> | 2011-07-22 17:44:39 (GMT) |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-07-22 20:36:52 (GMT) |
| commit | f3234706a77bd6e1592ae71fb3268e04cb030dba (patch) | |
| tree | 6426ac38abc9091cfd988b79904d8bdaac94cdde /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | 842d452985300f4ec14c68cb86046e8a1a3b7251 (diff) | |
| download | linux-fsl-qoriq-f3234706a77bd6e1592ae71fb3268e04cb030dba.tar.xz | |
drm/i915: Initialize RCS ring status page address in intel_render_ring_init_dri
Physically-addressed hardware status pages are initialized early in
the driver load process by i915_init_phys_hws. For UMS environments,
the ring structure is not initialized until the X server starts. At
that point, the entire ring structure is re-initialized with all new
values. Any values set in the ring structure (including
ring->status_page.page_addr) will be lost when the ring is
re-initialized.
This patch moves the initialization of the status_page.page_addr value
to intel_render_ring_init_dri.
Signed-off-by: Keith Packard <keithp@keithp.com>
Cc: stable@kernel.org
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 95c4b14..1f61fc7 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -1319,6 +1319,9 @@ int intel_render_ring_init_dri(struct drm_device *dev, u64 start, u32 size) ring->get_seqno = pc_render_get_seqno; } + if (!I915_NEED_GFX_HWS(dev)) + ring->status_page.page_addr = dev_priv->status_page_dmah->vaddr; + ring->dev = dev; INIT_LIST_HEAD(&ring->active_list); INIT_LIST_HEAD(&ring->request_list); |