Commit 18e0deee authored by Matt Roper's avatar Matt Roper
Browse files

drm/i915/display: Move display runtime info to display structure 



Move the runtime info specific to display into display-specific
structures as has already been done with the constant display info.

v2:
 - Rename __runtime to __runtime_defaults for more clarity on the
   purpose.  (Andrzej)
 - Move introduction of DISPLAY_INFO() to previous patch.  (Andrzej)
 - Drop NO_DISPLAY macro.  (Andrzej)
v3:
 - Use "{}" instead of "{ 0 }" for empty struct init.  (Jani)

Cc: Andrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarAndrzej Hajda <andrzej.hajda@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230523195609.73627-4-matthew.d.roper@intel.com
parent 5af5169d

drivers/gpu/drm/i915/display/intel_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe) 
		return PTR_ERR(crtc);



	crtc->pipe = pipe;

	crtc->num_scalers = RUNTIME_INFO(dev_priv)->num_scalers[pipe];

	crtc->num_scalers = DISPLAY_RUNTIME_INFO(dev_priv)->num_scalers[pipe];



	if (DISPLAY_VER(dev_priv) >= 9)

		primary = skl_universal_plane_create(dev_priv, pipe,

drivers/gpu/drm/i915/display/intel_cursor.c

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, 
						   DRM_MODE_ROTATE_0 |

						   DRM_MODE_ROTATE_180);



	zpos = RUNTIME_INFO(dev_priv)->num_sprites[pipe] + 1;

	zpos = DISPLAY_RUNTIME_INFO(dev_priv)->num_sprites[pipe] + 1;

	drm_plane_create_zpos_immutable_property(&cursor->base, zpos);



	if (DISPLAY_VER(dev_priv) >= 12)

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -3366,7 +3366,7 @@ static u8 bigjoiner_pipes(struct drm_i915_private *i915) 
	else

		pipes = 0;



	return pipes & RUNTIME_INFO(i915)->pipe_mask;

	return pipes & DISPLAY_RUNTIME_INFO(i915)->pipe_mask;

}



static bool transcoder_ddi_func_is_enabled(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/display/intel_display.h

+4 −4
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ enum i9xx_plane_id { 
};



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

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

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



#define for_each_plane_id_on_crtc(__crtc, __p) \

	for ((__p) = PLANE_PRIMARY; (__p) < I915_MAX_PLANES; (__p)++) \
@@ -221,7 +221,7 @@ enum phy_fia { 


#define for_each_pipe(__dev_priv, __p) \

	for ((__p) = 0; (__p) < I915_MAX_PIPES; (__p)++) \

		for_each_if(RUNTIME_INFO(__dev_priv)->pipe_mask & BIT(__p))

		for_each_if(DISPLAY_RUNTIME_INFO(__dev_priv)->pipe_mask & BIT(__p))



#define for_each_pipe_masked(__dev_priv, __p, __mask) \

	for_each_pipe(__dev_priv, __p) \
@@ -229,7 +229,7 @@ enum phy_fia { 


#define for_each_cpu_transcoder(__dev_priv, __t) \

	for ((__t) = 0; (__t) < I915_MAX_TRANSCODERS; (__t)++)	\

		for_each_if (RUNTIME_INFO(__dev_priv)->cpu_transcoder_mask & BIT(__t))

		for_each_if (DISPLAY_RUNTIME_INFO(__dev_priv)->cpu_transcoder_mask & BIT(__t))



#define for_each_cpu_transcoder_masked(__dev_priv, __t, __mask) \

	for_each_cpu_transcoder(__dev_priv, __t) \
@@ -237,7 +237,7 @@ enum phy_fia { 


#define for_each_sprite(__dev_priv, __p, __s)				\

	for ((__s) = 0;							\

	     (__s) < RUNTIME_INFO(__dev_priv)->num_sprites[(__p)];	\

	     (__s) < DISPLAY_RUNTIME_INFO(__dev_priv)->num_sprites[(__p)];	\

	     (__s)++)



#define for_each_port(__port) \

drivers/gpu/drm/i915/display/intel_display_device.h

+23 −0
Original line number Diff line number Diff line
@@ -29,7 +29,30 @@ 
	func(overlay_needs_physical); \

	func(supports_tv);



struct intel_display_runtime_info {

	struct {

		u16 ver;

		u16 rel;

		u16 step;

	} ip;



	u8 pipe_mask;

	u8 cpu_transcoder_mask;



	u8 num_sprites[I915_MAX_PIPES];

	u8 num_scalers[I915_MAX_PIPES];



	u8 fbc_mask;



	bool has_hdcp;

	bool has_dmc;

	bool has_dsc;

};



struct intel_display_device_info {

	/* Initial runtime info. */

	const struct intel_display_runtime_info __runtime_defaults;



	u8 abox_mask;



	struct {