Commit f837a61f authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915/intel_fb: Pull FB plane functions from intel_display_types.h 



Start collecting all the FB plane related functions into a new intel_fb.c
file.

v2: Drop display/ part of header includes. (Ville)

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210325214808.2071517-7-imre.deak@intel.com
parent 54c2921f

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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 \

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

+1 −0
Original line number Diff line number Diff line
@@ -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"

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

+0 −19
Original line number Diff line number Diff line
@@ -1995,14 +1995,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 ||
@@ -2010,15 +2002,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__ */

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

0 → 100644
+28 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright © 2021 Intel Corporation

 */



#include <drm/drm_framebuffer.h>



#include "intel_display_types.h"

#include "intel_fb.h"



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;

}

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

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/* 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__ */