Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d615a166 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Make num_sprites a per-pipe value 



In the future, we need to be able to specify per-pipe number of
planes/sprites. Let's start today!

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1fe47785

drivers/gpu/drm/i915/i915_dma.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -1480,12 +1480,16 @@ static void intel_device_info_runtime_init(struct drm_device *dev) 
{

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_device_info *info;

	struct intel_device_info *info;

	enum pipe pipe;





	info = (struct intel_device_info *)&dev_priv->info;

	info = (struct intel_device_info *)&dev_priv->info;





	info->num_sprites = 1;

	if (IS_VALLEYVIEW(dev))

	if (IS_VALLEYVIEW(dev))

		info->num_sprites = 2;

		for_each_pipe(pipe)

			info->num_sprites[pipe] = 2;

	else

		for_each_pipe(pipe)

			info->num_sprites[pipe] = 1;





	if (i915.disable_display) {

	if (i915.disable_display) {

		DRM_INFO("Display disabled (module parameter)\n");

		DRM_INFO("Display disabled (module parameter)\n");

drivers/gpu/drm/i915/i915_drv.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ enum plane { 
};

};

#define plane_name(p) ((p) + 'A')

#define plane_name(p) ((p) + 'A')





#define sprite_name(p, s) ((p) * INTEL_INFO(dev)->num_sprites + (s) + 'A')

#define sprite_name(p, s) ((p) * INTEL_INFO(dev)->num_sprites[(p)] + (s) + 'A')





enum port {

enum port {

	PORT_A = 0,

	PORT_A = 0,
@@ -159,7 +159,7 @@ enum hpd_pin { 
	 I915_GEM_DOMAIN_VERTEX)

	 I915_GEM_DOMAIN_VERTEX)





#define for_each_pipe(p) for ((p) = 0; (p) < INTEL_INFO(dev)->num_pipes; (p)++)

#define for_each_pipe(p) for ((p) = 0; (p) < INTEL_INFO(dev)->num_pipes; (p)++)

#define for_each_sprite(p, s) for ((s) = 0; (s) < INTEL_INFO(dev)->num_sprites; (s)++)

#define for_each_sprite(p, s) for ((s) = 0; (s) < INTEL_INFO(dev)->num_sprites[(p)]; (s)++)





#define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \

#define for_each_encoder_on_crtc(dev, __crtc, intel_encoder) \

	list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \

	list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \
@@ -542,7 +542,7 @@ struct intel_uncore { 
struct intel_device_info {

struct intel_device_info {

	u32 display_mmio_offset;

	u32 display_mmio_offset;

	u8 num_pipes:3;

	u8 num_pipes:3;

	u8 num_sprites:2;

	u8 num_sprites[I915_MAX_PIPES];

	u8 gen;

	u8 gen;

	u8 ring_mask; /* Rings supported by the HW */

	u8 ring_mask; /* Rings supported by the HW */

	DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG, SEP_SEMICOLON);

	DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG, SEP_SEMICOLON);