aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 08:03:01 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/edid: use struct drm_edid for override/firmware EDID

Browse Source 
There's a lot going on here, but the main thing is switching the
firmware EDID loader to use struct drm_edid. Unfortunately, it's
difficult to reasonably split to smaller pieces.

Convert the EDID loader to struct drm_edid. There's a functional change
in validation; it no longer tries to fix errors or filter invalid
blocks. It's stricter in this sense. Hopefully this will not be an
issue.

As a by-product, this change also allows HF-EEODB extended EDIDs to be
passed via override/firmware EDID.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e64267c28eca483e83c802bc06ddd149bdcdfc66.1666614699.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula
2022-10-24 15:33:40 +03:00
parent a05992d5ea
commit 794aca0ec2
3 changed files with 37 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/drm_edid.c
View File

@@ -2202,25 +2202,20 @@ static void connector_bad_edid(struct drm_connector *connector,
}
/* Get override or firmware EDID */
static struct edid *drm_get_override_edid(struct drm_connector *connector,
size_t *alloc_size)
static const struct drm_edid *drm_edid_override_get(struct drm_connector *connector)
{
struct edid *override = NULL;
const struct drm_edid *override = NULL;
mutex_lock(&connector->edid_override_mutex);
if (connector->edid_override)
override = drm_edid_duplicate(connector->edid_override->edid);
override = drm_edid_dup(connector->edid_override);
mutex_unlock(&connector->edid_override_mutex);
if (!override)
override = drm_edid_load_firmware(connector);
/* FIXME: Get alloc size from deeper down the stack */
if (!IS_ERR_OR_NULL(override) && alloc_size)
*alloc_size = edid_size(override);
return IS_ERR(override) ? NULL : override;
}
@@ -2296,14 +2291,14 @@ int drm_edid_override_reset(struct drm_connector *connector)
*/
int drm_edid_override_connector_update(struct drm_connector *connector)
{
struct edid *override;
const struct drm_edid *override;
int num_modes = 0;
override = drm_get_override_edid(connector, NULL);
override = drm_edid_override_get(connector);
if (override) {
drm_connector_update_edid_property(connector, override);
num_modes = drm_add_edid_modes(connector, override);
kfree(override);
num_modes = drm_edid_connector_update(connector, override);
drm_edid_free(override);
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] adding %d modes via fallback override/firmware EDID\n",
connector->base.id, connector->name, num_modes);
@@ -2354,12 +2349,19 @@ static struct edid *_drm_do_get_edid(struct drm_connector *connector,
{
enum edid_block_status status;
int i, num_blocks, invalid_blocks = 0;
const struct drm_edid *override;
struct edid *edid, *new;
size_t alloc_size = EDID_LENGTH;
edid = drm_get_override_edid(connector, &alloc_size);
if (edid)
override = drm_edid_override_get(connector);
if (override) {
alloc_size = override->size;
edid = kmemdup(override->edid, alloc_size, GFP_KERNEL);
drm_edid_free(override);
if (!edid)
return NULL;
goto ok;
}
edid = kmalloc(alloc_size, GFP_KERNEL);
if (!edid)