Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/gud: switch to struct drm_edid

Prefer struct drm_edid based functions over struct edid.

Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Link: https://patchwork.freedesktop.org/patch/msgid/c519a9b9d3c3c9a413de33b99b97a1120f774f2d.1713273659.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

+6 -6
+6 -6
drivers/gpu/drm/gud/gud_connector.c
··· 221 221 struct gud_display_mode_req *reqmodes = NULL; 222 222 struct gud_connector_get_edid_ctx edid_ctx; 223 223 unsigned int i, num_modes = 0; 224 - struct edid *edid = NULL; 224 + const struct drm_edid *drm_edid = NULL; 225 225 int idx, ret; 226 226 227 227 if (!drm_dev_enter(connector->dev, &idx)) ··· 238 238 gud_conn_err(connector, "Invalid EDID size", ret); 239 239 } else if (ret > 0) { 240 240 edid_ctx.len = ret; 241 - edid = drm_do_get_edid(connector, gud_connector_get_edid_block, &edid_ctx); 241 + drm_edid = drm_edid_read_custom(connector, gud_connector_get_edid_block, &edid_ctx); 242 242 } 243 243 244 244 kfree(edid_ctx.buf); 245 - drm_connector_update_edid_property(connector, edid); 245 + drm_edid_connector_update(connector, drm_edid); 246 246 247 - if (edid && edid_ctx.edid_override) 247 + if (drm_edid && edid_ctx.edid_override) 248 248 goto out; 249 249 250 250 reqmodes = kmalloc_array(GUD_CONNECTOR_MAX_NUM_MODES, sizeof(*reqmodes), GFP_KERNEL); ··· 276 276 } 277 277 out: 278 278 if (!num_modes) 279 - num_modes = drm_add_edid_modes(connector, edid); 279 + num_modes = drm_edid_connector_add_modes(connector); 280 280 281 281 kfree(reqmodes); 282 - kfree(edid); 282 + drm_edid_free(drm_edid); 283 283 drm_dev_exit(idx); 284 284 285 285 return num_modes;