From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BD602DC788 for ; Wed, 26 Nov 2025 14:08:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764166111; cv=none; b=mMmaCRQrpSawauYBsGQGihQq+GSQyDsfWvEgcbIjpH3Ss7N9ckkMF9ow++s4ylnuCsp6Oyqe9PRkSjEjc8m94SeoXTT9PTlTUQN5sU+thDSSAG2FJBSuBTB10Qcz1vOeiI8eZQgRfnPyExCOILVcep5USBhGcKBV1sJ6N8x1sgI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764166111; c=relaxed/simple; bh=AmaT3Gb9NOlj1cOluwUUUjqyOU1ZdDgY/WGIcTaKdAQ=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=tK+JqRNdc2/+dY55Psx3UfoihjLH3TtMz2fmKBV9FF+H9A3oEXyKPd7JlJovy4gKpTd6uEpQQqSIdgKThBD5k6aAe3KnWDy+Wnd1dceGGYq0jie+TisgApf9spgGjRjwy5Uuy4mkuLFcYq3bZHnItI0L8Yr9OgaoDAj4McVtZcw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=HF4kTSjG; arc=none smtp.client-ip=198.175.65.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HF4kTSjG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764166110; x=1795702110; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=AmaT3Gb9NOlj1cOluwUUUjqyOU1ZdDgY/WGIcTaKdAQ=; b=HF4kTSjGCaDiaCQmUiAlb4Z/szon4D7ImXm/tFJC2KMMkO7CWV7uIj0o MwUwTcviTAc+kTfBrxUk1F0GCq9p1CuG5MWjaLsfcVWelSA3vHPht6qqj 4qZjBeuNoicfZ0T0mf98oVDwUD9ucLbLo5VIoRBV1FZssjG3pPwSap2xS 6r6SJFc+hYrYBr4sy/SX2BD7goVNJvEf6hfMgz0+Vkg6DSr/njqtyNjK3 UcRNvnHr+OPqYNGLudXDk58581KH5zOq7yNFUktqW++e65gpwNLLbbyeu DpI/Q6//sN8FTmkwD0E+9tD47bLLOCbaj/nd1l/TJwmAO7S2ceuaapEyp Q==; X-CSE-ConnectionGUID: uWd0ziqoSfS4imXrMcVxgQ== X-CSE-MsgGUID: uRVaS1a0S569cPsFWn/jgQ== X-IronPort-AV: E=McAfee;i="6800,10657,11624"; a="88850602" X-IronPort-AV: E=Sophos;i="6.20,228,1758610800"; d="scan'208";a="88850602" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2025 06:08:29 -0800 X-CSE-ConnectionGUID: mpe+xcdkTSaPTfAYWHmupg== X-CSE-MsgGUID: irjUSLqXTRqR24NpdsZHuA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,228,1758610800"; d="scan'208";a="192967334" Received: from lfiedoro-mobl.ger.corp.intel.com (HELO localhost) ([10.245.246.1]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2025 06:08:24 -0800 From: Jani Nikula To: Yaroslav Bolyukin , Ville =?utf-8?B?U3lyasOkbMOk?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , Christian =?utf-8?Q?K=C3=B6nig?= , Wayne Lin , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Yaroslav Bolyukin Subject: Re: [PATCH v6 2/7] drm/edid: prepare for VESA vendor-specific data block extension In-Reply-To: <68c55e772424f8e001898cdd1edcf4856820461e@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20251126065126.54016-1-iam@lach.pw> <20251126065126.54016-3-iam@lach.pw> <68c55e772424f8e001898cdd1edcf4856820461e@intel.com> Date: Wed, 26 Nov 2025 16:08:20 +0200 Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain On Wed, 26 Nov 2025, Jani Nikula wrote: > On Wed, 26 Nov 2025, Yaroslav Bolyukin wrote: >> Current VESA vendor-specific block parsing expects real block size to be >> the same as the defined struct size, use real offsets in conditionals >> instead to add struct fields in future commits. >> >> Signed-off-by: Yaroslav Bolyukin > > I think this is something we want to backport, since MSO would break > with bigger vendor-specific blocks, and that leads to black screens on > MSO displays. > > Cc: stable@vger.kernel.org > Reviewed-by: Jani Nikula Oops, I'll take that back. > >> --- >> drivers/gpu/drm/drm_edid.c | 28 ++++++++++++---------------- >> 1 file changed, 12 insertions(+), 16 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c >> index 64f7a94dd9e4..a52fd6de9327 100644 >> --- a/drivers/gpu/drm/drm_edid.c >> +++ b/drivers/gpu/drm/drm_edid.c >> @@ -6544,7 +6544,7 @@ static void drm_parse_vesa_specific_block(struct drm_connector *connector, >> if (oui(vesa->oui[0], vesa->oui[1], vesa->oui[2]) != VESA_IEEE_OUI) >> return; >> >> - if (sizeof(*vesa) != sizeof(*block) + block->num_bytes) { >> + if (block->num_bytes < 5) { >> drm_dbg_kms(connector->dev, >> "[CONNECTOR:%d:%s] Unexpected VESA vendor block size\n", >> connector->base.id, connector->name); >> @@ -6567,24 +6567,20 @@ static void drm_parse_vesa_specific_block(struct drm_connector *connector, >> break; >> } >> >> - if (!info->mso_stream_count) { >> - info->mso_pixel_overlap = 0; This is no longer cleared for !info->mso_stream_count. Perhaps the code could be reorganized to handle it better. >> - return; >> - } >> - >> - info->mso_pixel_overlap = FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->mso); >> - if (info->mso_pixel_overlap > 8) { >> + if (info->mso_stream_count) { >> + info->mso_pixel_overlap = FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->mso); >> + if (info->mso_pixel_overlap > 8) { >> + drm_dbg_kms(connector->dev, >> + "[CONNECTOR:%d:%s] Reserved MSO pixel overlap value %u\n", >> + connector->base.id, connector->name, >> + info->mso_pixel_overlap); >> + info->mso_pixel_overlap = 8; >> + } >> drm_dbg_kms(connector->dev, >> - "[CONNECTOR:%d:%s] Reserved MSO pixel overlap value %u\n", >> + "[CONNECTOR:%d:%s] MSO stream count %u, pixel overlap %u\n", >> connector->base.id, connector->name, >> - info->mso_pixel_overlap); >> - info->mso_pixel_overlap = 8; >> + info->mso_stream_count, info->mso_pixel_overlap); >> } >> - >> - drm_dbg_kms(connector->dev, >> - "[CONNECTOR:%d:%s] MSO stream count %u, pixel overlap %u\n", >> - connector->base.id, connector->name, >> - info->mso_stream_count, info->mso_pixel_overlap); >> } >> >> static void drm_update_vesa_specific_block(struct drm_connector *connector, -- Jani Nikula, Intel