niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915/sprite: un-inline icl_is_hdr_plane()

Browse source 
Avoid including the i915_drv.h mega header from other header files to
make further header cleanup easier.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5f998c72018c0f1cc5cdb239327a1281d21f4c0e.1565085691.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2019-08-06 13:07:23 +03:00
parent 3e1876251b
commit 5b51f28fa7
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gpu/drm/i915/display/intel_sprite.c
View file

@ -330,6 +330,12 @@ int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state)
return 0; 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 static unsigned int
skl_plane_max_stride(struct intel_plane *plane, skl_plane_max_stride(struct intel_plane *plane,
u32 pixel_format, u64 modifier, u32 pixel_format, u64 modifier,

8
drivers/gpu/drm/i915/display/intel_sprite.h
View file

@ -8,7 +8,6 @@
#include <linux/types.h> #include <linux/types.h>
#include "i915_drv.h"
#include "intel_display.h" #include "intel_display.h"
struct drm_device; struct drm_device;
@ -49,11 +48,6 @@ static inline u8 icl_hdr_plane_mask(void)
BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1); BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1);
} }
static inline bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, bool icl_is_hdr_plane(struct drm_i915_private *dev_priv, enum plane_id plane_id);
enum plane_id plane_id)
{
return INTEL_GEN(dev_priv) >= 11 &&
icl_hdr_plane_mask() & BIT(plane_id);
}
#endif /* __INTEL_SPRITE_H__ */ #endif /* __INTEL_SPRITE_H__ */