Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: Ville Syrjala <ville.syrjala@linux.intel.com>,
	intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH v3 08/22] drm/i915/bios: Generate LFP data table pointers if the VBT lacks them
Date: Thu, 07 Apr 2022 21:18:10 +0300	[thread overview]
Message-ID: <87o81c3ggt.fsf@intel.com> (raw)
In-Reply-To: <87o81c4yyu.fsf@intel.com>

On Thu, 07 Apr 2022, Jani Nikula <jani.nikula@linux.intel.com> wrote:
> On Wed, 06 Apr 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
>> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>>
>> Modern VBTs no longer contain the LFP data table pointers
>> block (41). We are expecting to have one in order to be able
>> to parse the LFP data block (42), so let's make one up.
>>
>> Since the fp_timing table has variable size we must somehow
>> determine its size. Rather than just hardcode it we look for
>> the terminator bytes (0xffff) to figure out where each table
>> entry starts. dvo_timing, panel_pnp_id, and panel_name are
>> expected to have fixed size.
>>
>> This has been observed on various machines, eg. TGL with BDB
>> version 240, CML with BDB version 231, etc. The most recent
>> VBT I've observed that still had block 41 had BDB version
>> 228. So presumably the cutoff (if an exact cutoff even exists)
>> is somewhere around BDB version 229-231.
>>
>> v2: kfree the thing we allocated, not the thing+3 bytes
>> v3: Do the debugprint only if we found the LFP data block
>>
>> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_bios.c | 136 +++++++++++++++++++++-
>>  1 file changed, 135 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
>> index 8b118c54314d..d32091dad1b0 100644
>> --- a/drivers/gpu/drm/i915/display/intel_bios.c
>> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
>> @@ -310,16 +310,146 @@ static bool fixup_lfp_data_ptrs(const void *bdb, void *ptrs_block)
>>  	return validate_lfp_data_ptrs(bdb, ptrs);
>>  }
>>  
>> +static const void *find_fp_timing_terminator(const u8 *data, int size)
>> +{
>> +	int i;
>> +
>> +	if (!data)
>> +		return NULL;
>> +
>> +	for (i = 0; i < size - 1; i++) {
>> +		if (data[i] == 0xff && data[i+1] == 0xff)
>> +			return &data[i];
>> +	}
>> +
>> +	return NULL;
>> +}
>> +
>> +static int make_lfp_data_ptr(struct lvds_lfp_data_ptr_table *table,
>> +			     int table_size, int total_size)
>> +{
>> +	if (total_size < table_size)
>> +		return total_size;
>> +
>> +	table->table_size = table_size;
>> +	table->offset = total_size - table_size;
>> +
>> +	return total_size - table_size;
>> +}
>> +
>> +static void next_lfp_data_ptr(struct lvds_lfp_data_ptr_table *next,
>> +			      const struct lvds_lfp_data_ptr_table *prev,
>> +			      int size)
>> +{
>> +	next->table_size = prev->table_size;
>> +	next->offset = prev->offset + size;
>> +}
>> +
>> +static void *generate_lfp_data_ptrs(struct drm_i915_private *i915,
>> +				    const void *bdb)
>> +{
>> +	int i, size, table_size, block_size, offset;
>> +	const void *t0, *t1, *block;
>> +	struct bdb_lvds_lfp_data_ptrs *ptrs;
>> +	void *ptrs_block;
>> +
>> +	block = find_raw_section(bdb, BDB_LVDS_LFP_DATA);
>> +	if (!block)
>> +		return NULL;
>> +
>> +	drm_dbg_kms(&i915->drm, "Generating LFP data table pointers\n");
>> +
>> +	block_size = get_blocksize(block);
>> +
>> +	size = block_size;
>> +	t0 = find_fp_timing_terminator(block, size);
>> +
>> +	size -= t0 - block - 2;
>> +	t1 = find_fp_timing_terminator(t0 + 2, size);
>
> Need to NULL check t0 before using it.
>
> I'll still keep trying to wrap my head around the below stuff.

I guess I'll try again tomorrow with fresh eyes, but I have a hard time
following what's going on here. x_X

BR,
Jani.

>
>> +
>> +	if (!t0 || !t1)
>> +		return NULL;
>> +
>> +	size = t1 - t0;
>> +	if (size * 16 > block_size)
>> +		return NULL;
>> +
>> +	ptrs_block = kzalloc(sizeof(*ptrs) + 3, GFP_KERNEL);
>> +	if (!ptrs_block)
>> +		return NULL;
>> +
>> +	*(u8 *)(ptrs_block + 0) = BDB_LVDS_LFP_DATA_PTRS;
>> +	*(u16 *)(ptrs_block + 1) = sizeof(*ptrs);
>> +	ptrs = ptrs_block + 3;
>> +
>> +	table_size = sizeof(struct lvds_pnp_id);
>> +	size = make_lfp_data_ptr(&ptrs->ptr[0].panel_pnp_id, table_size, size);
>> +
>> +	table_size = sizeof(struct lvds_dvo_timing);
>> +	size = make_lfp_data_ptr(&ptrs->ptr[0].dvo_timing, table_size, size);
>> +
>> +	table_size = t0 - block + 2;
>> +	size = make_lfp_data_ptr(&ptrs->ptr[0].fp_timing, table_size, size);
>> +
>> +	if (ptrs->ptr[0].fp_timing.table_size)
>> +		ptrs->lvds_entries++;
>> +	if (ptrs->ptr[0].dvo_timing.table_size)
>> +		ptrs->lvds_entries++;
>> +	if (ptrs->ptr[0].panel_pnp_id.table_size)
>> +		ptrs->lvds_entries++;
>> +
>> +	if (size != 0 || ptrs->lvds_entries != 3) {
>> +		kfree(ptrs);
>> +		return NULL;
>> +	}
>> +
>> +	size = t1 - t0;
>> +	for (i = 1; i < 16; i++) {
>> +		next_lfp_data_ptr(&ptrs->ptr[i].fp_timing, &ptrs->ptr[i-1].fp_timing, size);
>> +		next_lfp_data_ptr(&ptrs->ptr[i].dvo_timing, &ptrs->ptr[i-1].dvo_timing, size);
>> +		next_lfp_data_ptr(&ptrs->ptr[i].panel_pnp_id, &ptrs->ptr[i-1].panel_pnp_id, size);
>> +	}
>> +
>> +	size = t1 - t0;
>> +	table_size = sizeof(struct lvds_lfp_panel_name);
>> +
>> +	if (16 * (size + table_size) <= block_size) {
>> +		ptrs->panel_name.table_size = table_size;
>> +		ptrs->panel_name.offset = size * 16;
>> +	}
>> +
>> +	offset = block - bdb;
>> +
>> +	for (i = 0; i < 16; i++) {
>> +		ptrs->ptr[i].fp_timing.offset += offset;
>> +		ptrs->ptr[i].dvo_timing.offset += offset;
>> +		ptrs->ptr[i].panel_pnp_id.offset += offset;
>> +	}
>> +
>> +	if (ptrs->panel_name.table_size)
>> +		ptrs->panel_name.offset += offset;
>> +
>> +	return ptrs_block;
>> +}
>> +
>>  static void
>>  init_bdb_block(struct drm_i915_private *i915,
>>  	       const void *bdb, enum bdb_block_id section_id,
>>  	       size_t min_size)
>>  {
>>  	struct bdb_block_entry *entry;
>> +	void *temp_block = NULL;
>>  	const void *block;
>>  	size_t block_size;
>>  
>>  	block = find_raw_section(bdb, section_id);
>> +
>> +	/* Modern VBTs lack the LFP data table pointers block, make one up */
>> +	if (!block && section_id == BDB_LVDS_LFP_DATA_PTRS) {
>> +		temp_block = generate_lfp_data_ptrs(i915, bdb);
>> +		if (temp_block)
>> +			block = temp_block + 3;
>> +	}
>>  	if (!block)
>>  		return;
>>  
>> @@ -330,12 +460,16 @@ init_bdb_block(struct drm_i915_private *i915,
>>  
>>  	entry = kzalloc(struct_size(entry, data, max(min_size, block_size) + 3),
>>  			GFP_KERNEL);
>> -	if (!entry)
>> +	if (!entry) {
>> +		kfree(temp_block);
>>  		return;
>> +	}
>>  
>>  	entry->section_id = section_id;
>>  	memcpy(entry->data, block - 3, block_size + 3);
>>  
>> +	kfree(temp_block);
>> +
>>  	drm_dbg_kms(&i915->drm, "Found BDB block %d (size %zu, min size %zu)\n",
>>  		    section_id, block_size, min_size);

-- 
Jani Nikula, Intel Open Source Graphics Center

  reply	other threads:[~2022-04-07 18:23 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-05 17:33 [Intel-gfx] [PATCH v2 00/22] drm/i915/bios: Rework BDB block handling and PNPID->panel_type matching Ville Syrjala
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 01/22] drm/i915/bios: Use the cached BDB version Ville Syrjala
2022-04-07 10:10   ` Jani Nikula
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 02/22] drm/i915/bios: Make copies of VBT data blocks Ville Syrjala
2022-04-06 13:38   ` [Intel-gfx] [PATCH v3 " Ville Syrjala
2022-04-07 10:23     ` Jani Nikula
2022-04-07 11:18       ` Ville Syrjälä
2022-04-07 12:06         ` Jani Nikula
2022-04-07 12:23           ` Ville Syrjälä
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 03/22] drm/i915/bios: Use the copy of the LFP data table always Ville Syrjala
2022-04-07 10:36   ` Jani Nikula
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 04/22] drm/i915/bios: Validate LFP data table pointers Ville Syrjala
2022-04-07 16:07   ` Jani Nikula
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 05/22] drm/i915/bios: Trust the LFP data pointers Ville Syrjala
2022-04-07 16:12   ` Jani Nikula
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 06/22] drm/i915/bios: Validate the panel_name table Ville Syrjala
2022-04-07 16:14   ` Jani Nikula
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 07/22] drm/i915/bios: Reorder panel DTD parsing Ville Syrjala
2022-04-07 16:21   ` Jani Nikula
2022-04-08 13:59     ` Ville Syrjälä
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 08/22] drm/i915/bios: Generate LFP data table pointers if the VBT lacks them Ville Syrjala
2022-04-06 13:39   ` [Intel-gfx] [PATCH v3 " Ville Syrjala
2022-04-07 12:24     ` Jani Nikula
2022-04-07 12:29       ` Ville Syrjälä
2022-04-07 16:53     ` Jani Nikula
2022-04-07 18:18       ` Jani Nikula [this message]
2022-04-12  8:19       ` Ville Syrjälä
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 09/22] drm/i915/bios: Get access to the tail end of the LFP data block Ville Syrjala
2022-04-06 13:40   ` [Intel-gfx] [PATCH v3 " Ville Syrjala
2022-04-07 17:07     ` Jani Nikula
2022-04-08 14:04       ` Ville Syrjälä
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 10/22] drm/i915/bios: Assume panel_type==0 if the VBT has bogus data Ville Syrjala
2022-04-07 17:11   ` Jani Nikula
2022-04-05 17:33 ` [Intel-gfx] [PATCH v2 11/22] drm/i915/bios: Split parse_driver_features() into two parts Ville Syrjala
2022-04-07 17:13   ` Jani Nikula
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 12/22] drm/i915/bios: Split VBT parsing to global vs. panel specific parts Ville Syrjala
2022-04-07 17:23   ` Jani Nikula
2022-04-08 14:09     ` Ville Syrjälä
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 13/22] drm/i915/pps: Split PPS init+sanitize in two Ville Syrjala
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 14/22] drm/i915/pps: Reinit PPS delays after VBT has been fully parsed Ville Syrjala
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 15/22] drm/i915/bios: Do panel specific VBT parsing later Ville Syrjala
2022-04-06 19:05   ` [Intel-gfx] [PATCH v4 " Ville Syrjala
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 16/22] drm/i915/bios: Extract get_panel_type() Ville Syrjala
2022-04-07 17:26   ` Jani Nikula
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 17/22] drm/i915/bios: Refactor panel_type code Ville Syrjala
2022-04-07 17:49   ` Jani Nikula
2022-04-08 14:13     ` Ville Syrjälä
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 18/22] drm/i915/bios: Determine panel type via PNPID match Ville Syrjala
2022-04-06 19:09   ` [Intel-gfx] [PATCH v4 " Ville Syrjala
2022-04-07 17:55     ` Jani Nikula
2022-04-08 14:51       ` Ville Syrjälä
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 19/22] drm/i915/bios: Parse the seamless DRRS min refresh rate Ville Syrjala
2022-04-07 17:56   ` Jani Nikula
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 20/22] drm/i915: Respect VBT " Ville Syrjala
2022-04-07 18:01   ` Jani Nikula
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 21/22] drm/edid: Extract drm_edid_decode_mfg_id() Ville Syrjala
2022-04-07 18:02   ` Jani Nikula
2022-04-05 17:34 ` [Intel-gfx] [PATCH v2 22/22] drm/i915/bios: Dump PNPID and panel name Ville Syrjala
2022-04-07 18:07   ` Jani Nikula
2022-04-08 14:52     ` Ville Syrjälä
2022-04-05 22:55 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/bios: Rework BDB block handling and PNPID->panel_type matching Patchwork
2022-04-05 22:57 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-04-05 23:02 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2022-04-05 23:27 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2022-04-06 18:17 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/bios: Rework BDB block handling and PNPID->panel_type matching (rev4) Patchwork
2022-04-06 18:19 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-04-06 18:50 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-04-07  0:11 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/bios: Rework BDB block handling and PNPID->panel_type matching (rev6) Patchwork
2022-04-07  0:14 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2022-04-07  0:44 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-04-07  8:37 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87o81c3ggt.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=ville.syrjala@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox