Commit 845f74a7 authored by Zhao Yakui's avatar Zhao Yakui Committed by Daniel Vetter
Browse files

drm/i915:Initialize the second BSD ring on BDW GT3 machine 



Based on the hardware spec, the BDW GT3 machine has two independent
BSD ring that can be used to dispatch the video commands.
So just initialize it.

V3->V4: Follow Imre's comment to do some minor updates. For example:
more comments are added to describe the semaphore between ring.

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarZhao Yakui <yakui.zhao@intel.com>
[danvet: Fix up checkpatch error.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b1a93306

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static const struct intel_device_info intel_broadwell_m_info = { 
static const struct intel_device_info intel_broadwell_gt3d_info = {

	.gen = 8, .num_pipes = 3,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,

	.has_llc = 1,

	.has_ddi = 1,

	.has_fbc = 1,
@@ -292,7 +292,7 @@ static const struct intel_device_info intel_broadwell_gt3d_info = { 
static const struct intel_device_info intel_broadwell_gt3m_info = {

	.gen = 8, .is_mobile = 1, .num_pipes = 3,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,

	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,

	.has_llc = 1,

	.has_ddi = 1,

	.has_fbc = 1,

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -1834,7 +1834,9 @@ struct drm_i915_cmd_table { 
#define BSD_RING		(1<<VCS)

#define BLT_RING		(1<<BCS)

#define VEBOX_RING		(1<<VECS)

#define BSD2_RING		(1<<VCS2)

#define HAS_BSD(dev)            (INTEL_INFO(dev)->ring_mask & BSD_RING)

#define HAS_BSD2(dev)		(INTEL_INFO(dev)->ring_mask & BSD2_RING)

#define HAS_BLT(dev)            (INTEL_INFO(dev)->ring_mask & BLT_RING)

#define HAS_VEBOX(dev)            (INTEL_INFO(dev)->ring_mask & VEBOX_RING)

#define HAS_LLC(dev)            (INTEL_INFO(dev)->has_llc)

drivers/gpu/drm/i915/i915_gem.c

+8 −1
Original line number Diff line number Diff line
@@ -4388,13 +4388,20 @@ static int i915_gem_init_rings(struct drm_device *dev) 
			goto cleanup_blt_ring;

	}



	if (HAS_BSD2(dev)) {

		ret = intel_init_bsd2_ring_buffer(dev);

		if (ret)

			goto cleanup_vebox_ring;

	}



	ret = i915_gem_set_seqno(dev, ((u32)~0 - 0x1000));

	if (ret)

		goto cleanup_vebox_ring;

		goto cleanup_bsd2_ring;



	return 0;



cleanup_bsd2_ring:

	intel_cleanup_ring_buffer(&dev_priv->ring[VCS2]);

cleanup_vebox_ring:

	intel_cleanup_ring_buffer(&dev_priv->ring[VECS]);

cleanup_blt_ring:

drivers/gpu/drm/i915/i915_gpu_error.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static const char *ring_str(int ring) 
	case VCS: return "bsd";

	case BCS: return "blt";

	case VECS: return "vebox";

	case VCS2: return "bsd2";

	default: return "";

	}

}

drivers/gpu/drm/i915/i915_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -760,6 +760,7 @@ enum punit_power_well { 
#define RENDER_RING_BASE	0x02000

#define BSD_RING_BASE		0x04000

#define GEN6_BSD_RING_BASE	0x12000

#define GEN8_BSD2_RING_BASE	0x1c000

#define VEBOX_RING_BASE		0x1a000

#define BLT_RING_BASE		0x22000

#define RING_TAIL(base)		((base)+0x30)

CRA Git | Maintained and supported by SUSTech CRA and CCSE