On 18/09/2018 14:10, Ville Syrjala wrote:
From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Smatch reports: ../drivers/gpu/drm/i915/intel_sprite.c:1192 skl_plane_check_fb() warn: was || intended here instead of &&? Obviously smatch is correct here since we're trying to check if we're using either of the ccs modifiers. Since we now have is_ccs_modifier() let's use it to fix this. Cc: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Cc: José Roberto de Souza <jose.souza@xxxxxxxxx> Reported-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> Fixes: e21c2d331018 ("drm/i915: Move skl plane fb related checks into a better place") Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> --- drivers/gpu/drm/i915/intel_sprite.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 8821e59b70ea..d4c8e10fc90b 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -1190,8 +1190,7 @@ static int skl_plane_check_fb(const struct intel_crtc_state *crtc_state, return 0;if (rotation & ~(DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_180) &&- (fb->modifier == I915_FORMAT_MOD_Y_TILED_CCS && - fb->modifier == I915_FORMAT_MOD_Yf_TILED_CCS)) { + is_ccs_modifier(fb->modifier)) { DRM_DEBUG_KMS("RC support only with 0/180 degree rotation (%x)\n", rotation); return -EINVAL;
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx> Just a drive by on a trivial one. :) Regards, Tvrtko _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
