drm/i915/sprite: un-inline icl_is_hdr_plane() (5b51f28f) · Commits · 戴 / test

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -330,6 +330,12 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
		return 0;
		}

		bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id plane_id)
		{
		return INTEL_GEN(dev_priv) >= 11 &&
		icl_hdr_plane_mask() & BIT(plane_id);
		}

		static unsigned int
		skl_plane_max_stride(struct intel_plane *plane,
		u32 pixel_format, u64 modifier,

+1 −7

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@

		#include <linux/types.h>

		#include "i915_drv.h"
		#include "intel_display.h"

		struct drm_device;
		@@ -49,11 +48,6 @@ static inline u8 icl_hdr_plane_mask(void)
		BIT(PLANE_SPRITE0) \| BIT(PLANE_SPRITE1);
		}

		static inline bool icl_is_hdr_plane(struct drm_i915_private *dev_priv,
		enum plane_id plane_id)
		{
		return INTEL_GEN(dev_priv) >= 11 &&
		icl_hdr_plane_mask() & BIT(plane_id);
		}
		bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id plane_id);

		#endif /* __INTEL_SPRITE_H__ */