Commit 7df7bca5 authored by Imre Deak's avatar Imre Deak

drm/i915/fb: Don't store bitmasks in the intel_plane_caps enum

Variables of enum types can contain only the values listed at the enums
definition, so don't store bitmasks in intel_plane_caps enum variables.

Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211026161517.2694067-3-imre.deak@intel.com
parent da0c3e2c
...@@ -309,7 +309,7 @@ static bool check_modifier_display_ver_range(const struct intel_modifier_desc *m ...@@ -309,7 +309,7 @@ static bool check_modifier_display_ver_range(const struct intel_modifier_desc *m
} }
static bool plane_has_modifier(struct drm_i915_private *i915, static bool plane_has_modifier(struct drm_i915_private *i915,
enum intel_plane_caps plane_caps, u8 plane_caps,
const struct intel_modifier_desc *md) const struct intel_modifier_desc *md)
{ {
if (!IS_DISPLAY_VER(i915, md->display_ver.from, md->display_ver.until)) if (!IS_DISPLAY_VER(i915, md->display_ver.from, md->display_ver.until))
...@@ -340,7 +340,7 @@ static bool plane_has_modifier(struct drm_i915_private *i915, ...@@ -340,7 +340,7 @@ static bool plane_has_modifier(struct drm_i915_private *i915,
* The caller must free the returned buffer. * The caller must free the returned buffer.
*/ */
u64 *intel_fb_plane_get_modifiers(struct drm_i915_private *i915, u64 *intel_fb_plane_get_modifiers(struct drm_i915_private *i915,
enum intel_plane_caps plane_caps) u8 plane_caps)
{ {
u64 *list, *p; u64 *list, *p;
int count = 1; /* +1 for invalid modifier terminator */ int count = 1; /* +1 for invalid modifier terminator */
......
...@@ -35,7 +35,7 @@ bool intel_fb_is_ccs_aux_plane(const struct drm_framebuffer *fb, int color_plane ...@@ -35,7 +35,7 @@ bool intel_fb_is_ccs_aux_plane(const struct drm_framebuffer *fb, int color_plane
int intel_fb_rc_ccs_cc_plane(const struct drm_framebuffer *fb); int intel_fb_rc_ccs_cc_plane(const struct drm_framebuffer *fb);
u64 *intel_fb_plane_get_modifiers(struct drm_i915_private *i915, u64 *intel_fb_plane_get_modifiers(struct drm_i915_private *i915,
enum intel_plane_caps plane_caps); u8 plane_caps);
bool intel_fb_plane_supports_modifier(struct intel_plane *plane, u64 modifier); bool intel_fb_plane_supports_modifier(struct intel_plane *plane, u64 modifier);
const struct drm_format_info * const struct drm_format_info *
......
...@@ -2023,7 +2023,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, ...@@ -2023,7 +2023,7 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv,
const struct drm_plane_funcs *plane_funcs; const struct drm_plane_funcs *plane_funcs;
struct intel_plane *plane; struct intel_plane *plane;
enum drm_plane_type plane_type; enum drm_plane_type plane_type;
enum intel_plane_caps plane_caps; u8 plane_caps;
unsigned int supported_rotations; unsigned int supported_rotations;
unsigned int supported_csc; unsigned int supported_csc;
const u64 *modifiers; const u64 *modifiers;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment