From patchwork Tue Nov 28 15:39:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hogander, Jouni" X-Patchwork-Id: 13471375 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 641FBC07E97 for ; Tue, 28 Nov 2023 15:39:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8E48810E571; Tue, 28 Nov 2023 15:39:54 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3E38E10E570 for ; Tue, 28 Nov 2023 15:39:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701185992; x=1732721992; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=SRSfmBtE2tHkd5/fPSctAFgITeMovtOJ108tMJORJ7c=; b=iU1O22fVq+2hx/VhNDxiomtrCA+HerNvgF/nAr9qJgqWUsANMSCSXz+h koQ0EjteUYVUic8CTnG7O29230aNDbGwaRfL4ao5P/l2IBQPpYDW2Qsk7 pyngQjdYLVNHCmpy/2owkn0wpWIlNnjrNe+y+xL9WGIPpcn+jGbrgZizJ mNiQI6EkFllSXKhxrdj3iqZKX6rzEbQSNbCCJpGo35rSkppOCRLrwfjZK sK57UIRRfuMn65d6ezcOiQzjx0rWOSYpCfCUIqZfxkhy8+cERjnJ/uAVq mhgoQkgatXfOMkTC2fcanZHXSHbRm7kiyeRJQ3w23NuSSVTPUbNrOHvbS Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10908"; a="457273222" X-IronPort-AV: E=Sophos;i="6.04,234,1695711600"; d="scan'208";a="457273222" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2023 07:39:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10908"; a="744945703" X-IronPort-AV: E=Sophos;i="6.04,234,1695711600"; d="scan'208";a="744945703" Received: from aspinu-mobl.ger.corp.intel.com (HELO jhogande-mobl1.intel.com) ([10.252.59.67]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Nov 2023 07:39:50 -0800 From: =?utf-8?q?Jouni_H=C3=B6gander?= To: intel-gfx@lists.freedesktop.org Date: Tue, 28 Nov 2023 17:39:19 +0200 Message-Id: <20231128153920.1553148-4-jouni.hogander@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231128153920.1553148-1-jouni.hogander@intel.com> References: <20231128153920.1553148-1-jouni.hogander@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v7 3/4] drm/i915/display: Handle invalid fb_modifier in intel_fb_modifier_to_tiling X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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ä --- 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 6c89cb2f2002..868e39291e9f 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) {