diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2022-11-02 12:08:12 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2022-11-03 16:20:53 +0200 |
| commit | d29c410f77fd3f7dc632f5f153f455e6163d5449 (patch) | |
| tree | ddb658502bbeaabaa953f8bb1ce2b4cea6868166 /drivers/gpu/drm/i915/display/intel_sprite.h | |
| parent | 19cfeb414ea3d7d1beba0dadc466618e5671805e (diff) | |
drm/i915: un-inline icl_hdr_plane_mask() to simplify includes
This lets us drop the heavy intel_display.h include from intel_sprite.h.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/16e13b6f207f52f8810a06f71a08e637f6397dc8.1667383630.git.jani.nikula@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_sprite.h')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_sprite.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/drm/i915/display/intel_sprite.h index 4f63e4967731..4635c7ad23f9 100644 --- a/drivers/gpu/drm/i915/display/intel_sprite.h +++ b/drivers/gpu/drm/i915/display/intel_sprite.h @@ -8,14 +8,13 @@ #include <linux/types.h> -#include "intel_display.h" - struct drm_device; struct drm_display_mode; struct drm_file; struct drm_i915_private; struct intel_crtc_state; struct intel_plane_state; +enum pipe; /* * FIXME: We should instead only take spinlocks once for the entire update @@ -34,12 +33,6 @@ int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data, int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state); int chv_plane_check_rotation(const struct intel_plane_state *plane_state); -static inline u8 icl_hdr_plane_mask(void) -{ - return BIT(PLANE_PRIMARY) | - BIT(PLANE_SPRITE0) | BIT(PLANE_SPRITE1); -} - int ivb_plane_min_cdclk(const struct intel_crtc_state *crtc_state, const struct intel_plane_state *plane_state); int hsw_plane_min_cdclk(const struct intel_crtc_state *crtc_state, |