On Thu, Mar 11, 2021 at 12:17:20AM +0200, Imre Deak wrote:
> Start collecting all the FB plane related functions into a new intel_fb.c
> file.
>
> Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/Makefile | 1 +
> drivers/gpu/drm/i915/display/intel_display.c | 1 +
> .../drm/i915/display/intel_display_types.h | 19 -------------
> drivers/gpu/drm/i915/display/intel_fb.c | 28 +++++++++++++++++++
> drivers/gpu/drm/i915/display/intel_fb.h | 17 +++++++++++
> .../drm/i915/display/skl_universal_plane.c | 1 +
> 6 files changed, 48 insertions(+), 19 deletions(-)
> create mode 100644 drivers/gpu/drm/i915/display/intel_fb.c
> create mode 100644 drivers/gpu/drm/i915/display/intel_fb.h
>
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index bc6138880c67..30c50bacb363 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -210,6 +210,7 @@ i915-y += \
> display/intel_dpll.o \
> display/intel_dpll_mgr.o \
> display/intel_dsb.o \
> + display/intel_fb.o \
> display/intel_fbc.o \
> display/intel_fdi.o \
> display/intel_fifo_underrun.o \
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 7bc541b75eef..39584a82550d 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -54,6 +54,7 @@
> #include "display/intel_dpll_mgr.h"
> #include "display/intel_dsi.h"
> #include "display/intel_dvo.h"
> +#include "display/intel_fb.h"
> #include "display/intel_gmbus.h"
> #include "display/intel_hdmi.h"
> #include "display/intel_lvds.h"
> diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
> index f159dce0f744..65159a1ea7dd 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_types.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_types.h
> @@ -1976,14 +1976,6 @@ static inline bool is_ccs_modifier(u64 modifier)
> modifier == I915_FORMAT_MOD_Yf_TILED_CCS;
> }
>
> -static inline bool is_ccs_plane(const struct drm_framebuffer *fb, int plane)
> -{
> - if (!is_ccs_modifier(fb->modifier))
> - return false;
> -
> - return plane >= fb->format->num_planes / 2;
> -}
> -
> static inline bool is_gen12_ccs_modifier(u64 modifier)
> {
> return modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
> @@ -1991,15 +1983,4 @@ static inline bool is_gen12_ccs_modifier(u64 modifier)
> modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS;
> }
>
> -static inline bool is_gen12_ccs_plane(const struct drm_framebuffer *fb, int plane)
> -{
> - return is_gen12_ccs_modifier(fb->modifier) && is_ccs_plane(fb, plane);
> -}
> -
> -static inline bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane)
> -{
> - return fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC &&
> - plane == 2;
> -}
> -
> #endif /* __INTEL_DISPLAY_TYPES_H__ */
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
> new file mode 100644
> index 000000000000..29b8ec087f53
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/display/intel_fb.c
> @@ -0,0 +1,28 @@
> +// SPDX-License-Identifier: MIT
> +/*
> + * Copyright © 2021 Intel Corporation
> + */
> +
> +#include <drm/drm_framebuffer.h>
> +
> +#include "display/intel_display_types.h"
> +#include "display/intel_fb.h"
I don't think we usually have the "display/" part in these.
Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> +
> +bool is_ccs_plane(const struct drm_framebuffer *fb, int plane)
> +{
> + if (!is_ccs_modifier(fb->modifier))
> + return false;
> +
> + return plane >= fb->format->num_planes / 2;
> +}
> +
> +bool is_gen12_ccs_plane(const struct drm_framebuffer *fb, int plane)
> +{
> + return is_gen12_ccs_modifier(fb->modifier) && is_ccs_plane(fb, plane);
> +}
> +
> +bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane)
> +{
> + return fb->modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC &&
> + plane == 2;
> +}
> diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
> new file mode 100644
> index 000000000000..64e6a2521320
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/display/intel_fb.h
> @@ -0,0 +1,17 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2020-2021 Intel Corporation
> + */
> +
> +#ifndef __INTEL_FB_H__
> +#define __INTEL_FB_H__
> +
> +#include <linux/types.h>
> +
> +struct drm_framebuffer;
> +
> +bool is_ccs_plane(const struct drm_framebuffer *fb, int plane);
> +bool is_gen12_ccs_plane(const struct drm_framebuffer *fb, int plane);
> +bool is_gen12_ccs_cc_plane(const struct drm_framebuffer *fb, int plane);
> +
> +#endif /* __INTEL_FB_H__ */
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 1f335cb09149..3ff1008b0b4a 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -11,6 +11,7 @@
> #include "i915_drv.h"
> #include "intel_atomic_plane.h"
> #include "intel_display_types.h"
> +#include "intel_fb.h"
> #include "intel_pm.h"
> #include "intel_psr.h"
> #include "intel_sprite.h"
> --
> 2.25.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
