From patchwork Tue May 23 12:51:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 13252231 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 474E5C7EE29 for ; Tue, 23 May 2023 12:51:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EFD210E427; Tue, 23 May 2023 12:51:27 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCFD410E427 for ; Tue, 23 May 2023 12:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684846284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bAprbvbicDzO/i64xE13RGPcGm8TJil9TJRhodKNwUQ=; b=gNgqf0l9H0IpZ/Jj/UeLN1Z8Cf7Q5t8l0MMIdzqEWApUL7kjxb4zqDc84a2aN+ucWndhNX RXnibfyM1djGR0qs8tQg/tZWs7bl62X3a6H7AdvFzDCs1OcD1IX28llUSdHQNGHJw3w18v KdTdkxkaSMFgdUqnu4lMnoruCBlJjvw= Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-66-ETdTD5GANsO0lRwK-fEu7g-1; Tue, 23 May 2023 08:51:23 -0400 X-MC-Unique: ETdTD5GANsO0lRwK-fEu7g-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-75b1ad467b7so152776885a.3 for ; Tue, 23 May 2023 05:51:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684846283; x=1687438283; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bAprbvbicDzO/i64xE13RGPcGm8TJil9TJRhodKNwUQ=; b=c5MdwL7AWgovKfeuC6IwLWOecKDm93GHCdOyfy5yOWMgguruq/Nd/pEtks9jc14RNe GaWOII2nxCBM93cm7rfsfiGbFKft0rv/kWeieEqCWgp0rUwGx8H3lOfjEqVp+wIMZFbs L1VEdu2kUKFKi+ofKYThDoMkGKG3b1z7TI8C+hsBByEib3Zb3OU39i/FHqjLGwSjz46D QXI8w2zXpmkhLSiEDwox0HE5uB2AwX0mN4IRiAwuQEOeIS9QkOhSxaGmi12A27TBnFSz KGLkrjqmWbaVvt8I1moDp4WuldXFKnZqndbSu93EYh6wJ+UIstBvrrCRBrMgeJMIqCB0 Ml/w== X-Gm-Message-State: AC+VfDz36itGL7in4OyHy8zYOhgEY5S1n1jfcc8tNUFrxoDhQ/gAqHN9 riCjm8QF/pRG1VyN3NHNjM8jY+JCzOzAipdHdx9zGP+lgm8IpsTopNgM8SgBqILFQB4VQAvQQY7 1qxf2SYD5tF8Ef2jjGUCiBEknRMTx X-Received: by 2002:a37:88f:0:b0:75b:23a0:e7ed with SMTP id 137-20020a37088f000000b0075b23a0e7edmr3850965qki.78.1684846282949; Tue, 23 May 2023 05:51:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7GUZvQqUqL8jnjS5iId8YX67qOidNHrEO9Bxwn07WXAbE7b7d2NbJu1BrYJ46XQnyjQLxqgg== X-Received: by 2002:a37:88f:0:b0:75b:23a0:e7ed with SMTP id 137-20020a37088f000000b0075b23a0e7edmr3850948qki.78.1684846282675; Tue, 23 May 2023 05:51:22 -0700 (PDT) Received: from dell-per740-01.7a2m.lab.eng.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id c3-20020ae9e203000000b0075b35e72a21sm7626qkc.86.2023.05.23.05.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 May 2023 05:51:21 -0700 (PDT) From: Tom Rix To: jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, tvrtko.ursulin@linux.intel.com, airlied@gmail.com, daniel@ffwll.ch, nathan@kernel.org, ndesaulniers@google.com, ville.syrjala@linux.intel.com, imre.deak@intel.com, arun.r.murthy@intel.com, lucas.demarchi@intel.com Subject: [PATCH] drm/i915: simplify switch to if-elseif Date: Tue, 23 May 2023 08:51:16 -0400 Message-Id: <20230523125116.1669057-1-trix@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom Rix , intel-gfx@lists.freedesktop.org, llvm@lists.linux.dev, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" clang with W=1 reports drivers/gpu/drm/i915/display/intel_display.c:6012:3: error: unannotated fall-through between switch labels [-Werror,-Wimplicit-fallthrough] case I915_FORMAT_MOD_X_TILED: ^ Only one case and the default does anything in this switch, so it should be changed to an if-elseif. Signed-off-by: Tom Rix --- drivers/gpu/drm/i915/display/intel_display.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 0490c6412ab5..1f852e49fc20 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -5994,8 +5994,7 @@ static int intel_async_flip_check_hw(struct intel_atomic_state *state, struct in * Need to verify this for all gen9 platforms to enable * this selectively if required. */ - switch (new_plane_state->hw.fb->modifier) { - case DRM_FORMAT_MOD_LINEAR: + if (new_plane_state->hw.fb->modifier == DRM_FORMAT_MOD_LINEAR) { /* * FIXME: Async on Linear buffer is supported on ICL as * but with additional alignment and fbc restrictions @@ -6008,13 +6007,10 @@ static int intel_async_flip_check_hw(struct intel_atomic_state *state, struct in plane->base.base.id, plane->base.name); return -EINVAL; } - - case I915_FORMAT_MOD_X_TILED: - case I915_FORMAT_MOD_Y_TILED: - case I915_FORMAT_MOD_Yf_TILED: - case I915_FORMAT_MOD_4_TILED: - break; - default: + } else if (!(new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_X_TILED || + new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_Y_TILED || + new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_Yf_TILED || + new_plane_state->hw.fb->modifier == I915_FORMAT_MOD_4_TILED)) { drm_dbg_kms(&i915->drm, "[PLANE:%d:%s] Modifier does not support async flips\n", plane->base.base.id, plane->base.name);