drm/i915: Initialize RCS ring status page address in intel_render_ring_init_dri
authorKeith Packard <keithp@keithp.com>
Fri, 22 Jul 2011 17:44:39 +0000 (10:44 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 16 Aug 2011 01:31:35 +0000 (18:31 -0700)
commit3f6846490d30a4b6e127bc522615db58721a8cdc
tree8d9d385a041023c2f34c969bbaa4cd0ad674ad34
parent9ae352371ad759dba1053a284625a2dee785353f
drm/i915: Initialize RCS ring status page address in intel_render_ring_init_dri

commit f3234706a77bd6e1592ae71fb3268e04cb030dba upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_ringbuffer.c