Commit 5e72e75d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move display info related macros to display 



Anything looking at display (runtime) info should be under display.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/41b53870ffa7bd41ccc337616c756c69326f05cf.1696336887.git.jani.nikula@intel.com
parent fe63ea7c

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

+9 −0
Original line number Diff line number Diff line
@@ -98,6 +98,15 @@ struct drm_printer; 
	(IS_DISPLAY_IP_RANGE((__i915), (ipver), (ipver)) && \

	 IS_DISPLAY_STEP((__i915), (from), (until)))



#define DISPLAY_INFO(i915)		((i915)->display.info.__device_info)

#define DISPLAY_RUNTIME_INFO(i915)	(&(i915)->display.info.__runtime_info)



#define DISPLAY_VER(i915)	(DISPLAY_RUNTIME_INFO(i915)->ip.ver)

#define DISPLAY_VER_FULL(i915)	IP_VER(DISPLAY_RUNTIME_INFO(i915)->ip.ver, \

				       DISPLAY_RUNTIME_INFO(i915)->ip.rel)

#define IS_DISPLAY_VER(i915, from, until) \

	(DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until))



struct intel_display_runtime_info {

	struct {

		u16 ver;

drivers/gpu/drm/i915/i915_drv.h

+0 −8
Original line number Diff line number Diff line
@@ -416,8 +416,6 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915) 


#define INTEL_INFO(i915)	((i915)->__info)

#define RUNTIME_INFO(i915)	(&(i915)->__runtime)

#define DISPLAY_INFO(i915)	((i915)->display.info.__device_info)

#define DISPLAY_RUNTIME_INFO(i915)	(&(i915)->display.info.__runtime_info)

#define DRIVER_CAPS(i915)	(&(i915)->caps)



#define INTEL_DEVID(i915)	(RUNTIME_INFO(i915)->device_id)
@@ -436,12 +434,6 @@ static inline struct intel_gt *to_gt(struct drm_i915_private *i915) 
#define IS_MEDIA_VER(i915, from, until) \

	(MEDIA_VER(i915) >= (from) && MEDIA_VER(i915) <= (until))



#define DISPLAY_VER(i915)	(DISPLAY_RUNTIME_INFO(i915)->ip.ver)

#define DISPLAY_VER_FULL(i915)	IP_VER(DISPLAY_RUNTIME_INFO(i915)->ip.ver, \

				       DISPLAY_RUNTIME_INFO(i915)->ip.rel)

#define IS_DISPLAY_VER(i915, from, until) \

	(DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until))



#define INTEL_REVID(i915)	(to_pci_dev((i915)->drm.dev)->revision)



#define INTEL_DISPLAY_STEP(__i915) (RUNTIME_INFO(__i915)->step.display_step)