From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 15B5C205AB8 for ; Fri, 14 Feb 2025 08:28:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739521714; cv=none; b=S00lQEzIoOTN3/N/gxjovan09U+0qMffYTSHVrar0aHxcuMwcK0yfmEJY70hMdAtDHpdR2P1UBxwPT3iOeJ3yMq7rpAQpSuRxSYjfWz7lozVPpyAyYVLQdB4mr9uMB8+gaoGM6IaP/eLesTccfD2hZlLIpPNP4EVUq1JI65Tjps= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739521714; c=relaxed/simple; bh=V3Xr3QiP78maYmiAK6Evzqh5bcv1fR5OMCHsNSxXByg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=P+pHHE+77rAQ1yASgekYX9Of3hXc4zToLzGvjQn1PzJzCl6b0Iv2MyS+Z9iEPQI8gJnqiieVG7bP8UFs/oLtbx7DuKy5pymY7uNDsfMFUlsDalyocDmRrng7VKmnTaoJ7aKuFfNj8LBsTUpBPQdfJdqRft82iqXo6Z8VJHmlnF4= 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=FZxeHA0P; arc=none smtp.client-ip=192.198.163.14 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="FZxeHA0P" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739521712; x=1771057712; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=V3Xr3QiP78maYmiAK6Evzqh5bcv1fR5OMCHsNSxXByg=; b=FZxeHA0PjCEspFRAL0t89RxM7LQVAU2wG8CpuI4c+NsJn+0LbAQ0Thjo LxGrjPEkqNCBHr1ubmX5ZKlAwZAWmfDrGR9h0fDVV6yWXIKCTrPbaTqoD C82ptRUNHhmDIUcUFKpm81bm4QGzVL4Dr9B1eLfXcVWgHjB9tRvUyUD3J AXvtHVli2jd8FmpN104osfhluRYmFBAEUXjzeoan38DtVpHAVYCj5Q18i NI8HwZpvL2xBZm1izEWW8NxTue0Ugpsi1YCSAAeAByjGi0/MnLGhl53GF I6e6EMbxC3wwLezvzWHbtEwLLhvC4KxZa7A6oQfqwwUq/nbnGvfs1orB2 g==; X-CSE-ConnectionGUID: xxd/qLSpRxuoxESwG8F24Q== X-CSE-MsgGUID: E5AQgJmlQ2u16Yp4aZfvTA== X-IronPort-AV: E=McAfee;i="6700,10204,11344"; a="40523268" X-IronPort-AV: E=Sophos;i="6.13,285,1732608000"; d="scan'208";a="40523268" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2025 00:28:31 -0800 X-CSE-ConnectionGUID: 2eSPc9qgRiunPeq3Kavqag== X-CSE-MsgGUID: 1K1D7/qdRC+1zJoYwzd0UQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="114294467" Received: from slindbla-desk.ger.corp.intel.com (HELO localhost) ([10.245.246.30]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2025 00:28:29 -0800 From: Jani Nikula To: Egor Vorontsov , linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Egor Vorontsov Subject: Re: [PATCH v2 2/2] drm/edid: Refactor DisplayID timing block structs In-Reply-To: <20250214010545.3793736-1-sdoregor@sdore.me> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <7cab8349bc8bb6fa08d2a7127a724efea155f154.camel@sdore.me> <20250214010545.3793736-1-sdoregor@sdore.me> Date: Fri, 14 Feb 2025 10:28:24 +0200 Message-ID: <87cyflvsk7.fsf@intel.com> 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 Fri, 14 Feb 2025, Egor Vorontsov wrote: > Using le16 instead of u8[2]. > Replaced an error with a printed warning as well. > > Suggested-by: Jani Nikula > Signed-off-by: Egor Vorontsov So the two patches should each stand on their own, instead of this one fixing the issues in the first. BR, Jani. > --- > drivers/gpu/drm/drm_displayid_internal.h | 22 ++++++++-------- > drivers/gpu/drm/drm_edid.c | 32 ++++++++++++------------ > 2 files changed, 27 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/drm_displayid_internal.h b/drivers/gpu/drm/drm_displayid_internal.h > index 88220c107822..957dd0619f5c 100644 > --- a/drivers/gpu/drm/drm_displayid_internal.h > +++ b/drivers/gpu/drm/drm_displayid_internal.h > @@ -115,25 +115,25 @@ struct displayid_tiled_block { > struct displayid_detailed_timings_1 { > u8 pixel_clock[3]; > u8 flags; > - u8 hactive[2]; > - u8 hblank[2]; > - u8 hsync[2]; > - u8 hsw[2]; > - u8 vactive[2]; > - u8 vblank[2]; > - u8 vsync[2]; > - u8 vsw[2]; > + __le16 hactive; > + __le16 hblank; > + __le16 hsync; > + __le16 hsw; > + __le16 vactive; > + __le16 vblank; > + __le16 vsync; > + __le16 vsw; > } __packed; > > struct displayid_detailed_timing_block { > struct displayid_block base; > struct displayid_detailed_timings_1 timings[]; > -}; > +} __packed; The above belong in patch 2. > > struct displayid_formula_timings_9 { > u8 flags; > - __be16 hactive; > - __be16 vactive; > + __le16 hactive; > + __le16 vactive; The above belong in patch 1. > u8 vrefresh; > } __packed; > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index 9c363df5af9a..54122a12a24f 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -6764,19 +6764,19 @@ static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_device *d > bool type_7) > { > struct drm_display_mode *mode; > - unsigned pixel_clock = (timings->pixel_clock[0] | > - (timings->pixel_clock[1] << 8) | > - (timings->pixel_clock[2] << 16)) + 1; > - unsigned hactive = (timings->hactive[0] | timings->hactive[1] << 8) + 1; > - unsigned hblank = (timings->hblank[0] | timings->hblank[1] << 8) + 1; > - unsigned hsync = (timings->hsync[0] | (timings->hsync[1] & 0x7f) << 8) + 1; > - unsigned hsync_width = (timings->hsw[0] | timings->hsw[1] << 8) + 1; > - unsigned vactive = (timings->vactive[0] | timings->vactive[1] << 8) + 1; > - unsigned vblank = (timings->vblank[0] | timings->vblank[1] << 8) + 1; > - unsigned vsync = (timings->vsync[0] | (timings->vsync[1] & 0x7f) << 8) + 1; > - unsigned vsync_width = (timings->vsw[0] | timings->vsw[1] << 8) + 1; > - bool hsync_positive = (timings->hsync[1] >> 7) & 0x1; > - bool vsync_positive = (timings->vsync[1] >> 7) & 0x1; > + unsigned int pixel_clock = (timings->pixel_clock[0] | > + (timings->pixel_clock[1] << 8) | > + (timings->pixel_clock[2] << 16)) + 1; > + unsigned int hactive = le16_to_cpu(timings->hactive) + 1; > + unsigned int hblank = le16_to_cpu(timings->hblank) + 1; > + unsigned int hsync = (le16_to_cpu(timings->hsync) & 0x7fff) + 1; > + unsigned int hsync_width = le16_to_cpu(timings->hsw) + 1; > + unsigned int vactive = le16_to_cpu(timings->vactive) + 1; > + unsigned int vblank = le16_to_cpu(timings->vblank) + 1; > + unsigned int vsync = (le16_to_cpu(timings->vsync) & 0x7fff) + 1; > + unsigned int vsync_width = le16_to_cpu(timings->vsw) + 1; > + bool hsync_positive = le16_to_cpu(timings->hsync) & (1 << 15); > + bool vsync_positive = le16_to_cpu(timings->vsync) & (1 << 15); The above belong in patch 2. > > mode = drm_mode_create(dev); > if (!mode) > @@ -6838,8 +6838,8 @@ static struct drm_display_mode *drm_mode_displayid_formula(struct drm_device *de > bool type_10) > { > struct drm_display_mode *mode; > - u16 hactive = be16_to_cpu(timings->hactive) + 1; > - u16 vactive = be16_to_cpu(timings->vactive) + 1; > + u16 hactive = le16_to_cpu(timings->hactive) + 1; > + u16 vactive = le16_to_cpu(timings->vactive) + 1; > u8 timing_formula = timings->flags & 0x7; > > /* TODO: support RB-v2 & RB-v3 */ > @@ -6848,7 +6848,7 @@ static struct drm_display_mode *drm_mode_displayid_formula(struct drm_device *de > > /* TODO: support video-optimized refresh rate */ > if (timings->flags & (1 << 4)) > - return NULL; > + drm_dbg_kms(dev, "Fractional vrefresh is not implemented, proceeding with non-video-optimized refresh rate"); The above belong in patch 1. > > mode = drm_cvt_mode(dev, hactive, vactive, timings->vrefresh + 1, timing_formula == 1, false, false); > if (!mode) -- Jani Nikula, Intel