From mboxrd@z Thu Jan 1 00:00:00 1970 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 ED39FC4167B for ; Thu, 7 Dec 2023 15:58:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C3B2710E926; Thu, 7 Dec 2023 15:58:40 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9ECD110E922 for ; Thu, 7 Dec 2023 15:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701964718; x=1733500718; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=f13IQ8fD74Ifg/5OiSTt+d/1X1LRZe/cqcXR0TB8qXE=; b=chMEaCqnOzeG8+SQfv1/LAUwBdBwzyLzhwGqMmF95YcPQ706D/emBrpp H40+FcDoflKF3QkTLlsOrfkNLNn6Q9byO/ta++0wOljaPYodyNjQKm8j/ g78C+MI73GGWXhywF9Dv4kYMCOufO2QkNMfQuo6SvPv/Bva9UHbNjvoow JFK79r1UEY6kImlQ8wPRQ4YzA8YsMBAX93WjxOpkO9XMycvU8XuKrVgNc xh32g3ZVWeyVqzaTWB75IRjL1ZIvWszcFw6Xc9OxfX/TCBzDsVQI1BMdX lktg4fVqvG1A6QnzoHq8TujB59KabCoZuGhkidY+xXGFHqQDXhYJvFGff A==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="384655294" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="384655294" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 07:58:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="765151706" X-IronPort-AV: E=Sophos;i="6.04,256,1695711600"; d="scan'208";a="765151706" Received: from rlgreyi-mobl.amr.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.46.17]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 07:58:36 -0800 From: =?UTF-8?q?Jouni=20H=C3=B6gander?= To: intel-xe@lists.freedesktop.org Subject: [PATCH v6 5/9] drm/i915/display: Handle invalid fb_modifier in intel_fb_modifier_to_tiling Date: Thu, 7 Dec 2023 17:58:11 +0200 Message-Id: <20231207155815.2467082-6-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231207155815.2467082-1-jouni.hogander@intel.com> References: <20231207155815.2467082-1-jouni.hogander@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Jouni=20H=C3=B6gander?= , Jani Nikula Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Lookup_modifier is returning INTEL_PLANE_CAP_TILING_4 on invalid fb_modifier value. Use lookup_modifier_or_null in intel_fb_modifier_to_tiling and return I915_TILING_NONE in case lookup_modifier_or_null returns null. Signed-off-by: Jouni Högander Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20231203114840.841311-4-jouni.hogander@intel.com (cherry picked from commit c61d8f7baabad322d53db301f7afaa2ce41493e6) Acked-by: Jani Nikula Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/display/intel_fb.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index f42a693f96c1..20d58a021a42 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -303,7 +303,14 @@ lookup_format_info(const struct drm_format_info formats[], unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier) { - u8 tiling_caps = lookup_modifier(fb_modifier)->plane_caps & + const struct intel_modifier_desc *md; + u8 tiling_caps; + + md = lookup_modifier_or_null(fb_modifier); + if (!md) + return I915_TILING_NONE; + + tiling_caps = lookup_modifier_or_null(fb_modifier)->plane_caps & INTEL_PLANE_CAP_TILING_MASK; switch (tiling_caps) { -- 2.34.1