Commit 5c1143bb authored by Xiang, Haihao's avatar Xiang, Haihao Committed by Chris Wilson
Browse files

drm/i915: do not export the instances of struct intel_ring_buffer 



Introduce intel_init_render_ring_buffer(), intel_init_bsd_ring_buffer
for ring initialization.

Signed-off-by: default avatarXiang, Haihao <haihao.xiang@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 92f49d9c

drivers/gpu/drm/i915/i915_gem.c

+2 −12
Original line number Diff line number Diff line
@@ -4496,28 +4496,18 @@ i915_gem_init_ringbuffer(struct drm_device *dev) 
	drm_i915_private_t *dev_priv = dev->dev_private;

	int ret;



	dev_priv->render_ring = render_ring;



	if (!I915_NEED_GFX_HWS(dev)) {

		dev_priv->render_ring.status_page.page_addr

			= dev_priv->status_page_dmah->vaddr;

		memset(dev_priv->render_ring.status_page.page_addr,

				0, PAGE_SIZE);

	}



	if (HAS_PIPE_CONTROL(dev)) {

		ret = i915_gem_init_pipe_control(dev);

		if (ret)

			return ret;

	}



	ret = intel_init_ring_buffer(dev, &dev_priv->render_ring);

	ret = intel_init_render_ring_buffer(dev);

	if (ret)

		goto cleanup_pipe_control;



	if (HAS_BSD(dev)) {

		dev_priv->bsd_ring = bsd_ring;

		ret = intel_init_ring_buffer(dev, &dev_priv->bsd_ring);

		ret = intel_init_bsd_ring_buffer(dev);

		if (ret)

			goto cleanup_render_ring;

	}

drivers/gpu/drm/i915/intel_ringbuffer.c

+27 −2
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ void intel_fill_struct(struct drm_device *dev, 
	intel_ring_advance(dev, ring);

}



struct intel_ring_buffer render_ring = {

static struct intel_ring_buffer render_ring = {

	.name			= "render ring",

	.id			= RING_RENDER,

	.regs                   = {
@@ -831,7 +831,7 @@ struct intel_ring_buffer render_ring = { 


/* ring buffer for bit-stream decoder */



struct intel_ring_buffer bsd_ring = {

static struct intel_ring_buffer bsd_ring = {

	.name                   = "bsd ring",

	.id			= RING_BSD,

	.regs			= {
@@ -866,3 +866,28 @@ struct intel_ring_buffer bsd_ring = { 
	.status_page		= {NULL, 0, NULL},

	.map			= {0,}

};



int intel_init_render_ring_buffer(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;



	dev_priv->render_ring = render_ring;



	if (!I915_NEED_GFX_HWS(dev)) {

		dev_priv->render_ring.status_page.page_addr

			= dev_priv->status_page_dmah->vaddr;

		memset(dev_priv->render_ring.status_page.page_addr,

				0, PAGE_SIZE);

	}



	return intel_init_ring_buffer(dev, &dev_priv->render_ring);

}



int intel_init_bsd_ring_buffer(struct drm_device *dev)

{

	drm_i915_private_t *dev_priv = dev->dev_private;



	dev_priv->bsd_ring = bsd_ring;



	return intel_init_ring_buffer(dev, &dev_priv->bsd_ring);

}

drivers/gpu/drm/i915/intel_ringbuffer.h

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ void intel_ring_advance(struct drm_device *dev, 
u32 intel_ring_get_seqno(struct drm_device *dev,

		struct intel_ring_buffer *ring);



extern struct intel_ring_buffer render_ring;

extern struct intel_ring_buffer bsd_ring;

int intel_init_render_ring_buffer(struct drm_device *dev);

int intel_init_bsd_ring_buffer(struct drm_device *dev);



#endif /* _INTEL_RINGBUFFER_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE