[PATCH 12/15] drm/i915/display: rename i915 parameter to __display in feature helpers
Govindapillai, Vinod
vinod.govindapillai at intel.com
Wed Nov 6 11:50:26 UTC 2024
On Mon, 2024-11-04 at 19:19 +0200, Jani Nikula wrote:
> All the feature check helpers now support (and some require) passing
> struct intel_display. Rename the parameter to __display to reflect the
> fact.
>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
> .../drm/i915/display/intel_display_device.h | 112 +++++++++---------
> 1 file changed, 56 insertions(+), 56 deletions(-)
Reviewed-by: Vinod Govindapillai <vinod.govindapillai at intel.com>
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.h
> b/drivers/gpu/drm/i915/display/intel_display_device.h
> index 548256401d0a..48f32280145f 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.h
> @@ -139,61 +139,61 @@ struct intel_display_platforms {
> func(supports_tv);
>
> #define HAS_4TILE(__display) ((__display)->platform.dg2 || DISPLAY_VER(__display) >=
> 14)
> -#define HAS_ASYNC_FLIPS(i915) (DISPLAY_VER(i915) >= 5)
> -#define HAS_BIGJOINER(i915) (DISPLAY_VER(i915) >= 11 && HAS_DSC(i915))
> -#define HAS_CDCLK_CRAWL(i915) (DISPLAY_INFO(i915)->has_cdclk_crawl)
> -#define HAS_CDCLK_SQUASH(i915) (DISPLAY_INFO(i915)->has_cdclk_squash)
> -#define HAS_CUR_FBC(i915) (!HAS_GMCH(i915) && IS_DISPLAY_VER(i915, 7, 13))
> +#define HAS_ASYNC_FLIPS(__display) (DISPLAY_VER(__display) >= 5)
> +#define HAS_BIGJOINER(__display) (DISPLAY_VER(__display) >= 11 && HAS_DSC(__display))
> +#define HAS_CDCLK_CRAWL(__display) (DISPLAY_INFO(__display)->has_cdclk_crawl)
> +#define HAS_CDCLK_SQUASH(__display) (DISPLAY_INFO(__display)->has_cdclk_squash)
> +#define HAS_CUR_FBC(__display) (!HAS_GMCH(__display) && IS_DISPLAY_VER(__display, 7, 13))
> #define HAS_D12_PLANE_MINIMIZATION(__display) ((__display)->platform.rocketlake || (__display)-
> >platform.alderlake_s)
> -#define HAS_DBUF_OVERLAP_DETECTION(__i915) (DISPLAY_RUNTIME_INFO(__i915)-
> >has_dbuf_overlap_detection)
> -#define HAS_DDI(i915) (DISPLAY_INFO(i915)->has_ddi)
> -#define HAS_DISPLAY(i915) (DISPLAY_RUNTIME_INFO(i915)->pipe_mask != 0)
> -#define HAS_DMC(i915) (DISPLAY_RUNTIME_INFO(i915)->has_dmc)
> +#define HAS_DBUF_OVERLAP_DETECTION(__display) (DISPLAY_RUNTIME_INFO(__display)-
> >has_dbuf_overlap_detection)
> +#define HAS_DDI(__display) (DISPLAY_INFO(__display)->has_ddi)
> +#define HAS_DISPLAY(__display) (DISPLAY_RUNTIME_INFO(__display)->pipe_mask != 0)
> +#define HAS_DMC(__display) (DISPLAY_RUNTIME_INFO(__display)->has_dmc)
> #define HAS_DOUBLE_BUFFERED_M_N(__display) (DISPLAY_VER(__display) >= 9 || (__display)-
> >platform.broadwell)
> -#define HAS_DP_MST(i915) (DISPLAY_INFO(i915)->has_dp_mst)
> +#define HAS_DP_MST(__display) (DISPLAY_INFO(__display)->has_dp_mst)
> #define HAS_DP20(__display) ((__display)->platform.dg2 || DISPLAY_VER(__display) >=
> 14)
> -#define HAS_DPT(i915) (DISPLAY_VER(i915) >= 13)
> -#define HAS_DSB(i915) (DISPLAY_INFO(i915)->has_dsb)
> -#define HAS_DSC(__i915) (DISPLAY_RUNTIME_INFO(__i915)->has_dsc)
> -#define HAS_DSC_MST(__i915) (DISPLAY_VER(__i915) >= 12 && HAS_DSC(__i915))
> -#define HAS_FBC(i915) (DISPLAY_RUNTIME_INFO(i915)->fbc_mask != 0)
> -#define HAS_FPGA_DBG_UNCLAIMED(i915) (DISPLAY_INFO(i915)->has_fpga_dbg)
> -#define HAS_FW_BLC(i915) (DISPLAY_VER(i915) >= 3)
> -#define HAS_GMBUS_IRQ(i915) (DISPLAY_VER(i915) >= 4)
> +#define HAS_DPT(__display) (DISPLAY_VER(__display) >= 13)
> +#define HAS_DSB(__display) (DISPLAY_INFO(__display)->has_dsb)
> +#define HAS_DSC(__display) (DISPLAY_RUNTIME_INFO(__display)->has_dsc)
> +#define HAS_DSC_MST(__display) (DISPLAY_VER(__display) >= 12 && HAS_DSC(__display))
> +#define HAS_FBC(__display) (DISPLAY_RUNTIME_INFO(__display)->fbc_mask != 0)
> +#define HAS_FPGA_DBG_UNCLAIMED(__display) (DISPLAY_INFO(__display)->has_fpga_dbg)
> +#define HAS_FW_BLC(__display) (DISPLAY_VER(__display) >= 3)
> +#define HAS_GMBUS_IRQ(__display) (DISPLAY_VER(__display) >= 4)
> #define HAS_GMBUS_BURST_READ(__display) (DISPLAY_VER(__display) >= 10 || (__display)-
> >platform.kabylake)
> -#define HAS_GMCH(i915) (DISPLAY_INFO(i915)->has_gmch)
> +#define HAS_GMCH(__display) (DISPLAY_INFO(__display)->has_gmch)
> #define HAS_HW_SAGV_WM(__display) (DISPLAY_VER(__display) >= 13 && !(__display)-
> >platform.dgfx)
> -#define HAS_IPC(i915) (DISPLAY_INFO(i915)->has_ipc)
> +#define HAS_IPC(__display) (DISPLAY_INFO(__display)->has_ipc)
> #define HAS_IPS(__display) ((__display)->platform.haswell_ult || (__display)-
> >platform.broadwell)
> -#define HAS_LRR(i915) (DISPLAY_VER(i915) >= 12)
> -#define HAS_LSPCON(i915) (IS_DISPLAY_VER(i915, 9, 10))
> +#define HAS_LRR(__display) (DISPLAY_VER(__display) >= 12)
> +#define HAS_LSPCON(__display) (IS_DISPLAY_VER(__display, 9, 10))
> #define HAS_MBUS_JOINING(__display) ((__display)->platform.alderlake_p ||
> DISPLAY_VER(__display) >= 14)
> -#define HAS_MSO(i915) (DISPLAY_VER(i915) >= 12)
> -#define HAS_OVERLAY(i915) (DISPLAY_INFO(i915)->has_overlay)
> -#define HAS_PSR(i915) (DISPLAY_INFO(i915)->has_psr)
> -#define HAS_PSR_HW_TRACKING(i915) (DISPLAY_INFO(i915)->has_psr_hw_tracking)
> -#define HAS_PSR2_SEL_FETCH(i915) (DISPLAY_VER(i915) >= 12)
> +#define HAS_MSO(__display) (DISPLAY_VER(__display) >= 12)
> +#define HAS_OVERLAY(__display) (DISPLAY_INFO(__display)->has_overlay)
> +#define HAS_PSR(__display) (DISPLAY_INFO(__display)->has_psr)
> +#define HAS_PSR_HW_TRACKING(__display) (DISPLAY_INFO(__display)->has_psr_hw_tracking)
> +#define HAS_PSR2_SEL_FETCH(__display) (DISPLAY_VER(__display) >= 12)
> #define HAS_SAGV(__display) (DISPLAY_VER(__display) >= 9 && \
> !(__display)->platform.broxton && !(__display)-
> >platform.geminilake)
> -#define HAS_TRANSCODER(i915, trans) ((DISPLAY_RUNTIME_INFO(i915)->cpu_transcoder_mask & \
> - BIT(trans)) != 0)
> -#define HAS_UNCOMPRESSED_JOINER(i915) (DISPLAY_VER(i915) >= 13)
> +#define HAS_TRANSCODER(__display, trans) ((DISPLAY_RUNTIME_INFO(__display)-
> >cpu_transcoder_mask & \
> + BIT(trans)) != 0)
> +#define HAS_UNCOMPRESSED_JOINER(__display) (DISPLAY_VER(__display) >= 13)
> #define HAS_ULTRAJOINER(__display) ((DISPLAY_VER(__display) >= 20 || \
> ((__display)->platform.dgfx && DISPLAY_VER(__display) ==
> 14)) && \
> HAS_DSC(__display))
> -#define HAS_VRR(i915) (DISPLAY_VER(i915) >= 11)
> -#define HAS_AS_SDP(i915) (DISPLAY_VER(i915) >= 13)
> -#define HAS_CMRR(i915) (DISPLAY_VER(i915) >= 20)
> -#define INTEL_NUM_PIPES(i915) (hweight8(DISPLAY_RUNTIME_INFO(i915)->pipe_mask))
> -#define I915_HAS_HOTPLUG(i915) (DISPLAY_INFO(i915)->has_hotplug)
> -#define OVERLAY_NEEDS_PHYSICAL(i915) (DISPLAY_INFO(i915)->overlay_needs_physical)
> -#define SUPPORTS_TV(i915) (DISPLAY_INFO(i915)->supports_tv)
> +#define HAS_VRR(__display) (DISPLAY_VER(__display) >= 11)
> +#define HAS_AS_SDP(__display) (DISPLAY_VER(__display) >= 13)
> +#define HAS_CMRR(__display) (DISPLAY_VER(__display) >= 20)
> +#define INTEL_NUM_PIPES(__display) (hweight8(DISPLAY_RUNTIME_INFO(__display)->pipe_mask))
> +#define I915_HAS_HOTPLUG(__display) (DISPLAY_INFO(__display)->has_hotplug)
> +#define OVERLAY_NEEDS_PHYSICAL(__display) (DISPLAY_INFO(__display)->overlay_needs_physical)
> +#define SUPPORTS_TV(__display) (DISPLAY_INFO(__display)->supports_tv)
>
> /* Check that device has a display IP version within the specific range. */
> -#define IS_DISPLAY_VERx100(__i915, from, until) ( \
> +#define IS_DISPLAY_VERx100(__display, from, until) ( \
> BUILD_BUG_ON_ZERO((from) < 200) + \
> - (DISPLAY_VERx100(__i915) >= (from) && \
> - DISPLAY_VERx100(__i915) <= (until)))
> + (DISPLAY_VERx100(__display) >= (from) && \
> + DISPLAY_VERx100(__display) <= (until)))
>
> /*
> * Check if a device has a specific IP version as well as a stepping within the
> @@ -204,30 +204,30 @@ struct intel_display_platforms {
> * hardware fix is present and the software workaround is no longer necessary.
> * E.g.,
> *
> - * IS_DISPLAY_VERx100_STEP(i915, 1400, STEP_A0, STEP_B2)
> - * IS_DISPLAY_VERx100_STEP(i915, 1400, STEP_C0, STEP_FOREVER)
> + * IS_DISPLAY_VERx100_STEP(display, 1400, STEP_A0, STEP_B2)
> + * IS_DISPLAY_VERx100_STEP(display, 1400, STEP_C0, STEP_FOREVER)
> *
> * "STEP_FOREVER" can be passed as "until" for workarounds that have no upper
> * stepping bound for the specified IP version.
> */
> -#define IS_DISPLAY_VERx100_STEP(__i915, ipver, from, until) \
> - (IS_DISPLAY_VERx100((__i915), (ipver), (ipver)) && \
> - IS_DISPLAY_STEP((__i915), (from), (until)))
> +#define IS_DISPLAY_VERx100_STEP(__display, ipver, from, until) \
> + (IS_DISPLAY_VERx100((__display), (ipver), (ipver)) && \
> + IS_DISPLAY_STEP((__display), (from), (until)))
>
> -#define DISPLAY_INFO(i915) (__to_intel_display(i915)->info.__device_info)
> -#define DISPLAY_RUNTIME_INFO(i915) (&__to_intel_display(i915)->info.__runtime_info)
> +#define DISPLAY_INFO(__display) (__to_intel_display(__display)-
> >info.__device_info)
> +#define DISPLAY_RUNTIME_INFO(__display) (&__to_intel_display(__display)-
> >info.__runtime_info)
>
> -#define DISPLAY_VER(i915) (DISPLAY_RUNTIME_INFO(i915)->ip.ver)
> -#define DISPLAY_VERx100(i915) (DISPLAY_RUNTIME_INFO(i915)->ip.ver * 100 + \
> - DISPLAY_RUNTIME_INFO(i915)->ip.rel)
> -#define IS_DISPLAY_VER(i915, from, until) \
> - (DISPLAY_VER(i915) >= (from) && DISPLAY_VER(i915) <= (until))
> +#define DISPLAY_VER(__display) (DISPLAY_RUNTIME_INFO(__display)->ip.ver)
> +#define DISPLAY_VERx100(__display) (DISPLAY_RUNTIME_INFO(__display)->ip.ver * 100 + \
> + DISPLAY_RUNTIME_INFO(__display)->ip.rel)
> +#define IS_DISPLAY_VER(__display, from, until) \
> + (DISPLAY_VER(__display) >= (from) && DISPLAY_VER(__display) <= (until))
>
> -#define INTEL_DISPLAY_STEP(__i915) (DISPLAY_RUNTIME_INFO(__i915)->step)
> +#define INTEL_DISPLAY_STEP(__display) (DISPLAY_RUNTIME_INFO(__display)->step)
>
> -#define IS_DISPLAY_STEP(__i915, since, until) \
> - (drm_WARN_ON(__to_intel_display(__i915)->drm, INTEL_DISPLAY_STEP(__i915) == STEP_NONE), \
> - INTEL_DISPLAY_STEP(__i915) >= (since) && INTEL_DISPLAY_STEP(__i915) < (until))
> +#define IS_DISPLAY_STEP(__display, since, until) \
> + (drm_WARN_ON(__to_intel_display(__display)->drm, INTEL_DISPLAY_STEP(__display) ==
> STEP_NONE), \
> + INTEL_DISPLAY_STEP(__display) >= (since) && INTEL_DISPLAY_STEP(__display) < (until))
>
> struct intel_display_runtime_info {
> struct intel_display_ip_ver {
More information about the Intel-gfx
mailing list