| Message ID | 20180925001913.29460-3-paulo.r.zanoni@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/3] drm/i915: DRM_FORMAT_C8 is not possible with Yf tiling | expand |
On Mon, 2018-09-24 at 17:19 -0700, Paulo Zanoni wrote: > A little git-blame'ing suggests that both functions were added by > commit 714244e280de ("drm/i915: Add format modifiers for Intel"), as > skl_mod_supported() on intel_display.c and > skl_plane_format_mod_supported() on intel_sprite.c. At that time they > were different, but right now they are exactly the same, name and > tabs > included. Remove one of the copies and make the other non-static. > > Given how our hardware has evolved it is unlikely that future > platforms will require a different format_mod_supported() function > for > the primary plane vs the sprite plane, and we can always bring > back > the additional copy if we need. Quick review since I knew the function had a duplicate. Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> Also noticed that the modifier arrays are exact copies but the pixel format arrays look different. > > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 50 -------------------------- > ---------- > drivers/gpu/drm/i915/intel_drv.h | 2 ++ > drivers/gpu/drm/i915/intel_sprite.c | 4 +-- > 3 files changed, 4 insertions(+), 52 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index a21ec8ae46f6..b9a0183dc580 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -13410,56 +13410,6 @@ static bool > i965_plane_format_mod_supported(struct drm_plane *_plane, > } > } > > -static bool skl_plane_format_mod_supported(struct drm_plane *_plane, > - u32 format, u64 modifier) > -{ > - struct intel_plane *plane = to_intel_plane(_plane); > - > - switch (modifier) { > - case DRM_FORMAT_MOD_LINEAR: > - case I915_FORMAT_MOD_X_TILED: > - case I915_FORMAT_MOD_Y_TILED: > - case I915_FORMAT_MOD_Yf_TILED: > - break; > - case I915_FORMAT_MOD_Y_TILED_CCS: > - case I915_FORMAT_MOD_Yf_TILED_CCS: > - if (!plane->has_ccs) > - return false; > - break; > - default: > - return false; > - } > - > - switch (format) { > - case DRM_FORMAT_XRGB8888: > - case DRM_FORMAT_XBGR8888: > - case DRM_FORMAT_ARGB8888: > - case DRM_FORMAT_ABGR8888: > - if (is_ccs_modifier(modifier)) > - return true; > - /* fall through */ > - case DRM_FORMAT_RGB565: > - case DRM_FORMAT_XRGB2101010: > - case DRM_FORMAT_XBGR2101010: > - case DRM_FORMAT_YUYV: > - case DRM_FORMAT_YVYU: > - case DRM_FORMAT_UYVY: > - case DRM_FORMAT_VYUY: > - case DRM_FORMAT_NV12: > - if (modifier == I915_FORMAT_MOD_Yf_TILED) > - return true; > - /* fall through */ > - case DRM_FORMAT_C8: > - if (modifier == DRM_FORMAT_MOD_LINEAR || > - modifier == I915_FORMAT_MOD_X_TILED || > - modifier == I915_FORMAT_MOD_Y_TILED) > - return true; > - /* fall through */ > - default: > - return false; > - } > -} > - > static bool intel_cursor_format_mod_supported(struct drm_plane > *_plane, > u32 format, u64 > modifier) > { > diff --git a/drivers/gpu/drm/i915/intel_drv.h > b/drivers/gpu/drm/i915/intel_drv.h > index bf1c38728a59..313337f03da8 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -2140,6 +2140,8 @@ unsigned int skl_plane_max_stride(struct > intel_plane *plane, > unsigned int rotation); > int skl_plane_check(struct intel_crtc_state *crtc_state, > struct intel_plane_state *plane_state); > +bool skl_plane_format_mod_supported(struct drm_plane *_plane, > + u32 format, u64 modifier); > int intel_plane_check_src_coordinates(struct intel_plane_state > *plane_state); > int chv_plane_check_rotation(const struct intel_plane_state > *plane_state); > > diff --git a/drivers/gpu/drm/i915/intel_sprite.c > b/drivers/gpu/drm/i915/intel_sprite.c > index 8821e59b70ea..db297d257e1e 100644 > --- a/drivers/gpu/drm/i915/intel_sprite.c > +++ b/drivers/gpu/drm/i915/intel_sprite.c > @@ -1609,8 +1609,8 @@ static bool > vlv_sprite_format_mod_supported(struct drm_plane *_plane, > } > } > > -static bool skl_plane_format_mod_supported(struct drm_plane *_plane, > - u32 format, u64 modifier) > +bool skl_plane_format_mod_supported(struct drm_plane *_plane, > + u32 format, u64 modifier) > { > struct intel_plane *plane = to_intel_plane(_plane); >
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a21ec8ae46f6..b9a0183dc580 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13410,56 +13410,6 @@ static bool i965_plane_format_mod_supported(struct drm_plane *_plane, } } -static bool skl_plane_format_mod_supported(struct drm_plane *_plane, - u32 format, u64 modifier) -{ - struct intel_plane *plane = to_intel_plane(_plane); - - switch (modifier) { - case DRM_FORMAT_MOD_LINEAR: - case I915_FORMAT_MOD_X_TILED: - case I915_FORMAT_MOD_Y_TILED: - case I915_FORMAT_MOD_Yf_TILED: - break; - case I915_FORMAT_MOD_Y_TILED_CCS: - case I915_FORMAT_MOD_Yf_TILED_CCS: - if (!plane->has_ccs) - return false; - break; - default: - return false; - } - - switch (format) { - case DRM_FORMAT_XRGB8888: - case DRM_FORMAT_XBGR8888: - case DRM_FORMAT_ARGB8888: - case DRM_FORMAT_ABGR8888: - if (is_ccs_modifier(modifier)) - return true; - /* fall through */ - case DRM_FORMAT_RGB565: - case DRM_FORMAT_XRGB2101010: - case DRM_FORMAT_XBGR2101010: - case DRM_FORMAT_YUYV: - case DRM_FORMAT_YVYU: - case DRM_FORMAT_UYVY: - case DRM_FORMAT_VYUY: - case DRM_FORMAT_NV12: - if (modifier == I915_FORMAT_MOD_Yf_TILED) - return true; - /* fall through */ - case DRM_FORMAT_C8: - if (modifier == DRM_FORMAT_MOD_LINEAR || - modifier == I915_FORMAT_MOD_X_TILED || - modifier == I915_FORMAT_MOD_Y_TILED) - return true; - /* fall through */ - default: - return false; - } -} - static bool intel_cursor_format_mod_supported(struct drm_plane *_plane, u32 format, u64 modifier) { diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index bf1c38728a59..313337f03da8 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -2140,6 +2140,8 @@ unsigned int skl_plane_max_stride(struct intel_plane *plane, unsigned int rotation); int skl_plane_check(struct intel_crtc_state *crtc_state, struct intel_plane_state *plane_state); +bool skl_plane_format_mod_supported(struct drm_plane *_plane, + u32 format, u64 modifier); int intel_plane_check_src_coordinates(struct intel_plane_state *plane_state); int chv_plane_check_rotation(const struct intel_plane_state *plane_state); diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 8821e59b70ea..db297d257e1e 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1609,8 +1609,8 @@ static bool vlv_sprite_format_mod_supported(struct drm_plane *_plane, } } -static bool skl_plane_format_mod_supported(struct drm_plane *_plane, - u32 format, u64 modifier) +bool skl_plane_format_mod_supported(struct drm_plane *_plane, + u32 format, u64 modifier) { struct intel_plane *plane = to_intel_plane(_plane);
A little git-blame'ing suggests that both functions were added by commit 714244e280de ("drm/i915: Add format modifiers for Intel"), as skl_mod_supported() on intel_display.c and skl_plane_format_mod_supported() on intel_sprite.c. At that time they were different, but right now they are exactly the same, name and tabs included. Remove one of the copies and make the other non-static. Given how our hardware has evolved it is unlikely that future platforms will require a different format_mod_supported() function for the primary plane vs the sprite plane, and we can always bring back the additional copy if we need. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 50 ------------------------------------ drivers/gpu/drm/i915/intel_drv.h | 2 ++ drivers/gpu/drm/i915/intel_sprite.c | 4 +-- 3 files changed, 4 insertions(+), 52 deletions(-)