drm: drop _mode_ from update_edit_property()

tjh.dev / kernel

fork atom

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

kernel os linux

fork atom

drm: drop _mode_ from update_edit_property()

Just makes it longer, and for most things in drm_connector.[hc] we
just use the drm_connector_ prefix. Done with sed + a bit of manual
fixup for the indenting.

Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180709084016.23750-6-daniel.vetter@ffwll.ch

Daniel Vetter 7 years ago c555f023 92e1d263

+74 -74

56 changed files

expand all collapse all

drivers

gpu

drm

amd

amdgpu

amdgpu_connectors.c

display

amdgpu_dm

amdgpu_dm.c

amdgpu_dm_mst_types.c

ast

ast_mode.c

bridge

adv7511

adv7511_drv.c

analogix

analogix_dp_core.c

analogix-anx78xx.c

dumb-vga-dac.c

megachips-stdpxxxx-ge-b850v3-fw.c

nxp-ptn3460.c

sii902x.c

synopsys

dw-hdmi.c

tc358767.c

ti-tfp410.c

drm_connector.c

drm_debugfs.c

drm_probe_helper.c

exynos

exynos_drm_vidi.c

exynos_hdmi.c

gma500

cdv_intel_dp.c

cdv_intel_hdmi.c

oaktrail_hdmi.c

oaktrail_lvds.c

psb_intel_modes.c

psb_intel_sdvo.c

i2c

tda998x_drv.c

i915

intel_dp.c

intel_lvds.c

intel_modes.c

intel_sdvo.c

imx

imx-ldb.c

imx-tve.c

parallel-display.c

mediatek

mtk_hdmi.c

mgag200

mgag200_mode.c

msm

edp

edp_connector.c

hdmi

hdmi_connector.c

nouveau

dispnv50

disp.c

nouveau_connector.c

omapdrm

omap_connector.c

panel

panel-simple.c

radeon

radeon_connectors.c

radeon_dp_mst.c

rockchip

cdn-dp-core.c

inno_hdmi.c

sti

sti_hdmi.c

sun4i

sun4i_hdmi_enc.c

tegra

output.c

tilcdc

tilcdc_tfp410.c

udl

udl_connector.c

vc4

vc4_hdmi.c

zte

zx_hdmi.c

zx_vga.c

staging

vboxvideo

vbox_mode.c

include

drm

drm_connector.h

drm_modeset_helper_vtables.h

+2 -2

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

reviewed

··· 334 334 int ret; 335 335 336 336 if (amdgpu_connector->edid) { 337 337 - drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid); 337 337 + drm_connector_update_edid_property(connector, amdgpu_connector->edid); 338 338 ret = drm_add_edid_modes(connector, amdgpu_connector->edid); 339 339 return ret; 340 340 } 341 341 - drm_mode_connector_update_edid_property(connector, NULL); 341 341 + drm_connector_update_edid_property(connector, NULL); 342 342 return 0; 343 343 } 344 344

+2 -2

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

reviewed

··· 900 900 (struct edid *) sink->dc_edid.raw_edid; 901 901 902 902 903 903 - drm_mode_connector_update_edid_property(connector, 903 903 + drm_connector_update_edid_property(connector, 904 904 aconnector->edid); 905 905 } 906 906 amdgpu_dm_add_sink_to_freesync_module(connector, aconnector->edid); 907 907 908 908 } else { 909 909 amdgpu_dm_remove_sink_from_freesync_module(connector); 910 910 - drm_mode_connector_update_edid_property(connector, NULL); 910 910 + drm_connector_update_edid_property(connector, NULL); 911 911 aconnector->num_modes = 0; 912 912 aconnector->dc_sink = NULL; 913 913 aconnector->edid = NULL;

+2 -2

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c

reviewed

··· 233 233 edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port); 234 234 235 235 if (!edid) { 236 236 - drm_mode_connector_update_edid_property( 236 236 + drm_connector_update_edid_property( 237 237 &aconnector->base, 238 238 NULL); 239 239 return ret; ··· 261 261 connector, aconnector->edid); 262 262 } 263 263 264 264 - drm_mode_connector_update_edid_property( 264 264 + drm_connector_update_edid_property( 265 265 &aconnector->base, aconnector->edid); 266 266 267 267 ret = drm_add_edid_modes(connector, aconnector->edid);

+2 -2

drivers/gpu/drm/ast/ast_mode.c

reviewed

··· 790 790 if (!flags) 791 791 edid = drm_get_edid(connector, &ast_connector->i2c->adapter); 792 792 if (edid) { 793 793 - drm_mode_connector_update_edid_property(&ast_connector->base, edid); 793 793 + drm_connector_update_edid_property(&ast_connector->base, edid); 794 794 ret = drm_add_edid_modes(connector, edid); 795 795 kfree(edid); 796 796 return ret; 797 797 } else 798 798 - drm_mode_connector_update_edid_property(&ast_connector->base, NULL); 798 798 + drm_connector_update_edid_property(&ast_connector->base, NULL); 799 799 return 0; 800 800 } 801 801

+1 -1

drivers/gpu/drm/bridge/adv7511/adv7511_drv.c

reviewed

··· 601 601 __adv7511_power_off(adv7511); 602 602 603 603 604 604 - drm_mode_connector_update_edid_property(connector, edid); 604 604 + drm_connector_update_edid_property(connector, edid); 605 605 count = drm_add_edid_modes(connector, edid); 606 606 607 607 adv7511_set_config_csc(adv7511, connector, adv7511->rgb,

+2 -2

drivers/gpu/drm/bridge/analogix-anx78xx.c

reviewed

··· 969 969 goto unlock; 970 970 } 971 971 972 972 - err = drm_mode_connector_update_edid_property(connector, 973 973 - anx78xx->edid); 972 972 + err = drm_connector_update_edid_property(connector, 973 973 + anx78xx->edid); 974 974 if (err) { 975 975 DRM_ERROR("Failed to update EDID property: %d\n", err); 976 976 goto unlock;

+2 -2

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

reviewed

··· 1119 1119 edid = drm_get_edid(connector, &dp->aux.ddc); 1120 1120 pm_runtime_put(dp->dev); 1121 1121 if (edid) { 1122 1122 - drm_mode_connector_update_edid_property(&dp->connector, 1123 1123 - edid); 1122 1122 + drm_connector_update_edid_property(&dp->connector, 1123 1123 + edid); 1124 1124 num_modes += drm_add_edid_modes(&dp->connector, edid); 1125 1125 kfree(edid); 1126 1126 }

+1 -1

drivers/gpu/drm/bridge/dumb-vga-dac.c

reviewed

··· 55 55 goto fallback; 56 56 } 57 57 58 58 - drm_mode_connector_update_edid_property(connector, edid); 58 58 + drm_connector_update_edid_property(connector, edid); 59 59 ret = drm_add_edid_modes(connector, edid); 60 60 kfree(edid); 61 61 return ret;

+1 -1

drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c

reviewed

··· 152 152 ge_b850v3_lvds_ptr->edid = (struct edid *)stdp2690_get_edid(client); 153 153 154 154 if (ge_b850v3_lvds_ptr->edid) { 155 155 - drm_mode_connector_update_edid_property(connector, 155 155 + drm_connector_update_edid_property(connector, 156 156 ge_b850v3_lvds_ptr->edid); 157 157 num_modes = drm_add_edid_modes(connector, 158 158 ge_b850v3_lvds_ptr->edid);

+1 -1

drivers/gpu/drm/bridge/nxp-ptn3460.c

reviewed

··· 222 222 } 223 223 224 224 ptn_bridge->edid = (struct edid *)edid; 225 225 - drm_mode_connector_update_edid_property(connector, ptn_bridge->edid); 225 225 + drm_connector_update_edid_property(connector, ptn_bridge->edid); 226 226 227 227 num_modes = drm_add_edid_modes(connector, ptn_bridge->edid); 228 228

+1 -1

drivers/gpu/drm/bridge/sii902x.c

reviewed

··· 170 170 return ret; 171 171 172 172 edid = drm_get_edid(connector, sii902x->i2c->adapter); 173 173 - drm_mode_connector_update_edid_property(connector, edid); 173 173 + drm_connector_update_edid_property(connector, edid); 174 174 if (edid) { 175 175 num = drm_add_edid_modes(connector, edid); 176 176 kfree(edid);

+1 -1

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

reviewed

··· 1922 1922 1923 1923 hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid); 1924 1924 hdmi->sink_has_audio = drm_detect_monitor_audio(edid); 1925 1925 - drm_mode_connector_update_edid_property(connector, edid); 1925 1925 + drm_connector_update_edid_property(connector, edid); 1926 1926 cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid); 1927 1927 ret = drm_add_edid_modes(connector, edid); 1928 1928 kfree(edid);

+1 -1

drivers/gpu/drm/bridge/tc358767.c

reviewed

··· 1140 1140 if (!edid) 1141 1141 return 0; 1142 1142 1143 1143 - drm_mode_connector_update_edid_property(connector, edid); 1143 1143 + drm_connector_update_edid_property(connector, edid); 1144 1144 count = drm_add_edid_modes(connector, edid); 1145 1145 1146 1146 return count;

+1 -1

drivers/gpu/drm/bridge/ti-tfp410.c

reviewed

··· 62 62 goto fallback; 63 63 } 64 64 65 65 - drm_mode_connector_update_edid_property(connector, edid); 65 65 + drm_connector_update_edid_property(connector, edid); 66 66 67 67 return drm_add_edid_modes(connector, edid); 68 68 fallback:

+4 -4

drivers/gpu/drm/drm_connector.c

reviewed

··· 814 814 * Blob property which contains the current EDID read from the sink. This 815 815 * is useful to parse sink identification information like vendor, model 816 816 * and serial. Drivers should update this property by calling 817 817 - * drm_mode_connector_update_edid_property(), usually after having parsed 817 817 + * drm_connector_update_edid_property(), usually after having parsed 818 818 * the EDID using drm_add_edid_modes(). Userspace cannot change this 819 819 * property. 820 820 * DPMS: ··· 1497 1497 EXPORT_SYMBOL(drm_mode_connector_set_tile_property); 1498 1498 1499 1499 /** 1500 1500 - * drm_mode_connector_update_edid_property - update the edid property of a connector 1500 1500 + * drm_connector_update_edid_property - update the edid property of a connector 1501 1501 * @connector: drm connector 1502 1502 * @edid: new value of the edid property 1503 1503 * ··· 1507 1507 * Returns: 1508 1508 * Zero on success, negative errno on failure. 1509 1509 */ 1510 1510 - int drm_mode_connector_update_edid_property(struct drm_connector *connector, 1510 1510 + int drm_connector_update_edid_property(struct drm_connector *connector, 1511 1511 const struct edid *edid) 1512 1512 { 1513 1513 struct drm_device *dev = connector->dev; ··· 1546 1546 dev->mode_config.edid_property); 1547 1547 return ret; 1548 1548 } 1549 1549 - EXPORT_SYMBOL(drm_mode_connector_update_edid_property); 1549 1549 + EXPORT_SYMBOL(drm_connector_update_edid_property); 1550 1550 1551 1551 /** 1552 1552 * drm_mode_connector_set_link_status_property - Set link status property of a connector

+2 -2

drivers/gpu/drm/drm_debugfs.c

reviewed

··· 314 314 315 315 if (len == 5 && !strncmp(buf, "reset", 5)) { 316 316 connector->override_edid = false; 317 317 - ret = drm_mode_connector_update_edid_property(connector, NULL); 317 317 + ret = drm_connector_update_edid_property(connector, NULL); 318 318 } else if (len < EDID_LENGTH || 319 319 EDID_LENGTH * (1 + edid->extensions) > len) 320 320 ret = -EINVAL; 321 321 else { 322 322 connector->override_edid = false; 323 323 - ret = drm_mode_connector_update_edid_property(connector, edid); 323 323 + ret = drm_connector_update_edid_property(connector, edid); 324 324 if (!ret) 325 325 connector->override_edid = true; 326 326 }

+1 -1

drivers/gpu/drm/drm_probe_helper.c

reviewed

··· 472 472 if (connector->status == connector_status_disconnected) { 473 473 DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n", 474 474 connector->base.id, connector->name); 475 475 - drm_mode_connector_update_edid_property(connector, NULL); 475 475 + drm_connector_update_edid_property(connector, NULL); 476 476 verbose_prune = false; 477 477 goto prune; 478 478 }

+1 -1

drivers/gpu/drm/exynos/exynos_drm_vidi.c

reviewed

··· 319 319 return -ENOMEM; 320 320 } 321 321 322 322 - drm_mode_connector_update_edid_property(connector, edid); 322 322 + drm_connector_update_edid_property(connector, edid); 323 323 324 324 return drm_add_edid_modes(connector, edid); 325 325 }

+1 -1

drivers/gpu/drm/exynos/exynos_hdmi.c

reviewed

··· 888 888 (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"), 889 889 edid->width_cm, edid->height_cm); 890 890 891 891 - drm_mode_connector_update_edid_property(connector, edid); 891 891 + drm_connector_update_edid_property(connector, edid); 892 892 cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid); 893 893 894 894 ret = drm_add_edid_modes(connector, edid);

+1 -1

drivers/gpu/drm/gma500/cdv_intel_dp.c

reviewed

··· 1770 1770 1771 1771 edid = drm_get_edid(connector, &intel_dp->adapter); 1772 1772 if (edid) { 1773 1773 - drm_mode_connector_update_edid_property(connector, edid); 1773 1773 + drm_connector_update_edid_property(connector, edid); 1774 1774 ret = drm_add_edid_modes(connector, edid); 1775 1775 kfree(edid); 1776 1776 }

+1 -1

drivers/gpu/drm/gma500/cdv_intel_hdmi.c

reviewed

··· 216 216 217 217 edid = drm_get_edid(connector, &gma_encoder->i2c_bus->adapter); 218 218 if (edid) { 219 219 - drm_mode_connector_update_edid_property(connector, edid); 219 219 + drm_connector_update_edid_property(connector, edid); 220 220 ret = drm_add_edid_modes(connector, edid); 221 221 kfree(edid); 222 222 }

+1 -1

drivers/gpu/drm/gma500/oaktrail_hdmi.c

reviewed

··· 578 578 } 579 579 580 580 if (edid) { 581 581 - drm_mode_connector_update_edid_property(connector, edid); 581 581 + drm_connector_update_edid_property(connector, edid); 582 582 ret = drm_add_edid_modes(connector, edid); 583 583 } 584 584 return ret;

+1 -1

drivers/gpu/drm/gma500/oaktrail_lvds.c

reviewed

··· 376 376 * preferred mode is the right one. 377 377 */ 378 378 if (edid) { 379 379 - drm_mode_connector_update_edid_property(connector, edid); 379 379 + drm_connector_update_edid_property(connector, edid); 380 380 drm_add_edid_modes(connector, edid); 381 381 kfree(edid); 382 382

+1 -1

drivers/gpu/drm/gma500/psb_intel_modes.c

reviewed

··· 66 66 67 67 edid = drm_get_edid(connector, adapter); 68 68 if (edid) { 69 69 - drm_mode_connector_update_edid_property(connector, edid); 69 69 + drm_connector_update_edid_property(connector, edid); 70 70 ret = drm_add_edid_modes(connector, edid); 71 71 kfree(edid); 72 72 }

+1 -1

drivers/gpu/drm/gma500/psb_intel_sdvo.c

reviewed

··· 1472 1472 bool connector_is_digital = !!IS_TMDS(psb_intel_sdvo_connector); 1473 1473 1474 1474 if (connector_is_digital == monitor_is_digital) { 1475 1475 - drm_mode_connector_update_edid_property(connector, edid); 1475 1475 + drm_connector_update_edid_property(connector, edid); 1476 1476 drm_add_edid_modes(connector, edid); 1477 1477 } 1478 1478

+1 -1

drivers/gpu/drm/i2c/tda998x_drv.c

reviewed

··· 1243 1243 return 0; 1244 1244 } 1245 1245 1246 1246 - drm_mode_connector_update_edid_property(connector, edid); 1246 1246 + drm_connector_update_edid_property(connector, edid); 1247 1247 n = drm_add_edid_modes(connector, edid); 1248 1248 1249 1249 kfree(edid);

+1 -1

drivers/gpu/drm/i915/intel_dp.c

reviewed

··· 6231 6231 edid = drm_get_edid(connector, &intel_dp->aux.ddc); 6232 6232 if (edid) { 6233 6233 if (drm_add_edid_modes(connector, edid)) { 6234 6234 - drm_mode_connector_update_edid_property(connector, 6234 6234 + drm_connector_update_edid_property(connector, 6235 6235 edid); 6236 6236 } else { 6237 6237 kfree(edid);

+1 -1

drivers/gpu/drm/i915/intel_lvds.c

reviewed

··· 1131 1131 intel_gmbus_get_adapter(dev_priv, pin)); 1132 1132 if (edid) { 1133 1133 if (drm_add_edid_modes(connector, edid)) { 1134 1134 - drm_mode_connector_update_edid_property(connector, 1134 1134 + drm_connector_update_edid_property(connector, 1135 1135 edid); 1136 1136 } else { 1137 1137 kfree(edid);

+1 -1

drivers/gpu/drm/i915/intel_modes.c

reviewed

··· 40 40 { 41 41 int ret; 42 42 43 43 - drm_mode_connector_update_edid_property(connector, edid); 43 43 + drm_connector_update_edid_property(connector, edid); 44 44 ret = drm_add_edid_modes(connector, edid); 45 45 46 46 return ret;

+1 -1

drivers/gpu/drm/i915/intel_sdvo.c

reviewed

··· 1913 1913 if (edid != NULL) { 1914 1914 if (intel_sdvo_connector_matches_edid(to_intel_sdvo_connector(connector), 1915 1915 edid)) { 1916 1916 - drm_mode_connector_update_edid_property(connector, edid); 1916 1916 + drm_connector_update_edid_property(connector, edid); 1917 1917 drm_add_edid_modes(connector, edid); 1918 1918 } 1919 1919

+1 -1

drivers/gpu/drm/imx/imx-ldb.c

reviewed

··· 143 143 imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc); 144 144 145 145 if (imx_ldb_ch->edid) { 146 146 - drm_mode_connector_update_edid_property(connector, 146 146 + drm_connector_update_edid_property(connector, 147 147 imx_ldb_ch->edid); 148 148 num_modes = drm_add_edid_modes(connector, imx_ldb_ch->edid); 149 149 }

+1 -1

drivers/gpu/drm/imx/imx-tve.c

reviewed

··· 235 235 236 236 edid = drm_get_edid(connector, tve->ddc); 237 237 if (edid) { 238 238 - drm_mode_connector_update_edid_property(connector, edid); 238 238 + drm_connector_update_edid_property(connector, edid); 239 239 ret = drm_add_edid_modes(connector, edid); 240 240 kfree(edid); 241 241 }

+1 -1

drivers/gpu/drm/imx/parallel-display.c

reviewed

··· 63 63 } 64 64 65 65 if (imxpd->edid) { 66 66 - drm_mode_connector_update_edid_property(connector, imxpd->edid); 66 66 + drm_connector_update_edid_property(connector, imxpd->edid); 67 67 num_modes = drm_add_edid_modes(connector, imxpd->edid); 68 68 } 69 69

+1 -1

drivers/gpu/drm/mediatek/mtk_hdmi.c

reviewed

··· 1220 1220 1221 1221 hdmi->dvi_mode = !drm_detect_monitor_audio(edid); 1222 1222 1223 1223 - drm_mode_connector_update_edid_property(conn, edid); 1223 1223 + drm_connector_update_edid_property(conn, edid); 1224 1224 1225 1225 ret = drm_add_edid_modes(conn, edid); 1226 1226 kfree(edid);

+1 -1

drivers/gpu/drm/mgag200/mgag200_mode.c

reviewed

··· 1553 1553 1554 1554 edid = drm_get_edid(connector, &mga_connector->i2c->adapter); 1555 1555 if (edid) { 1556 1556 - drm_mode_connector_update_edid_property(connector, edid); 1556 1556 + drm_connector_update_edid_property(connector, edid); 1557 1557 ret = drm_add_edid_modes(connector, edid); 1558 1558 kfree(edid); 1559 1559 }

+1 -1

drivers/gpu/drm/msm/edp/edp_connector.c

reviewed

··· 56 56 if (ret) 57 57 return ret; 58 58 59 59 - drm_mode_connector_update_edid_property(connector, drm_edid); 59 59 + drm_connector_update_edid_property(connector, drm_edid); 60 60 if (drm_edid) 61 61 ret = drm_add_edid_modes(connector, drm_edid); 62 62

+1 -1

drivers/gpu/drm/msm/hdmi/hdmi_connector.c

reviewed

··· 392 392 hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl); 393 393 394 394 hdmi->hdmi_mode = drm_detect_hdmi_monitor(edid); 395 395 - drm_mode_connector_update_edid_property(connector, edid); 395 395 + drm_connector_update_edid_property(connector, edid); 396 396 397 397 if (edid) { 398 398 ret = drm_add_edid_modes(connector, edid);

+1 -1

drivers/gpu/drm/nouveau/dispnv50/disp.c

reviewed

··· 850 850 int ret = 0; 851 851 852 852 mstc->edid = drm_dp_mst_get_edid(&mstc->connector, mstc->port->mgr, mstc->port); 853 853 - drm_mode_connector_update_edid_property(&mstc->connector, mstc->edid); 853 853 + drm_connector_update_edid_property(&mstc->connector, mstc->edid); 854 854 if (mstc->edid) 855 855 ret = drm_add_edid_modes(&mstc->connector, mstc->edid); 856 856

+4 -4

drivers/gpu/drm/nouveau/nouveau_connector.c

reviewed

··· 550 550 551 551 /* Cleanup the previous EDID block. */ 552 552 if (nv_connector->edid) { 553 553 - drm_mode_connector_update_edid_property(connector, NULL); 553 553 + drm_connector_update_edid_property(connector, NULL); 554 554 kfree(nv_connector->edid); 555 555 nv_connector->edid = NULL; 556 556 } ··· 575 575 else 576 576 nv_connector->edid = drm_get_edid(connector, i2c); 577 577 578 578 - drm_mode_connector_update_edid_property(connector, 578 578 + drm_connector_update_edid_property(connector, 579 579 nv_connector->edid); 580 580 if (!nv_connector->edid) { 581 581 NV_ERROR(drm, "DDC responded, but no EDID for %s\n", ··· 657 657 658 658 /* Cleanup the previous EDID block. */ 659 659 if (nv_connector->edid) { 660 660 - drm_mode_connector_update_edid_property(connector, NULL); 660 660 + drm_connector_update_edid_property(connector, NULL); 661 661 kfree(nv_connector->edid); 662 662 nv_connector->edid = NULL; 663 663 } ··· 721 721 status = connector_status_unknown; 722 722 #endif 723 723 724 724 - drm_mode_connector_update_edid_property(connector, nv_connector->edid); 724 724 + drm_connector_update_edid_property(connector, nv_connector->edid); 725 725 nouveau_connector_set_encoder(connector, nv_encoder); 726 726 return status; 727 727 }

+2 -2

drivers/gpu/drm/omapdrm/omap_connector.c

reviewed

··· 126 126 127 127 if ((dssdrv->read_edid(dssdev, edid, MAX_EDID) > 0) && 128 128 drm_edid_is_valid(edid)) { 129 129 - drm_mode_connector_update_edid_property( 129 129 + drm_connector_update_edid_property( 130 130 connector, edid); 131 131 n = drm_add_edid_modes(connector, edid); 132 132 133 133 omap_connector->hdmi_mode = 134 134 drm_detect_hdmi_monitor(edid); 135 135 } else { 136 136 - drm_mode_connector_update_edid_property( 136 136 + drm_connector_update_edid_property( 137 137 connector, NULL); 138 138 } 139 139

+1 -1

drivers/gpu/drm/panel/panel-simple.c

reviewed

··· 252 252 /* probe EDID if a DDC bus is available */ 253 253 if (p->ddc) { 254 254 struct edid *edid = drm_get_edid(panel->connector, p->ddc); 255 255 - drm_mode_connector_update_edid_property(panel->connector, edid); 255 255 + drm_connector_update_edid_property(panel->connector, edid); 256 256 if (edid) { 257 257 num += drm_add_edid_modes(panel->connector, edid); 258 258 kfree(edid);

+2 -2

drivers/gpu/drm/radeon/radeon_connectors.c

reviewed

··· 368 368 int ret; 369 369 370 370 if (radeon_connector->edid) { 371 371 - drm_mode_connector_update_edid_property(connector, radeon_connector->edid); 371 371 + drm_connector_update_edid_property(connector, radeon_connector->edid); 372 372 ret = drm_add_edid_modes(connector, radeon_connector->edid); 373 373 return ret; 374 374 } 375 375 - drm_mode_connector_update_edid_property(connector, NULL); 375 375 + drm_connector_update_edid_property(connector, NULL); 376 376 return 0; 377 377 } 378 378

+2 -2

drivers/gpu/drm/radeon/radeon_dp_mst.c

reviewed

··· 195 195 radeon_connector->edid = edid; 196 196 DRM_DEBUG_KMS("edid retrieved %p\n", edid); 197 197 if (radeon_connector->edid) { 198 198 - drm_mode_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid); 198 198 + drm_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid); 199 199 ret = drm_add_edid_modes(&radeon_connector->base, radeon_connector->edid); 200 200 return ret; 201 201 } 202 202 - drm_mode_connector_update_edid_property(&radeon_connector->base, NULL); 202 202 + drm_connector_update_edid_property(&radeon_connector->base, NULL); 203 203 204 204 return ret; 205 205 }

+1 -1

drivers/gpu/drm/rockchip/cdn-dp-core.c

reviewed

··· 275 275 dp->sink_has_audio = drm_detect_monitor_audio(edid); 276 276 ret = drm_add_edid_modes(connector, edid); 277 277 if (ret) 278 278 - drm_mode_connector_update_edid_property(connector, 278 278 + drm_connector_update_edid_property(connector, 279 279 edid); 280 280 } 281 281 mutex_unlock(&dp->lock);

+1 -1

drivers/gpu/drm/rockchip/inno_hdmi.c

reviewed

··· 565 565 if (edid) { 566 566 hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid); 567 567 hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid); 568 568 - drm_mode_connector_update_edid_property(connector, edid); 568 568 + drm_connector_update_edid_property(connector, edid); 569 569 ret = drm_add_edid_modes(connector, edid); 570 570 kfree(edid); 571 571 }

+1 -1

drivers/gpu/drm/sti/sti_hdmi.c

reviewed

··· 977 977 cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid); 978 978 979 979 count = drm_add_edid_modes(connector, edid); 980 980 - drm_mode_connector_update_edid_property(connector, edid); 980 980 + drm_connector_update_edid_property(connector, edid); 981 981 982 982 kfree(edid); 983 983 return count;

+1 -1

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

reviewed

··· 220 220 DRM_DEBUG_DRIVER("Monitor is %s monitor\n", 221 221 hdmi->hdmi_monitor ? "an HDMI" : "a DVI"); 222 222 223 223 - drm_mode_connector_update_edid_property(connector, edid); 223 223 + drm_connector_update_edid_property(connector, edid); 224 224 cec_s_phys_addr_from_edid(hdmi->cec_adap, edid); 225 225 ret = drm_add_edid_modes(connector, edid); 226 226 kfree(edid);

+1 -1

drivers/gpu/drm/tegra/output.c

reviewed

··· 37 37 edid = drm_get_edid(connector, output->ddc); 38 38 39 39 cec_notifier_set_phys_addr_from_edid(output->notifier, edid); 40 40 - drm_mode_connector_update_edid_property(connector, edid); 40 40 + drm_connector_update_edid_property(connector, edid); 41 41 42 42 if (edid) { 43 43 err = drm_add_edid_modes(connector, edid);

+1 -1

drivers/gpu/drm/tilcdc/tilcdc_tfp410.c

reviewed

··· 173 173 174 174 edid = drm_get_edid(connector, tfp410_connector->mod->i2c); 175 175 176 176 - drm_mode_connector_update_edid_property(connector, edid); 176 176 + drm_connector_update_edid_property(connector, edid); 177 177 178 178 if (edid) { 179 179 ret = drm_add_edid_modes(connector, edid);

+1 -1

drivers/gpu/drm/udl/udl_connector.c

reviewed

··· 99 99 struct udl_drm_connector, 100 100 connector); 101 101 102 102 - drm_mode_connector_update_edid_property(connector, udl_connector->edid); 102 102 + drm_connector_update_edid_property(connector, udl_connector->edid); 103 103 if (udl_connector->edid) 104 104 return drm_add_edid_modes(connector, udl_connector->edid); 105 105 return 0;

+1 -1

drivers/gpu/drm/vc4/vc4_hdmi.c

reviewed

··· 285 285 drm_rgb_quant_range_selectable(edid); 286 286 } 287 287 288 288 - drm_mode_connector_update_edid_property(connector, edid); 288 288 + drm_connector_update_edid_property(connector, edid); 289 289 ret = drm_add_edid_modes(connector, edid); 290 290 kfree(edid); 291 291

+1 -1

drivers/gpu/drm/zte/zx_hdmi.c

reviewed

··· 272 272 273 273 hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid); 274 274 hdmi->sink_has_audio = drm_detect_monitor_audio(edid); 275 275 - drm_mode_connector_update_edid_property(connector, edid); 275 275 + drm_connector_update_edid_property(connector, edid); 276 276 ret = drm_add_edid_modes(connector, edid); 277 277 kfree(edid); 278 278

+1 -1

drivers/gpu/drm/zte/zx_vga.c

reviewed

··· 109 109 */ 110 110 zx_writel(vga->mmio + VGA_AUTO_DETECT_SEL, VGA_DETECT_SEL_HAS_DEVICE); 111 111 112 112 - drm_mode_connector_update_edid_property(connector, edid); 112 112 + drm_connector_update_edid_property(connector, edid); 113 113 ret = drm_add_edid_modes(connector, edid); 114 114 kfree(edid); 115 115

+1 -1

drivers/staging/vboxvideo/vbox_mode.c

reviewed

··· 504 504 for (i = 0; i < EDID_SIZE - 1; ++i) 505 505 sum += edid[i]; 506 506 edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF; 507 507 - drm_mode_connector_update_edid_property(connector, (struct edid *)edid); 507 507 + drm_connector_update_edid_property(connector, (struct edid *)edid); 508 508 } 509 509 510 510 static int vbox_get_modes(struct drm_connector *connector)

+3 -3

include/drm/drm_connector.h

reviewed

··· 896 896 /** 897 897 * @edid_blob_ptr: DRM property containing EDID if present. Protected by 898 898 * &drm_mode_config.mutex. This should be updated only by calling 899 899 - * drm_mode_connector_update_edid_property(). 899 899 + * drm_connector_update_edid_property(). 900 900 */ 901 901 struct drm_property_blob *edid_blob_ptr; 902 902 ··· 1194 1194 int drm_mode_connector_set_path_property(struct drm_connector *connector, 1195 1195 const char *path); 1196 1196 int drm_mode_connector_set_tile_property(struct drm_connector *connector); 1197 1197 - int drm_mode_connector_update_edid_property(struct drm_connector *connector, 1198 1198 - const struct edid *edid); 1197 1197 + int drm_connector_update_edid_property(struct drm_connector *connector, 1198 1198 + const struct edid *edid); 1199 1199 void drm_mode_connector_set_link_status_property(struct drm_connector *connector, 1200 1200 uint64_t link_status); 1201 1201 int drm_connector_init_panel_orientation_property(

+1 -1

include/drm/drm_modeset_helper_vtables.h

reviewed

··· 785 785 * 786 786 * This function should fill in all modes currently valid for the sink 787 787 * into the &drm_connector.probed_modes list. It should also update the 788 788 - * EDID property by calling drm_mode_connector_update_edid_property(). 788 788 + * EDID property by calling drm_connector_update_edid_property(). 789 789 * 790 790 * The usual way to implement this is to cache the EDID retrieved in the 791 791 * probe callback somewhere in the driver-private connector structure.