* [PATCH 00/15] bunch of kerneldocs polish and related cleanup
@ 2018-07-09 8:40 Daniel Vetter
2018-07-09 8:40 ` [PATCH 01/15] drm: move drv test macros out of drmP.h Daniel Vetter
` (14 more replies)
0 siblings, 15 replies; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter
Hi all,
For anything somewhat complicated the in-line kerneldoc comments for
struct members are much, much better. But we still have plenty of
old-style stuff around, tricking people into writing way too short docs
that don't explain stuff.
This series moves drm_connector|crtc|plane(_state) over to inline comments
comopletely. Plus some related cleanups.
Review and comments very much welcome!
Cheers, Daniel
Daniel Vetter (15):
drm: move drv test macros out of drmP.h
drm: Drop drmP.h from drm_connector.c
drm/doc: switch drm_connector_state to inline comments
drm/doc: polish for sturct drm_connector
drm: drop _mode_ from update_edit_property()
drm: drop _mode_ from drm_mode_connector_attach_encoder
drm: drop _mode_ from remaining connector functions
drm: Switch drm_plane_state to inline kerneldoc style
drm: switch drm_plane to inline comments
drm: drop drmP.h include from drm_plane.c
drm/doc: move struct drm_crtc to in-line comments
drm/doc: Group the fb gem helpers better
drm/doc: Includ drm_of.c helpers
drm/doc: use inline kerneldoc style for drm_crtc_state
drm: drop drmP.h include from drm_crtc.c
Documentation/gpu/drm-kms-helpers.rst | 17 +-
Documentation/gpu/drm-kms.rst | 13 +-
.../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +-
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +-
.../display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +-
drivers/gpu/drm/arc/arcpgu_sim.c | 2 +-
drivers/gpu/drm/ast/ast_mode.c | 6 +-
drivers/gpu/drm/bochs/bochs_kms.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 4 +-
drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 +-
.../drm/bridge/analogix/analogix_dp_core.c | 6 +-
drivers/gpu/drm/bridge/dumb-vga-dac.c | 4 +-
.../bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 4 +-
drivers/gpu/drm/bridge/nxp-ptn3460.c | 4 +-
drivers/gpu/drm/bridge/panel.c | 2 +-
drivers/gpu/drm/bridge/parade-ps8622.c | 2 +-
drivers/gpu/drm/bridge/sii902x.c | 4 +-
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 +-
drivers/gpu/drm/bridge/tc358767.c | 4 +-
drivers/gpu/drm/bridge/ti-tfp410.c | 4 +-
drivers/gpu/drm/cirrus/cirrus_mode.c | 2 +-
drivers/gpu/drm/drm_atomic_helper.c | 2 +-
drivers/gpu/drm/drm_connector.c | 60 +++--
drivers/gpu/drm/drm_crtc.c | 5 +-
drivers/gpu/drm/drm_crtc_internal.h | 14 +-
drivers/gpu/drm/drm_debugfs.c | 4 +-
drivers/gpu/drm/drm_dp_mst_topology.c | 4 +-
drivers/gpu/drm/drm_internal.h | 5 +
drivers/gpu/drm/drm_ioctl.c | 2 +-
drivers/gpu/drm/drm_mode_object.c | 3 +-
drivers/gpu/drm/drm_modes.c | 6 +-
drivers/gpu/drm/drm_of.c | 9 +-
drivers/gpu/drm/drm_plane.c | 11 +-
drivers/gpu/drm/drm_probe_helper.c | 6 +-
drivers/gpu/drm/drm_simple_kms_helper.c | 2 +-
drivers/gpu/drm/drm_writeback.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_dpi.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +-
drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +-
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +-
drivers/gpu/drm/gma500/gma_display.c | 2 +-
drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +-
.../gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +-
drivers/gpu/drm/i2c/tda998x_drv.c | 4 +-
drivers/gpu/drm/i915/intel_display.c | 3 +-
drivers/gpu/drm/i915/intel_dp.c | 6 +-
drivers/gpu/drm/i915/intel_dp_mst.c | 5 +-
drivers/gpu/drm/i915/intel_lvds.c | 2 +-
drivers/gpu/drm/i915/intel_modes.c | 2 +-
drivers/gpu/drm/i915/intel_sdvo.c | 2 +-
drivers/gpu/drm/imx/imx-ldb.c | 5 +-
drivers/gpu/drm/imx/imx-tve.c | 4 +-
drivers/gpu/drm/imx/parallel-display.c | 4 +-
drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +-
drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +-
drivers/gpu/drm/meson/meson_venc_cvbs.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_mode.c | 4 +-
.../drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +-
drivers/gpu/drm/msm/dsi/dsi_manager.c | 4 +-
drivers/gpu/drm/msm/edp/edp_connector.c | 4 +-
drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 4 +-
drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 +-
drivers/gpu/drm/nouveau/nouveau_connector.c | 8 +-
drivers/gpu/drm/omapdrm/omap_connector.c | 4 +-
drivers/gpu/drm/omapdrm/omap_drv.c | 2 +-
drivers/gpu/drm/panel/panel-simple.c | 2 +-
drivers/gpu/drm/qxl/qxl_display.c | 2 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 4 +-
drivers/gpu/drm/radeon/radeon_dp_mst.c | 6 +-
drivers/gpu/drm/radeon/radeon_encoders.c | 2 +-
drivers/gpu/drm/rcar-du/rcar_lvds.c | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +-
drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 2 +-
drivers/gpu/drm/rockchip/inno_hdmi.c | 4 +-
drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +-
drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +-
drivers/gpu/drm/sti/sti_dvo.c | 2 +-
drivers/gpu/drm/sti/sti_hda.c | 2 +-
drivers/gpu/drm/sti/sti_hdmi.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 4 +-
drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +-
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +-
drivers/gpu/drm/tegra/dsi.c | 2 +-
drivers/gpu/drm/tegra/hdmi.c | 2 +-
drivers/gpu/drm/tegra/output.c | 2 +-
drivers/gpu/drm/tegra/rgb.c | 2 +-
drivers/gpu/drm/tegra/sor.c | 2 +-
drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 +-
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 4 +-
drivers/gpu/drm/udl/udl_connector.c | 4 +-
drivers/gpu/drm/vc4/vc4_hdmi.c | 4 +-
drivers/gpu/drm/vc4/vc4_vec.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_display.c | 2 +-
drivers/gpu/drm/vkms/vkms_output.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
drivers/gpu/drm/zte/zx_hdmi.c | 4 +-
drivers/gpu/drm/zte/zx_tvenc.c | 2 +-
drivers/gpu/drm/zte/zx_vga.c | 4 +-
drivers/staging/vboxvideo/vbox_mode.c | 4 +-
include/drm/drmP.h | 19 --
include/drm/drm_color_mgmt.h | 1 +
include/drm/drm_connector.h | 221 ++++++++++------
include/drm/drm_crtc.h | 240 ++++++++++++++----
include/drm/drm_drv.h | 29 +++
include/drm/drm_modes.h | 2 +-
include/drm/drm_modeset_helper_vtables.h | 2 +-
include/drm/drm_plane.h | 176 +++++++++----
include/drm/drm_property.h | 2 +
126 files changed, 742 insertions(+), 434 deletions(-)
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH 01/15] drm: move drv test macros out of drmP.h
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-12 13:52 ` Sean Paul
2018-07-09 8:40 ` [PATCH 02/15] drm: Drop drmP.h from drm_connector.c Daniel Vetter
` (13 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
Last bit the prevented us from starting to delete the drmP.h monster
includes from source files!
Also add kernel-doc while moving them.
A nice consistent drm_dev_ prefix would be cute for these, but since
they're used everywhere I've figured I'll leave this bikeshed aside
for now.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
include/drm/drmP.h | 19 -------------------
include/drm/drm_drv.h | 29 +++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index c5dfbdb7271d..f7a19c2a7a80 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -102,25 +102,6 @@ struct pci_controller;
#define DRM_SWITCH_POWER_CHANGING 2
#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
-static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
-{
- return dev->driver->driver_features & feature;
-}
-
-/**
- * drm_drv_uses_atomic_modeset - check if the driver implements
- * atomic_commit()
- * @dev: DRM device
- *
- * This check is useful if drivers do not have DRIVER_ATOMIC set but
- * have atomic modesetting internally implemented.
- */
-static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
-{
- return drm_core_check_feature(dev, DRIVER_ATOMIC) ||
- dev->mode_config.funcs->atomic_commit != NULL;
-}
-
/* returns true if currently okay to sleep */
static inline bool drm_can_sleep(void)
{
diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
index 7e545f5f94d3..46a8009784df 100644
--- a/include/drm/drm_drv.h
+++ b/include/drm/drm_drv.h
@@ -649,6 +649,35 @@ static inline bool drm_dev_is_unplugged(struct drm_device *dev)
return true;
}
+/**
+ * drm_core_check_feature - check driver feature flags
+ * @dev: DRM device to check
+ * @feature: feature flag
+ *
+ * This checks @dev for driver features, see &drm_driver.driver_features and the
+ * various DRIVER_\* flags.
+ *
+ * Returns true if the @feature is supported, false otherwise.
+ */
+static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
+{
+ return dev->driver->driver_features & feature;
+}
+
+/**
+ * drm_drv_uses_atomic_modeset - check if the driver implements
+ * atomic_commit()
+ * @dev: DRM device
+ *
+ * This check is useful if drivers do not have DRIVER_ATOMIC set but
+ * have atomic modesetting internally implemented.
+ */
+static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
+{
+ return drm_core_check_feature(dev, DRIVER_ATOMIC) ||
+ dev->mode_config.funcs->atomic_commit != NULL;
+}
+
int drm_dev_set_unique(struct drm_device *dev, const char *name);
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 02/15] drm: Drop drmP.h from drm_connector.c
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
2018-07-09 8:40 ` [PATCH 01/15] drm: move drv test macros out of drmP.h Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-12 13:53 ` Sean Paul
2018-07-09 8:40 ` [PATCH 03/15] drm/doc: switch drm_connector_state to inline comments Daniel Vetter
` (12 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
Only needed minimal changes in drm_internal.h (for the drm_ioctl_t
type and a few forward declarations), plus a few missing includes in
drm_connector.c.
Yay, the last stage of the drm header cleanup can finally commence!
Note: This needs the patch to move for_each_if from drmP.h to kernel.h
or it won't compile.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/drm_connector.c | 6 +++++-
drivers/gpu/drm/drm_internal.h | 5 +++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 5ada0640de5a..dc5a480200d8 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -20,11 +20,15 @@
* OF THIS SOFTWARE.
*/
-#include <drm/drmP.h>
#include <drm/drm_connector.h>
#include <drm/drm_edid.h>
#include <drm/drm_encoder.h>
#include <drm/drm_utils.h>
+#include <drm/drm_print.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_file.h>
+
+#include <linux/uaccess.h>
#include "drm_crtc_internal.h"
#include "drm_internal.h"
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
index 40179c5fc6b8..0c4eb4a9ab31 100644
--- a/drivers/gpu/drm/drm_internal.h
+++ b/drivers/gpu/drm/drm_internal.h
@@ -21,9 +21,14 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
+#include <drm/drm_ioctl.h>
+
#define DRM_IF_MAJOR 1
#define DRM_IF_MINOR 4
+struct drm_prime_file_private;
+struct dma_buf;
+
/* drm_file.c */
extern struct mutex drm_global_mutex;
struct drm_file *drm_file_alloc(struct drm_minor *minor);
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 03/15] drm/doc: switch drm_connector_state to inline comments
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
2018-07-09 8:40 ` [PATCH 01/15] drm: move drv test macros out of drmP.h Daniel Vetter
2018-07-09 8:40 ` [PATCH 02/15] drm: Drop drmP.h from drm_connector.c Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-12 13:54 ` Sean Paul
2018-07-09 8:40 ` [PATCH 04/15] drm/doc: polish for sturct drm_connector Daniel Vetter
` (11 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
For consistency. Also spelled out the docs for ->best_encoder a bit
more while at it.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
include/drm/drm_connector.h | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index ad397dfc042b..6028638f3108 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -374,12 +374,9 @@ struct drm_tv_connector_state {
/**
* struct drm_connector_state - mutable connector state
- * @connector: backpointer to the connector
- * @best_encoder: can be used by helpers and drivers to select the encoder
- * @state: backpointer to global drm_atomic_state
- * @tv: TV connector state
*/
struct drm_connector_state {
+ /** @connector: backpointer to the connector */
struct drm_connector *connector;
/**
@@ -390,6 +387,13 @@ struct drm_connector_state {
*/
struct drm_crtc *crtc;
+ /**
+ * @best_encoder:
+ *
+ * Used by the atomic helpers to select the encoder, through the
+ * &drm_connector_helper_funcs.atomic_best_encoder or
+ * &drm_connector_helper_funcs.best_encoder callbacks.
+ */
struct drm_encoder *best_encoder;
/**
@@ -398,6 +402,7 @@ struct drm_connector_state {
*/
enum drm_link_status link_status;
+ /** @state: backpointer to global drm_atomic_state */
struct drm_atomic_state *state;
/**
@@ -407,6 +412,7 @@ struct drm_connector_state {
*/
struct drm_crtc_commit *commit;
+ /** @tv: TV connector state */
struct drm_tv_connector_state tv;
/**
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 04/15] drm/doc: polish for sturct drm_connector
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (2 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 03/15] drm/doc: switch drm_connector_state to inline comments Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-12 14:01 ` Sean Paul
2018-07-09 8:40 ` [PATCH 05/15] drm: drop _mode_ from update_edit_property() Daniel Vetter
` (10 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
- switch everything over to inline comments
- add notes about locking, links to functions and other related stuff
- also include a note about Ville's soon-to-be-merged
drm_connector_for_each_possible_encoder().
Also check that all the hyperlinks in drm_connector.h work and fix
them as needed.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
include/drm/drm_connector.h | 191 ++++++++++++++++++++++--------------
1 file changed, 120 insertions(+), 71 deletions(-)
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 6028638f3108..a0300e3468cb 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -557,8 +557,7 @@ struct drm_connector_funcs {
* received for this output connector->edid must be NULL.
*
* Drivers using the probe helpers should use
- * drm_helper_probe_single_connector_modes() or
- * drm_helper_probe_single_connector_modes_nomerge() to implement this
+ * drm_helper_probe_single_connector_modes() to implement this
* function.
*
* RETURNS:
@@ -769,45 +768,6 @@ struct drm_cmdline_mode {
/**
* struct drm_connector - central DRM connector control structure
- * @dev: parent DRM device
- * @kdev: kernel device for sysfs attributes
- * @attr: sysfs attributes
- * @head: list management
- * @base: base KMS object
- * @name: human readable name, can be overwritten by the driver
- * @connector_type: one of the DRM_MODE_CONNECTOR_<foo> types from drm_mode.h
- * @connector_type_id: index into connector type enum
- * @interlace_allowed: can this connector handle interlaced modes?
- * @doublescan_allowed: can this connector handle doublescan?
- * @stereo_allowed: can this connector handle stereo modes?
- * @funcs: connector control functions
- * @edid_blob_ptr: DRM property containing EDID if present
- * @properties: property tracking for this connector
- * @dpms: current dpms state
- * @helper_private: mid-layer private data
- * @cmdline_mode: mode line parsed from the kernel cmdline for this connector
- * @force: a DRM_FORCE_<foo> state for forced mode sets
- * @override_edid: has the EDID been overwritten through debugfs for testing?
- * @encoder_ids: valid encoders for this connector
- * @eld: EDID-like data, if present
- * @latency_present: AV delay info from ELD, if found
- * @video_latency: video latency info from ELD, if found
- * @audio_latency: audio latency info from ELD, if found
- * @null_edid_counter: track sinks that give us all zeros for the EDID
- * @bad_edid_counter: track sinks that give us an EDID with invalid checksum
- * @edid_corrupt: indicates whether the last read EDID was corrupt
- * @debugfs_entry: debugfs directory for this connector
- * @has_tile: is this connector connected to a tiled monitor
- * @tile_group: tile group for the connected monitor
- * @tile_is_single_monitor: whether the tile is one monitor housing
- * @num_h_tile: number of horizontal tiles in the tile group
- * @num_v_tile: number of vertical tiles in the tile group
- * @tile_h_loc: horizontal location of this tile
- * @tile_v_loc: vertical location of this tile
- * @tile_h_size: horizontal size of this tile.
- * @tile_v_size: vertical size of this tile.
- * @scaling_mode_property: Optional atomic property to control the upscaling.
- * @content_protection_property: Optional property to control content protection
*
* Each connector may be connected to one or more CRTCs, or may be clonable by
* another connector if they can share a CRTC. Each connector also has a specific
@@ -815,13 +775,27 @@ struct drm_cmdline_mode {
* span multiple monitors).
*/
struct drm_connector {
+ /** @dev: parent DRM device */
struct drm_device *dev;
+ /** @kdev: kernel device for sysfs attributes */
struct device *kdev;
+ /** @attr: sysfs attributes */
struct device_attribute *attr;
+
+ /**
+ * @head:
+ *
+ * List of all connectors on a @dev, linked from
+ * &drm_mode_config.connector_list. Protected by
+ * &drm_mode_config.connector_list_lock, but please only use
+ * &drm_connector_list_iter to walk this list.
+ */
struct list_head head;
+ /** @base: base KMS object */
struct drm_mode_object base;
+ /** @name: human readable name, can be overwritten by the driver */
char *name;
/**
@@ -839,10 +813,30 @@ struct drm_connector {
*/
unsigned index;
+ /**
+ * @connector_type:
+ * one of the DRM_MODE_CONNECTOR_<foo> types from drm_mode.h
+ */
int connector_type;
+ /** @connector_type_id: index into connector type enum */
int connector_type_id;
+ /**
+ * @interlace_allowed:
+ * Can this connector handle interlaced modes? Only used by
+ * drm_helper_probe_single_connector_modes() for mode filtering.
+ */
bool interlace_allowed;
+ /**
+ * @doublescan_allowed:
+ * Can this connector handle doublescan? Only used by
+ * drm_helper_probe_single_connector_modes() for mode filtering.
+ */
bool doublescan_allowed;
+ /**
+ * @stereo_allowed:
+ * Can this connector handle stereo modes? Only used by
+ * drm_helper_probe_single_connector_modes() for mode filtering.
+ */
bool stereo_allowed;
/**
@@ -891,45 +885,42 @@ struct drm_connector {
* Protected by &drm_mode_config.mutex.
*/
struct drm_display_info display_info;
+
+ /** @funcs: connector control functions */
const struct drm_connector_funcs *funcs;
+ /**
+ * @edid_blob_ptr: DRM property containing EDID if present. Protected by
+ * &drm_mode_config.mutex. This should be updated only by calling
+ * drm_mode_connector_update_edid_property().
+ */
struct drm_property_blob *edid_blob_ptr;
+
+ /** @properties: property tracking for this connector */
struct drm_object_properties properties;
+ /**
+ * @scaling_mode_property: Optional atomic property to control the
+ * upscaling. See drm_connector_attach_content_protection_property().
+ */
struct drm_property *scaling_mode_property;
/**
* @content_protection_property: DRM ENUM property for content
- * protection
+ * protection. See drm_connector_attach_content_protection_property().
*/
struct drm_property *content_protection_property;
/**
* @path_blob_ptr:
*
- * DRM blob property data for the DP MST path property.
+ * DRM blob property data for the DP MST path property. This should only
+ * be updated by calling drm_mode_connector_set_path_property().
*/
struct drm_property_blob *path_blob_ptr;
- /**
- * @tile_blob_ptr:
- *
- * DRM blob property data for the tile property (used mostly by DP MST).
- * This is meant for screens which are driven through separate display
- * pipelines represented by &drm_crtc, which might not be running with
- * genlocked clocks. For tiled panels which are genlocked, like
- * dual-link LVDS or dual-link DSI, the driver should try to not expose
- * the tiling and virtualize both &drm_crtc and &drm_plane if needed.
- */
- struct drm_property_blob *tile_blob_ptr;
-
-/* should we poll this connector for connects and disconnects */
-/* hot plug detectable */
#define DRM_CONNECTOR_POLL_HPD (1 << 0)
-/* poll for connections */
#define DRM_CONNECTOR_POLL_CONNECT (1 << 1)
-/* can cleanly poll for disconnections without flickering the screen */
-/* DACs should rarely do this without a lot of testing */
#define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2)
/**
@@ -946,25 +937,40 @@ struct drm_connector {
* Periodically poll the connector for connection.
*
* DRM_CONNECTOR_POLL_DISCONNECT
- * Periodically poll the connector for disconnection.
+ * Periodically poll the connector for disconnection, without
+ * causing flickering even when the connector is in use. DACs should
+ * rarely do this without a lot of testing.
*
* Set to 0 for connectors that don't support connection status
* discovery.
*/
uint8_t polled;
- /* requested DPMS state */
+ /**
+ * @dpms: Current dpms state. For legacy drivers the
+ * &drm_connector_funcs.dpms callback must update this. For atomic
+ * drivers, this is handled by the core atomic code, and drivers must
+ * only take &drm_crtc_state.active into account.
+ */
int dpms;
+ /** @helper_private: mid-layer private data */
const struct drm_connector_helper_funcs *helper_private;
- /* forced on connector */
+ /** @cmdline_mode: mode line parsed from the kernel cmdline for this connector */
struct drm_cmdline_mode cmdline_mode;
+ /** @force: a DRM_FORCE_<foo> state for forced mode sets */
enum drm_connector_force force;
+ /** @override_edid: has the EDID been overwritten through debugfs for testing? */
bool override_edid;
#define DRM_CONNECTOR_MAX_ENCODER 3
+ /**
+ * @encoder_ids: Valid encoders for this connector. Please only use
+ * drm_connector_for_each_possible_encoder() to enumerate these.
+ */
uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
+
/**
* @encoder: Currently bound encoder driving this connector, if any.
* Only really meaningful for non-atomic drivers. Atomic drivers should
@@ -974,19 +980,37 @@ struct drm_connector {
struct drm_encoder *encoder;
#define MAX_ELD_BYTES 128
- /* EDID bits */
+ /** @eld: EDID-like data, if present */
uint8_t eld[MAX_ELD_BYTES];
+ /** @latency_present: AV delay info from ELD, if found */
bool latency_present[2];
- int video_latency[2]; /* [0]: progressive, [1]: interlaced */
+ /**
+ * @video_latency: Video latency info from ELD, if found.
+ * [0]: progressive, [1]: interlaced
+ */
+ int video_latency[2];
+ /**
+ * @audio_latency: audio latency info from ELD, if found
+ * [0]: progressive, [1]: interlaced
+ */
int audio_latency[2];
- int null_edid_counter; /* needed to workaround some HW bugs where we get all 0s */
+ /**
+ * @null_edid_counter: track sinks that give us all zeros for the EDID.
+ * Needed to workaround some HW bugs where we get all 0s
+ */
+ int null_edid_counter;
+
+ /** @bad_edid_counter: track sinks that give us an EDID with invalid checksum */
unsigned bad_edid_counter;
- /* Flag for raw EDID header corruption - used in Displayport
- * compliance testing - * Displayport Link CTS Core 1.2 rev1.1 4.2.2.6
+ /**
+ * @edid_corrupt: Indicates whether the last read EDID was corrupt. Used
+ * in Displayport compliance testing - Displayport Link CTS Core 1.2
+ * rev1.1 4.2.2.6
*/
bool edid_corrupt;
+ /** @debugfs_entry: debugfs directory for this connector */
struct dentry *debugfs_entry;
/**
@@ -994,7 +1018,7 @@ struct drm_connector {
*
* Current atomic state for this connector.
*
- * This is protected by @drm_mode_config.connection_mutex. Note that
+ * This is protected by &drm_mode_config.connection_mutex. Note that
* nonblocking atomic commits access the current connector state without
* taking locks. Either by going through the &struct drm_atomic_state
* pointers, see for_each_oldnew_connector_in_state(),
@@ -1005,19 +1029,44 @@ struct drm_connector {
*/
struct drm_connector_state *state;
- /* DisplayID bits */
+ /* DisplayID bits. FIXME: Extract into a substruct? */
+
+ /**
+ * @tile_blob_ptr:
+ *
+ * DRM blob property data for the tile property (used mostly by DP MST).
+ * This is meant for screens which are driven through separate display
+ * pipelines represented by &drm_crtc, which might not be running with
+ * genlocked clocks. For tiled panels which are genlocked, like
+ * dual-link LVDS or dual-link DSI, the driver should try to not expose
+ * the tiling and virtualize both &drm_crtc and &drm_plane if needed.
+ *
+ * This should only be updated by calling
+ * drm_mode_connector_set_tile_property().
+ */
+ struct drm_property_blob *tile_blob_ptr;
+
+ /** @has_tile: is this connector connected to a tiled monitor */
bool has_tile;
+ /** @tile_group: tile group for the connected monitor */
struct drm_tile_group *tile_group;
+ /** @tile_is_single_monitor: whether the tile is one monitor housing */
bool tile_is_single_monitor;
+ /** @num_h_tile: number of horizontal tiles in the tile group */
+ /** @num_v_tile: number of vertical tiles in the tile group */
uint8_t num_h_tile, num_v_tile;
+ /** @tile_h_loc: horizontal location of this tile */
+ /** @tile_v_loc: vertical location of this tile */
uint8_t tile_h_loc, tile_v_loc;
+ /** @tile_h_size: horizontal size of this tile. */
+ /** @tile_v_size: vertical size of this tile. */
uint16_t tile_h_size, tile_v_size;
/**
* @free_node:
*
- * List used only by &drm_connector_iter to be able to clean up a
+ * List used only by &drm_connector_list_iter to be able to clean up a
* connector from any context, in conjunction with
* &drm_mode_config.connector_free_work.
*/
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 05/15] drm: drop _mode_ from update_edit_property()
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (3 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 04/15] drm/doc: polish for sturct drm_connector Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-13 14:59 ` Sean Paul
2018-07-09 8:40 ` [PATCH 06/15] drm: drop _mode_ from drm_mode_connector_attach_encoder Daniel Vetter
` (9 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
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.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 ++--
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++--
drivers/gpu/drm/ast/ast_mode.c | 4 ++--
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix-anx78xx.c | 4 ++--
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 ++--
drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +-
drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 2 +-
drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 +-
drivers/gpu/drm/bridge/sii902x.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
drivers/gpu/drm/bridge/tc358767.c | 2 +-
drivers/gpu/drm/bridge/ti-tfp410.c | 2 +-
drivers/gpu/drm/drm_connector.c | 8 ++++----
drivers/gpu/drm/drm_debugfs.c | 4 ++--
drivers/gpu/drm/drm_probe_helper.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +-
drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +-
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +-
drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
drivers/gpu/drm/i915/intel_dp.c | 2 +-
drivers/gpu/drm/i915/intel_lvds.c | 2 +-
drivers/gpu/drm/i915/intel_modes.c | 2 +-
drivers/gpu/drm/i915/intel_sdvo.c | 2 +-
drivers/gpu/drm/imx/imx-ldb.c | 2 +-
drivers/gpu/drm/imx/imx-tve.c | 2 +-
drivers/gpu/drm/imx/parallel-display.c | 2 +-
drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
drivers/gpu/drm/msm/edp/edp_connector.c | 2 +-
drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
drivers/gpu/drm/omapdrm/omap_connector.c | 4 ++--
drivers/gpu/drm/panel/panel-simple.c | 2 +-
drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++--
drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 ++--
drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +-
drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/tegra/output.c | 2 +-
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 +-
drivers/gpu/drm/udl/udl_connector.c | 2 +-
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
drivers/gpu/drm/zte/zx_hdmi.c | 2 +-
drivers/gpu/drm/zte/zx_vga.c | 2 +-
drivers/staging/vboxvideo/vbox_mode.c | 2 +-
include/drm/drm_connector.h | 6 +++---
include/drm/drm_modeset_helper_vtables.h | 2 +-
56 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index 881f7cb7ae6e..c770d73352a7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -334,11 +334,11 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector)
int ret;
if (amdgpu_connector->edid) {
- drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid);
+ drm_connector_update_edid_property(connector, amdgpu_connector->edid);
ret = drm_add_edid_modes(connector, amdgpu_connector->edid);
return ret;
}
- drm_mode_connector_update_edid_property(connector, NULL);
+ drm_connector_update_edid_property(connector, NULL);
return 0;
}
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index f0fc3067ab5d..b93fa4b3841f 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -900,14 +900,14 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
(struct edid *) sink->dc_edid.raw_edid;
- drm_mode_connector_update_edid_property(connector,
+ drm_connector_update_edid_property(connector,
aconnector->edid);
}
amdgpu_dm_add_sink_to_freesync_module(connector, aconnector->edid);
} else {
amdgpu_dm_remove_sink_from_freesync_module(connector);
- drm_mode_connector_update_edid_property(connector, NULL);
+ drm_connector_update_edid_property(connector, NULL);
aconnector->num_modes = 0;
aconnector->dc_sink = NULL;
aconnector->edid = NULL;
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 4304d9e408b8..581bb75d08eb 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -233,7 +233,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
if (!edid) {
- drm_mode_connector_update_edid_property(
+ drm_connector_update_edid_property(
&aconnector->base,
NULL);
return ret;
@@ -261,7 +261,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
connector, aconnector->edid);
}
- drm_mode_connector_update_edid_property(
+ drm_connector_update_edid_property(
&aconnector->base, aconnector->edid);
ret = drm_add_edid_modes(connector, aconnector->edid);
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 036dff8a1f33..1bb8174ad155 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -790,12 +790,12 @@ static int ast_get_modes(struct drm_connector *connector)
if (!flags)
edid = drm_get_edid(connector, &ast_connector->i2c->adapter);
if (edid) {
- drm_mode_connector_update_edid_property(&ast_connector->base, edid);
+ drm_connector_update_edid_property(&ast_connector->base, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
return ret;
} else
- drm_mode_connector_update_edid_property(&ast_connector->base, NULL);
+ drm_connector_update_edid_property(&ast_connector->base, NULL);
return 0;
}
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 73021b388e12..1f4745953aca 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -601,7 +601,7 @@ static int adv7511_get_modes(struct adv7511 *adv7511,
__adv7511_power_off(adv7511);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
count = drm_add_edid_modes(connector, edid);
adv7511_set_config_csc(adv7511, connector, adv7511->rgb,
diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
index b49043866be6..37f947dcadec 100644
--- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
@@ -969,8 +969,8 @@ static int anx78xx_get_modes(struct drm_connector *connector)
goto unlock;
}
- err = drm_mode_connector_update_edid_property(connector,
- anx78xx->edid);
+ err = drm_connector_update_edid_property(connector,
+ anx78xx->edid);
if (err) {
DRM_ERROR("Failed to update EDID property: %d\n", err);
goto unlock;
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 2bcbfadb6ac5..288c015f7460 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1119,8 +1119,8 @@ static int analogix_dp_get_modes(struct drm_connector *connector)
edid = drm_get_edid(connector, &dp->aux.ddc);
pm_runtime_put(dp->dev);
if (edid) {
- drm_mode_connector_update_edid_property(&dp->connector,
- edid);
+ drm_connector_update_edid_property(&dp->connector,
+ edid);
num_modes += drm_add_edid_modes(&dp->connector, edid);
kfree(edid);
}
diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
index 9837c8d69e69..da99b8ba4ee1 100644
--- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
+++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
@@ -55,7 +55,7 @@ static int dumb_vga_get_modes(struct drm_connector *connector)
goto fallback;
}
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
return ret;
diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
index 7ccadba7c98c..b49b543bd1f6 100644
--- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
@@ -152,7 +152,7 @@ static int ge_b850v3_lvds_get_modes(struct drm_connector *connector)
ge_b850v3_lvds_ptr->edid = (struct edid *)stdp2690_get_edid(client);
if (ge_b850v3_lvds_ptr->edid) {
- drm_mode_connector_update_edid_property(connector,
+ drm_connector_update_edid_property(connector,
ge_b850v3_lvds_ptr->edid);
num_modes = drm_add_edid_modes(connector,
ge_b850v3_lvds_ptr->edid);
diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
index d64a3283822a..bd5c191858cb 100644
--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
+++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
@@ -222,7 +222,7 @@ static int ptn3460_get_modes(struct drm_connector *connector)
}
ptn_bridge->edid = (struct edid *)edid;
- drm_mode_connector_update_edid_property(connector, ptn_bridge->edid);
+ drm_connector_update_edid_property(connector, ptn_bridge->edid);
num_modes = drm_add_edid_modes(connector, ptn_bridge->edid);
diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index 60373d7eb220..cd331933c230 100644
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -170,7 +170,7 @@ static int sii902x_get_modes(struct drm_connector *connector)
return ret;
edid = drm_get_edid(connector, sii902x->i2c->adapter);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
if (edid) {
num = drm_add_edid_modes(connector, edid);
kfree(edid);
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 3c136f2b954f..ab32aceb6f24 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1922,7 +1922,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
index 0fd9cf27542c..ee2fd0a349b3 100644
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -1140,7 +1140,7 @@ static int tc_connector_get_modes(struct drm_connector *connector)
if (!edid)
return 0;
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
count = drm_add_edid_modes(connector, edid);
return count;
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index acb857030951..c81bf7910bbe 100644
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -62,7 +62,7 @@ static int tfp410_get_modes(struct drm_connector *connector)
goto fallback;
}
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
return drm_add_edid_modes(connector, edid);
fallback:
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index dc5a480200d8..ccb70a4490d3 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -818,7 +818,7 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
* Blob property which contains the current EDID read from the sink. This
* is useful to parse sink identification information like vendor, model
* and serial. Drivers should update this property by calling
- * drm_mode_connector_update_edid_property(), usually after having parsed
+ * drm_connector_update_edid_property(), usually after having parsed
* the EDID using drm_add_edid_modes(). Userspace cannot change this
* property.
* DPMS:
@@ -1501,7 +1501,7 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector)
EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
/**
- * drm_mode_connector_update_edid_property - update the edid property of a connector
+ * drm_connector_update_edid_property - update the edid property of a connector
* @connector: drm connector
* @edid: new value of the edid property
*
@@ -1511,7 +1511,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
* Returns:
* Zero on success, negative errno on failure.
*/
-int drm_mode_connector_update_edid_property(struct drm_connector *connector,
+int drm_connector_update_edid_property(struct drm_connector *connector,
const struct edid *edid)
{
struct drm_device *dev = connector->dev;
@@ -1550,7 +1550,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
dev->mode_config.edid_property);
return ret;
}
-EXPORT_SYMBOL(drm_mode_connector_update_edid_property);
+EXPORT_SYMBOL(drm_connector_update_edid_property);
/**
* drm_mode_connector_set_link_status_property - Set link status property of a connector
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index b2482818fee8..df8ca4548f9f 100644
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -307,13 +307,13 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,
if (len == 5 && !strncmp(buf, "reset", 5)) {
connector->override_edid = false;
- ret = drm_mode_connector_update_edid_property(connector, NULL);
+ ret = drm_connector_update_edid_property(connector, NULL);
} else if (len < EDID_LENGTH ||
EDID_LENGTH * (1 + edid->extensions) > len)
ret = -EINVAL;
else {
connector->override_edid = false;
- ret = drm_mode_connector_update_edid_property(connector, edid);
+ ret = drm_connector_update_edid_property(connector, edid);
if (!ret)
connector->override_edid = true;
}
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 1a901fe9e23e..3470ca507df3 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -471,7 +471,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
if (connector->status == connector_status_disconnected) {
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",
connector->base.id, connector->name);
- drm_mode_connector_update_edid_property(connector, NULL);
+ drm_connector_update_edid_property(connector, NULL);
verbose_prune = false;
goto prune;
}
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index e6b0940b1ac2..dfea61edba4a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -319,7 +319,7 @@ static int vidi_get_modes(struct drm_connector *connector)
return -ENOMEM;
}
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
return drm_add_edid_modes(connector, edid);
}
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index db91932550cf..6672d0ff0423 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -888,7 +888,7 @@ static int hdmi_get_modes(struct drm_connector *connector)
(hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
edid->width_cm, edid->height_cm);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
ret = drm_add_edid_modes(connector, edid);
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 5ea785f07ba8..90ed20083009 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1770,7 +1770,7 @@ static int cdv_intel_dp_get_modes(struct drm_connector *connector)
edid = drm_get_edid(connector, &intel_dp->adapter);
if (edid) {
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
}
diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index f0878998526a..4e4e4a66eaee 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -216,7 +216,7 @@ static int cdv_hdmi_get_modes(struct drm_connector *connector)
edid = drm_get_edid(connector, &gma_encoder->i2c_bus->adapter);
if (edid) {
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
}
diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
index 78566a80ad25..c6d72de1c054 100644
--- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
+++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
@@ -578,7 +578,7 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector)
}
if (edid) {
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
}
return ret;
diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
index e6943fef0611..83babb815a5d 100644
--- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
+++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
@@ -376,7 +376,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
* preferred mode is the right one.
*/
if (edid) {
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
drm_add_edid_modes(connector, edid);
kfree(edid);
diff --git a/drivers/gpu/drm/gma500/psb_intel_modes.c b/drivers/gpu/drm/gma500/psb_intel_modes.c
index e5360726d80b..fb4da3cd6681 100644
--- a/drivers/gpu/drm/gma500/psb_intel_modes.c
+++ b/drivers/gpu/drm/gma500/psb_intel_modes.c
@@ -66,7 +66,7 @@ int psb_intel_ddc_get_modes(struct drm_connector *connector,
edid = drm_get_edid(connector, adapter);
if (edid) {
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
}
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 1d40746ab625..dd3cec0e3190 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -1472,7 +1472,7 @@ static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector)
bool connector_is_digital = !!IS_TMDS(psb_intel_sdvo_connector);
if (connector_is_digital == monitor_is_digital) {
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
drm_add_edid_modes(connector, edid);
}
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index 0038c976536a..d434f576e6b2 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1243,7 +1243,7 @@ static int tda998x_connector_get_modes(struct drm_connector *connector)
return 0;
}
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
n = drm_add_edid_modes(connector, edid);
kfree(edid);
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5be07e1d816d..2f3e92167c5f 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -6212,7 +6212,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
edid = drm_get_edid(connector, &intel_dp->aux.ddc);
if (edid) {
if (drm_add_edid_modes(connector, edid)) {
- drm_mode_connector_update_edid_property(connector,
+ drm_connector_update_edid_property(connector,
edid);
} else {
kfree(edid);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index bb06744d28a4..ca55b0a82ba6 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -1131,7 +1131,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
intel_gmbus_get_adapter(dev_priv, pin));
if (edid) {
if (drm_add_edid_modes(connector, edid)) {
- drm_mode_connector_update_edid_property(connector,
+ drm_connector_update_edid_property(connector,
edid);
} else {
kfree(edid);
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
index b39846613e3c..ca44bf368e24 100644
--- a/drivers/gpu/drm/i915/intel_modes.c
+++ b/drivers/gpu/drm/i915/intel_modes.c
@@ -40,7 +40,7 @@ int intel_connector_update_modes(struct drm_connector *connector,
{
int ret;
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
return ret;
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index 396cb59ca4b8..812fe7b06f87 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1911,7 +1911,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
if (edid != NULL) {
if (intel_sdvo_connector_matches_edid(to_intel_sdvo_connector(connector),
edid)) {
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
drm_add_edid_modes(connector, edid);
}
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index 56dd7a9a8e25..ae81cbb75f51 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -143,7 +143,7 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)
imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc);
if (imx_ldb_ch->edid) {
- drm_mode_connector_update_edid_property(connector,
+ drm_connector_update_edid_property(connector,
imx_ldb_ch->edid);
num_modes = drm_add_edid_modes(connector, imx_ldb_ch->edid);
}
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index bc27c2699464..1a4ced5c09b5 100644
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -235,7 +235,7 @@ static int imx_tve_connector_get_modes(struct drm_connector *connector)
edid = drm_get_edid(connector, tve->ddc);
if (edid) {
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
}
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index aedecda9728a..4fc1cf583435 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -63,7 +63,7 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
}
if (imxpd->edid) {
- drm_mode_connector_update_edid_property(connector, imxpd->edid);
+ drm_connector_update_edid_property(connector, imxpd->edid);
num_modes = drm_add_edid_modes(connector, imxpd->edid);
}
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 59a11026dceb..835313940395 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1220,7 +1220,7 @@ static int mtk_hdmi_conn_get_modes(struct drm_connector *conn)
hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
- drm_mode_connector_update_edid_property(conn, edid);
+ drm_connector_update_edid_property(conn, edid);
ret = drm_add_edid_modes(conn, edid);
kfree(edid);
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 8918539a19aa..5f104f139197 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1553,7 +1553,7 @@ static int mga_vga_get_modes(struct drm_connector *connector)
edid = drm_get_edid(connector, &mga_connector->i2c->adapter);
if (edid) {
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
}
diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
index 6f3fc6b0f0a3..0b5eac054195 100644
--- a/drivers/gpu/drm/msm/edp/edp_connector.c
+++ b/drivers/gpu/drm/msm/edp/edp_connector.c
@@ -56,7 +56,7 @@ static int edp_connector_get_modes(struct drm_connector *connector)
if (ret)
return ret;
- drm_mode_connector_update_edid_property(connector, drm_edid);
+ drm_connector_update_edid_property(connector, drm_edid);
if (drm_edid)
ret = drm_add_edid_modes(connector, drm_edid);
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index c0848dfedd50..07feacc5a441 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -392,7 +392,7 @@ static int msm_hdmi_connector_get_modes(struct drm_connector *connector)
hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl);
hdmi->hdmi_mode = drm_detect_hdmi_monitor(edid);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
if (edid) {
ret = drm_add_edid_modes(connector, edid);
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index b83465ae7c1b..2fabb69e452b 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -850,7 +850,7 @@ nv50_mstc_get_modes(struct drm_connector *connector)
int ret = 0;
mstc->edid = drm_dp_mst_get_edid(&mstc->connector, mstc->port->mgr, mstc->port);
- drm_mode_connector_update_edid_property(&mstc->connector, mstc->edid);
+ drm_connector_update_edid_property(&mstc->connector, mstc->edid);
if (mstc->edid)
ret = drm_add_edid_modes(&mstc->connector, mstc->edid);
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index bb46c1d489cf..22a15478d23d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -550,7 +550,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
/* Cleanup the previous EDID block. */
if (nv_connector->edid) {
- drm_mode_connector_update_edid_property(connector, NULL);
+ drm_connector_update_edid_property(connector, NULL);
kfree(nv_connector->edid);
nv_connector->edid = NULL;
}
@@ -575,7 +575,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
else
nv_connector->edid = drm_get_edid(connector, i2c);
- drm_mode_connector_update_edid_property(connector,
+ drm_connector_update_edid_property(connector,
nv_connector->edid);
if (!nv_connector->edid) {
NV_ERROR(drm, "DDC responded, but no EDID for %s\n",
@@ -657,7 +657,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
/* Cleanup the previous EDID block. */
if (nv_connector->edid) {
- drm_mode_connector_update_edid_property(connector, NULL);
+ drm_connector_update_edid_property(connector, NULL);
kfree(nv_connector->edid);
nv_connector->edid = NULL;
}
@@ -721,7 +721,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
status = connector_status_unknown;
#endif
- drm_mode_connector_update_edid_property(connector, nv_connector->edid);
+ drm_connector_update_edid_property(connector, nv_connector->edid);
nouveau_connector_set_encoder(connector, nv_encoder);
return status;
}
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index 5cde26ac937b..2ddb856666c4 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -126,14 +126,14 @@ static int omap_connector_get_modes(struct drm_connector *connector)
if ((dssdrv->read_edid(dssdev, edid, MAX_EDID) > 0) &&
drm_edid_is_valid(edid)) {
- drm_mode_connector_update_edid_property(
+ drm_connector_update_edid_property(
connector, edid);
n = drm_add_edid_modes(connector, edid);
omap_connector->hdmi_mode =
drm_detect_hdmi_monitor(edid);
} else {
- drm_mode_connector_update_edid_property(
+ drm_connector_update_edid_property(
connector, NULL);
}
diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
index ac6aaa174c0b..3c229d134359 100644
--- a/drivers/gpu/drm/panel/panel-simple.c
+++ b/drivers/gpu/drm/panel/panel-simple.c
@@ -252,7 +252,7 @@ static int panel_simple_get_modes(struct drm_panel *panel)
/* probe EDID if a DDC bus is available */
if (p->ddc) {
struct edid *edid = drm_get_edid(panel->connector, p->ddc);
- drm_mode_connector_update_edid_property(panel->connector, edid);
+ drm_connector_update_edid_property(panel->connector, edid);
if (edid) {
num += drm_add_edid_modes(panel->connector, edid);
kfree(edid);
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 0655698f2956..414642e5b7a3 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -368,11 +368,11 @@ static int radeon_ddc_get_modes(struct drm_connector *connector)
int ret;
if (radeon_connector->edid) {
- drm_mode_connector_update_edid_property(connector, radeon_connector->edid);
+ drm_connector_update_edid_property(connector, radeon_connector->edid);
ret = drm_add_edid_modes(connector, radeon_connector->edid);
return ret;
}
- drm_mode_connector_update_edid_property(connector, NULL);
+ drm_connector_update_edid_property(connector, NULL);
return 0;
}
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
index cd8a3ee16649..37956cfc0b6d 100644
--- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -195,11 +195,11 @@ static int radeon_dp_mst_get_ddc_modes(struct drm_connector *connector)
radeon_connector->edid = edid;
DRM_DEBUG_KMS("edid retrieved %p\n", edid);
if (radeon_connector->edid) {
- drm_mode_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
+ drm_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
ret = drm_add_edid_modes(&radeon_connector->base, radeon_connector->edid);
return ret;
}
- drm_mode_connector_update_edid_property(&radeon_connector->base, NULL);
+ drm_connector_update_edid_property(&radeon_connector->base, NULL);
return ret;
}
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index c6fbdcd87c16..a40cb2be50e1 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -275,7 +275,7 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
dp->sink_has_audio = drm_detect_monitor_audio(edid);
ret = drm_add_edid_modes(connector, edid);
if (ret)
- drm_mode_connector_update_edid_property(connector,
+ drm_connector_update_edid_property(connector,
edid);
}
mutex_unlock(&dp->lock);
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 88d0774c97bd..510fcb33e31d 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -565,7 +565,7 @@ static int inno_hdmi_connector_get_modes(struct drm_connector *connector)
if (edid) {
hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid);
hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
}
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 58f431102512..0c3008356ab8 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -977,7 +977,7 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid);
count = drm_add_edid_modes(connector, edid);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
kfree(edid);
return count;
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index fa4bcd092eaf..9b4b1d015423 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -220,7 +220,7 @@ static int sun4i_hdmi_get_modes(struct drm_connector *connector)
DRM_DEBUG_DRIVER("Monitor is %s monitor\n",
hdmi->hdmi_monitor ? "an HDMI" : "a DVI");
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
cec_s_phys_addr_from_edid(hdmi->cec_adap, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
index ffe34bd0bb9d..983657c47067 100644
--- a/drivers/gpu/drm/tegra/output.c
+++ b/drivers/gpu/drm/tegra/output.c
@@ -37,7 +37,7 @@ int tegra_output_connector_get_modes(struct drm_connector *connector)
edid = drm_get_edid(connector, output->ddc);
cec_notifier_set_phys_addr_from_edid(output->notifier, edid);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
if (edid) {
err = drm_add_edid_modes(connector, edid);
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index c45cabb38db0..46dacca3cce8 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -173,7 +173,7 @@ static int tfp410_connector_get_modes(struct drm_connector *connector)
edid = drm_get_edid(connector, tfp410_connector->mod->i2c);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
if (edid) {
ret = drm_add_edid_modes(connector, edid);
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index 09dc585aa46f..8fac12e1a1a4 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -99,7 +99,7 @@ static int udl_get_modes(struct drm_connector *connector)
struct udl_drm_connector,
connector);
- drm_mode_connector_update_edid_property(connector, udl_connector->edid);
+ drm_connector_update_edid_property(connector, udl_connector->edid);
if (udl_connector->edid)
return drm_add_edid_modes(connector, udl_connector->edid);
return 0;
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index b8d50533e2bb..91f284e1b908 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -285,7 +285,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
drm_rgb_quant_range_selectable(edid);
}
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
index 13ea90f7a185..d073c6737500 100644
--- a/drivers/gpu/drm/zte/zx_hdmi.c
+++ b/drivers/gpu/drm/zte/zx_hdmi.c
@@ -272,7 +272,7 @@ static int zx_hdmi_connector_get_modes(struct drm_connector *connector)
hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
index 3e7e33cd3dfa..3e78ee21b8d0 100644
--- a/drivers/gpu/drm/zte/zx_vga.c
+++ b/drivers/gpu/drm/zte/zx_vga.c
@@ -109,7 +109,7 @@ static int zx_vga_connector_get_modes(struct drm_connector *connector)
*/
zx_writel(vga->mmio + VGA_AUTO_DETECT_SEL, VGA_DETECT_SEL_HAS_DEVICE);
- drm_mode_connector_update_edid_property(connector, edid);
+ drm_connector_update_edid_property(connector, edid);
ret = drm_add_edid_modes(connector, edid);
kfree(edid);
diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
index 5c7ea237893e..a943d2f683ed 100644
--- a/drivers/staging/vboxvideo/vbox_mode.c
+++ b/drivers/staging/vboxvideo/vbox_mode.c
@@ -504,7 +504,7 @@ static void vbox_set_edid(struct drm_connector *connector, int width,
for (i = 0; i < EDID_SIZE - 1; ++i)
sum += edid[i];
edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
- drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
+ drm_connector_update_edid_property(connector, (struct edid *)edid);
}
static int vbox_get_modes(struct drm_connector *connector)
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index a0300e3468cb..9841d2b6d3eb 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -892,7 +892,7 @@ struct drm_connector {
/**
* @edid_blob_ptr: DRM property containing EDID if present. Protected by
* &drm_mode_config.mutex. This should be updated only by calling
- * drm_mode_connector_update_edid_property().
+ * drm_connector_update_edid_property().
*/
struct drm_property_blob *edid_blob_ptr;
@@ -1190,8 +1190,8 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev);
int drm_mode_connector_set_path_property(struct drm_connector *connector,
const char *path);
int drm_mode_connector_set_tile_property(struct drm_connector *connector);
-int drm_mode_connector_update_edid_property(struct drm_connector *connector,
- const struct edid *edid);
+int drm_connector_update_edid_property(struct drm_connector *connector,
+ const struct edid *edid);
void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
uint64_t link_status);
int drm_connector_init_panel_orientation_property(
diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
index 3b289773297c..5873d15821cf 100644
--- a/include/drm/drm_modeset_helper_vtables.h
+++ b/include/drm/drm_modeset_helper_vtables.h
@@ -785,7 +785,7 @@ struct drm_connector_helper_funcs {
*
* This function should fill in all modes currently valid for the sink
* into the &drm_connector.probed_modes list. It should also update the
- * EDID property by calling drm_mode_connector_update_edid_property().
+ * EDID property by calling drm_connector_update_edid_property().
*
* The usual way to implement this is to cache the EDID retrieved in the
* probe callback somewhere in the driver-private connector structure.
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 06/15] drm: drop _mode_ from drm_mode_connector_attach_encoder
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (4 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 05/15] drm: drop _mode_ from update_edit_property() Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-13 15:01 ` Sean Paul
2018-07-09 8:40 ` [PATCH 07/15] drm: drop _mode_ from remaining connector functions Daniel Vetter
` (8 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
Again to align with the usual prefix of just drm_connector_. Again
done with sed + manual fixup for indent issues.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
Documentation/gpu/drm-kms.rst | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +-
drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
drivers/gpu/drm/arc/arcpgu_sim.c | 2 +-
drivers/gpu/drm/ast/ast_mode.c | 2 +-
drivers/gpu/drm/bochs/bochs_kms.c | 2 +-
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
drivers/gpu/drm/bridge/analogix-anx78xx.c | 4 ++--
drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +-
drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +-
.../gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 2 +-
drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 +-
drivers/gpu/drm/bridge/panel.c | 2 +-
drivers/gpu/drm/bridge/parade-ps8622.c | 2 +-
drivers/gpu/drm/bridge/sii902x.c | 2 +-
drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
drivers/gpu/drm/bridge/tc358767.c | 2 +-
drivers/gpu/drm/bridge/ti-tfp410.c | 2 +-
drivers/gpu/drm/cirrus/cirrus_mode.c | 2 +-
drivers/gpu/drm/drm_connector.c | 10 +++++-----
drivers/gpu/drm/drm_simple_kms_helper.c | 2 +-
drivers/gpu/drm/drm_writeback.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_dpi.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +-
drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +-
drivers/gpu/drm/gma500/gma_display.c | 2 +-
drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +-
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +-
drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
drivers/gpu/drm/i915/intel_display.c | 3 +--
drivers/gpu/drm/i915/intel_dp_mst.c | 3 +--
drivers/gpu/drm/imx/imx-ldb.c | 3 +--
drivers/gpu/drm/imx/imx-tve.c | 2 +-
drivers/gpu/drm/imx/parallel-display.c | 2 +-
drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +-
drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +-
drivers/gpu/drm/meson/meson_venc_cvbs.c | 2 +-
drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +-
drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +-
drivers/gpu/drm/msm/edp/edp_connector.c | 2 +-
drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 ++++----
drivers/gpu/drm/omapdrm/omap_drv.c | 2 +-
drivers/gpu/drm/qxl/qxl_display.c | 2 +-
drivers/gpu/drm/radeon/radeon_encoders.c | 2 +-
drivers/gpu/drm/rcar-du/rcar_lvds.c | 2 +-
drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 2 +-
drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +-
drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +-
drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +-
drivers/gpu/drm/sti/sti_dvo.c | 2 +-
drivers/gpu/drm/sti/sti_hda.c | 2 +-
drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +-
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +-
drivers/gpu/drm/tegra/dsi.c | 2 +-
drivers/gpu/drm/tegra/hdmi.c | 2 +-
drivers/gpu/drm/tegra/rgb.c | 2 +-
drivers/gpu/drm/tegra/sor.c | 2 +-
drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 +-
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 +-
drivers/gpu/drm/udl/udl_connector.c | 2 +-
drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
drivers/gpu/drm/vc4/vc4_vec.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_display.c | 2 +-
drivers/gpu/drm/vkms/vkms_output.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
drivers/gpu/drm/zte/zx_hdmi.c | 2 +-
drivers/gpu/drm/zte/zx_tvenc.c | 2 +-
drivers/gpu/drm/zte/zx_vga.c | 2 +-
drivers/staging/vboxvideo/vbox_mode.c | 2 +-
include/drm/drm_connector.h | 2 +-
86 files changed, 94 insertions(+), 97 deletions(-)
diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst
index 514939433004..58eed08fbe31 100644
--- a/Documentation/gpu/drm-kms.rst
+++ b/Documentation/gpu/drm-kms.rst
@@ -466,7 +466,7 @@ Output discovery and initialization example
drm_encoder_init(dev, &intel_output->enc, &intel_crt_enc_funcs,
DRM_MODE_ENCODER_DAC);
- drm_mode_connector_attach_encoder(&intel_output->base,
+ drm_connector_attach_encoder(&intel_output->base,
&intel_output->enc);
/* Set up the DDC bus. */
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
index 94138abe093b..ae8fac34f7a5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
@@ -46,7 +46,7 @@ amdgpu_link_encoder_connector(struct drm_device *dev)
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
amdgpu_encoder = to_amdgpu_encoder(encoder);
if (amdgpu_encoder->devices & amdgpu_connector->devices) {
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
amdgpu_atombios_encoder_init_backlight(amdgpu_encoder, connector);
adev->mode_info.bl_encoder = amdgpu_encoder;
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index 016f15093173..677e96a56330 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
@@ -627,7 +627,7 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev,
drm_connector_register(connector);
/* link them */
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index b93fa4b3841f..a1e6aac9ed11 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -3660,7 +3660,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
link,
link_index);
- drm_mode_connector_attach_encoder(
+ drm_connector_attach_encoder(
&aconnector->base, &aencoder->base);
drm_connector_register(&aconnector->base);
diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c
index b8f6f9a5dfbe..68629e614990 100644
--- a/drivers/gpu/drm/arc/arcpgu_sim.c
+++ b/drivers/gpu/drm/arc/arcpgu_sim.c
@@ -99,7 +99,7 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
goto error_encoder_cleanup;
}
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret < 0) {
dev_err(drm->dev, "could not attach connector to encoder\n");
drm_connector_unregister(connector);
diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
index 1bb8174ad155..5e77d456d9bb 100644
--- a/drivers/gpu/drm/ast/ast_mode.c
+++ b/drivers/gpu/drm/ast/ast_mode.c
@@ -900,7 +900,7 @@ static int ast_connector_init(struct drm_device *dev)
connector->polled = DRM_CONNECTOR_POLL_CONNECT;
encoder = list_first_entry(&dev->mode_config.encoder_list, struct drm_encoder, head);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
ast_connector->i2c = ast_i2c_create(dev);
if (!ast_connector->i2c)
diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index 233980a78591..ca5a9afdd5cf 100644
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -259,7 +259,7 @@ int bochs_kms_init(struct bochs_device *bochs)
bochs_crtc_init(bochs->dev);
bochs_encoder_init(bochs->dev);
bochs_connector_init(bochs->dev);
- drm_mode_connector_attach_encoder(&bochs->connector,
+ drm_connector_attach_encoder(&bochs->connector,
&bochs->encoder);
return 0;
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 1f4745953aca..6437b878724a 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -860,7 +860,7 @@ static int adv7511_bridge_attach(struct drm_bridge *bridge)
}
drm_connector_helper_add(&adv->connector,
&adv7511_connector_helper_funcs);
- drm_mode_connector_attach_encoder(&adv->connector, bridge->encoder);
+ drm_connector_attach_encoder(&adv->connector, bridge->encoder);
if (adv->type == ADV7533)
ret = adv7533_attach_dsi(adv);
diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
index 37f947dcadec..f8433c93f463 100644
--- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
+++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
@@ -1048,8 +1048,8 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge)
anx78xx->connector.polled = DRM_CONNECTOR_POLL_HPD;
- err = drm_mode_connector_attach_encoder(&anx78xx->connector,
- bridge->encoder);
+ err = drm_connector_attach_encoder(&anx78xx->connector,
+ bridge->encoder);
if (err) {
DRM_ERROR("Failed to link up connector to encoder: %d\n", err);
return err;
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
index 288c015f7460..d68986cea132 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1210,7 +1210,7 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge)
drm_connector_helper_add(connector,
&analogix_dp_connector_helper_funcs);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
}
/*
diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
index da99b8ba4ee1..9b706789a341 100644
--- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
+++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
@@ -122,7 +122,7 @@ static int dumb_vga_attach(struct drm_bridge *bridge)
return ret;
}
- drm_mode_connector_attach_encoder(&vga->connector,
+ drm_connector_attach_encoder(&vga->connector,
bridge->encoder);
return 0;
diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
index b49b543bd1f6..2136c97aeb8e 100644
--- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
+++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
@@ -241,7 +241,7 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge)
return ret;
}
- ret = drm_mode_connector_attach_encoder(connector, bridge->encoder);
+ ret = drm_connector_attach_encoder(connector, bridge->encoder);
if (ret)
return ret;
diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
index bd5c191858cb..a3e817abace1 100644
--- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
+++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
@@ -265,7 +265,7 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge)
drm_connector_helper_add(&ptn_bridge->connector,
&ptn3460_connector_helper_funcs);
drm_connector_register(&ptn_bridge->connector);
- drm_mode_connector_attach_encoder(&ptn_bridge->connector,
+ drm_connector_attach_encoder(&ptn_bridge->connector,
bridge->encoder);
if (ptn_bridge->panel)
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 6d99d4a3beb3..7cbaba213ef6 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -79,7 +79,7 @@ static int panel_bridge_attach(struct drm_bridge *bridge)
return ret;
}
- drm_mode_connector_attach_encoder(&panel_bridge->connector,
+ drm_connector_attach_encoder(&panel_bridge->connector,
bridge->encoder);
ret = drm_panel_attach(panel_bridge->panel, &panel_bridge->connector);
diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
index 81198f5e9afa..7334d1b62b71 100644
--- a/drivers/gpu/drm/bridge/parade-ps8622.c
+++ b/drivers/gpu/drm/bridge/parade-ps8622.c
@@ -503,7 +503,7 @@ static int ps8622_attach(struct drm_bridge *bridge)
drm_connector_helper_add(&ps8622->connector,
&ps8622_connector_helper_funcs);
drm_connector_register(&ps8622->connector);
- drm_mode_connector_attach_encoder(&ps8622->connector,
+ drm_connector_attach_encoder(&ps8622->connector,
bridge->encoder);
if (ps8622->panel)
diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index cd331933c230..e59a13542333 100644
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -324,7 +324,7 @@ static int sii902x_bridge_attach(struct drm_bridge *bridge)
else
sii902x->connector.polled = DRM_CONNECTOR_POLL_CONNECT;
- drm_mode_connector_attach_encoder(&sii902x->connector, bridge->encoder);
+ drm_connector_attach_encoder(&sii902x->connector, bridge->encoder);
return 0;
}
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index ab32aceb6f24..5971976284bf 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -1974,7 +1974,7 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge)
drm_connector_init(bridge->dev, connector, &dw_hdmi_connector_funcs,
DRM_MODE_CONNECTOR_HDMIA);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
index ee2fd0a349b3..8e28e738cb52 100644
--- a/drivers/gpu/drm/bridge/tc358767.c
+++ b/drivers/gpu/drm/bridge/tc358767.c
@@ -1195,7 +1195,7 @@ static int tc_bridge_attach(struct drm_bridge *bridge)
drm_display_info_set_bus_formats(&tc->connector.display_info,
&bus_format, 1);
- drm_mode_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
+ drm_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
return 0;
}
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index c81bf7910bbe..c3e32138c6bb 100644
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -132,7 +132,7 @@ static int tfp410_attach(struct drm_bridge *bridge)
return ret;
}
- drm_mode_connector_attach_encoder(&dvi->connector,
+ drm_connector_attach_encoder(&dvi->connector,
bridge->encoder);
return 0;
diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
index b529f8c8e2a6..336bfda40125 100644
--- a/drivers/gpu/drm/cirrus/cirrus_mode.c
+++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
@@ -530,7 +530,7 @@ int cirrus_modeset_init(struct cirrus_device *cdev)
return -1;
}
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
ret = cirrus_fbdev_init(cdev);
if (ret) {
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index ccb70a4490d3..43cd636d83b5 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -52,7 +52,7 @@
*
* Connectors must be attached to an encoder to be used. For devices that map
* connectors to encoders 1:1, the connector should be attached at
- * initialization time with a call to drm_mode_connector_attach_encoder(). The
+ * initialization time with a call to drm_connector_attach_encoder(). The
* driver must also set the &drm_connector.encoder field to point to the
* attached encoder.
*
@@ -295,7 +295,7 @@ int drm_connector_init(struct drm_device *dev,
EXPORT_SYMBOL(drm_connector_init);
/**
- * drm_mode_connector_attach_encoder - attach a connector to an encoder
+ * drm_connector_attach_encoder - attach a connector to an encoder
* @connector: connector to attach
* @encoder: encoder to attach @connector to
*
@@ -306,8 +306,8 @@ EXPORT_SYMBOL(drm_connector_init);
* Returns:
* Zero on success, negative errno on failure.
*/
-int drm_mode_connector_attach_encoder(struct drm_connector *connector,
- struct drm_encoder *encoder)
+int drm_connector_attach_encoder(struct drm_connector *connector,
+ struct drm_encoder *encoder)
{
int i;
@@ -333,7 +333,7 @@ int drm_mode_connector_attach_encoder(struct drm_connector *connector,
}
return -ENOMEM;
}
-EXPORT_SYMBOL(drm_mode_connector_attach_encoder);
+EXPORT_SYMBOL(drm_connector_attach_encoder);
/**
* drm_connector_has_possible_encoder - check if the connector and encoder are assosicated with each other
diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c
index b72fcf1e9605..51fa978f0d23 100644
--- a/drivers/gpu/drm/drm_simple_kms_helper.c
+++ b/drivers/gpu/drm/drm_simple_kms_helper.c
@@ -287,7 +287,7 @@ int drm_simple_display_pipe_init(struct drm_device *dev,
if (ret || !connector)
return ret;
- return drm_mode_connector_attach_encoder(connector, encoder);
+ return drm_connector_attach_encoder(connector, encoder);
}
EXPORT_SYMBOL(drm_simple_display_pipe_init);
diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
index 827395071f0b..e655bcc6c75c 100644
--- a/drivers/gpu/drm/drm_writeback.c
+++ b/drivers/gpu/drm/drm_writeback.c
@@ -199,7 +199,7 @@ int drm_writeback_connector_init(struct drm_device *dev,
if (ret)
goto connector_fail;
- ret = drm_mode_connector_attach_encoder(connector,
+ ret = drm_connector_attach_encoder(connector,
&wb_connector->encoder);
if (ret)
goto attach_fail;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
index 66945e0dc57f..e3a343bb14b7 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
@@ -113,7 +113,7 @@ static int exynos_dpi_create_connector(struct drm_encoder *encoder)
}
drm_connector_helper_add(connector, &exynos_dpi_connector_helper_funcs);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
index 6d29777884f9..bee6d4a4078d 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
@@ -1479,7 +1479,7 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder)
connector->status = connector_status_disconnected;
drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index dfea61edba4a..19697c1362d8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -344,7 +344,7 @@ static int vidi_create_connector(struct drm_encoder *encoder)
}
drm_connector_helper_add(connector, &vidi_connector_helper_funcs);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
index 6672d0ff0423..3a11c719a580 100644
--- a/drivers/gpu/drm/exynos/exynos_hdmi.c
+++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
@@ -951,7 +951,7 @@ static int hdmi_create_connector(struct drm_encoder *encoder)
}
drm_connector_helper_add(connector, &hdmi_connector_helper_funcs);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
if (hdata->bridge) {
ret = drm_bridge_attach(encoder, hdata->bridge, NULL);
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
index c54806d08dd7..a37c06996ffe 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
@@ -117,7 +117,7 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,
if (ret < 0)
goto err_cleanup;
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret < 0)
goto err_sysfs;
diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
index 08f17f85b801..09c1161a7ac6 100644
--- a/drivers/gpu/drm/gma500/gma_display.c
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -665,7 +665,7 @@ void gma_connector_attach_encoder(struct gma_connector *connector,
struct gma_encoder *encoder)
{
connector->encoder = encoder;
- drm_mode_connector_attach_encoder(&connector->base,
+ drm_connector_attach_encoder(&connector->base,
&encoder->base);
}
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
index a05c020602bd..d0bf5a1e94e8 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
@@ -999,7 +999,7 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev,
p_funcs->encoder_helper_funcs);
/*attach to given connector*/
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
/*set possible crtcs and clones*/
if (dsi_connector->pipe) {
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
index d2f4749ebf8d..744956cea749 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
@@ -133,7 +133,7 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
}
drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
index d434f576e6b2..eecdc327b9f8 100644
--- a/drivers/gpu/drm/i2c/tda998x_drv.c
+++ b/drivers/gpu/drm/i2c/tda998x_drv.c
@@ -1301,7 +1301,7 @@ static int tda998x_connector_init(struct tda998x_priv *priv,
if (ret)
return ret;
- drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder);
+ drm_connector_attach_encoder(&priv->connector, &priv->encoder);
return 0;
}
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index bb930755544d..be5d5dd75c3b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15934,8 +15934,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
struct intel_encoder *encoder)
{
connector->encoder = encoder;
- drm_mode_connector_attach_encoder(&connector->base,
- &encoder->base);
+ drm_connector_attach_encoder(&connector->base, &encoder->base);
}
/*
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 85ecf41eeabb..494e5c40a464 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -466,8 +466,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
struct drm_encoder *enc =
&intel_dp->mst_encoders[pipe]->base.base;
- ret = drm_mode_connector_attach_encoder(&intel_connector->base,
- enc);
+ ret = drm_connector_attach_encoder(&intel_connector->base, enc);
if (ret)
goto err;
}
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
index ae81cbb75f51..7312beb6f1fc 100644
--- a/drivers/gpu/drm/imx/imx-ldb.c
+++ b/drivers/gpu/drm/imx/imx-ldb.c
@@ -471,8 +471,7 @@ static int imx_ldb_register(struct drm_device *drm,
drm_connector_init(drm, &imx_ldb_ch->connector,
&imx_ldb_connector_funcs,
DRM_MODE_CONNECTOR_LVDS);
- drm_mode_connector_attach_encoder(&imx_ldb_ch->connector,
- encoder);
+ drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder);
}
if (imx_ldb_ch->panel) {
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
index 1a4ced5c09b5..cffd3310240e 100644
--- a/drivers/gpu/drm/imx/imx-tve.c
+++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -493,7 +493,7 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve)
drm_connector_init(drm, &tve->connector, &imx_tve_connector_funcs,
DRM_MODE_CONNECTOR_VGA);
- drm_mode_connector_attach_encoder(&tve->connector, &tve->encoder);
+ drm_connector_attach_encoder(&tve->connector, &tve->encoder);
return 0;
}
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
index 4fc1cf583435..aefd04e18f93 100644
--- a/drivers/gpu/drm/imx/parallel-display.c
+++ b/drivers/gpu/drm/imx/parallel-display.c
@@ -197,7 +197,7 @@ static int imx_pd_register(struct drm_device *drm,
return ret;
}
} else {
- drm_mode_connector_attach_encoder(&imxpd->connector, encoder);
+ drm_connector_attach_encoder(&imxpd->connector, encoder);
}
return 0;
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index aa0943ec32b0..66df1b177959 100644
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -782,7 +782,7 @@ static int mtk_dsi_create_connector(struct drm_device *drm, struct mtk_dsi *dsi)
drm_connector_helper_add(&dsi->conn, &mtk_dsi_connector_helper_funcs);
dsi->conn.dpms = DRM_MODE_DPMS_OFF;
- drm_mode_connector_attach_encoder(&dsi->conn, &dsi->encoder);
+ drm_connector_attach_encoder(&dsi->conn, &dsi->encoder);
if (dsi->panel) {
ret = drm_panel_attach(dsi->panel, &dsi->conn);
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index 835313940395..2d45d1dd9554 100644
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1306,7 +1306,7 @@ static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge)
hdmi->conn.interlace_allowed = true;
hdmi->conn.doublescan_allowed = false;
- ret = drm_mode_connector_attach_encoder(&hdmi->conn,
+ ret = drm_connector_attach_encoder(&hdmi->conn,
bridge->encoder);
if (ret) {
dev_err(hdmi->dev,
diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
index 79d95ca8a0c0..f7945bae3b4a 100644
--- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
+++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
@@ -282,7 +282,7 @@ int meson_venc_cvbs_create(struct meson_drm *priv)
encoder->possible_crtcs = BIT(0);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
index 5f104f139197..acf7bfe68454 100644
--- a/drivers/gpu/drm/mgag200/mgag200_mode.c
+++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
@@ -1747,7 +1747,7 @@ int mgag200_modeset_init(struct mga_device *mdev)
return -1;
}
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
ret = mgag200_fbdev_init(mdev);
if (ret) {
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
index e3b1c86b7aae..df642e06ed0d 100644
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
@@ -129,7 +129,7 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev,
connector->interlace_allowed = 0;
connector->doublescan_allowed = 0;
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return connector;
}
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
index 4beba3f7d067..21e0dc51531d 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -684,7 +684,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)
connector->interlace_allowed = 0;
connector->doublescan_allowed = 0;
- drm_mode_connector_attach_encoder(connector, msm_dsi->encoder);
+ drm_connector_attach_encoder(connector, msm_dsi->encoder);
return connector;
}
diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
index 0b5eac054195..058ff92a0207 100644
--- a/drivers/gpu/drm/msm/edp/edp_connector.c
+++ b/drivers/gpu/drm/msm/edp/edp_connector.c
@@ -134,7 +134,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)
connector->interlace_allowed = false;
connector->doublescan_allowed = false;
- drm_mode_connector_attach_encoder(connector, edp->encoder);
+ drm_connector_attach_encoder(connector, edp->encoder);
return connector;
}
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
index 07feacc5a441..e9c9a0af508e 100644
--- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
@@ -477,7 +477,7 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)
return ERR_PTR(ret);
}
- drm_mode_connector_attach_encoder(connector, hdmi->encoder);
+ drm_connector_attach_encoder(connector, hdmi->encoder);
return connector;
}
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
index 4feab0a5419d..e7af95d37ddb 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
@@ -556,6 +556,6 @@ nv04_dac_create(struct drm_connector *connector, struct dcb_output *entry)
encoder->possible_crtcs = entry->heads;
encoder->possible_clones = 0;
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
index 9805d2cdc1a1..73d41abbb510 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
@@ -716,6 +716,6 @@ nv04_dfp_create(struct drm_connector *connector, struct dcb_output *entry)
entry->location != DCB_LOC_ON_CHIP)
nv04_tmds_slave_init(encoder);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
index 01664357d3e1..de4490b4ed30 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
@@ -244,7 +244,7 @@ nv04_tv_create(struct drm_connector *connector, struct dcb_output *entry)
/* Attach it to the specified connector. */
get_slave_funcs(encoder)->create_resources(encoder, connector);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index 6d99f11fee4e..6a4ca139cf5d 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -821,6 +821,6 @@ nv17_tv_create(struct drm_connector *connector, struct dcb_output *entry)
encoder->possible_clones = 0;
nv17_tv_create_resources(encoder, connector);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 2fabb69e452b..475456c19b76 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -424,7 +424,7 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe)
"dac-%04x-%04x", dcbe->hasht, dcbe->hashm);
drm_encoder_helper_add(encoder, &nv50_dac_help);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
@@ -927,7 +927,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
nouveau_conn_attach_properties(&mstc->connector);
for (i = 0; i < ARRAY_SIZE(mstm->msto) && mstm->msto[i]; i++)
- drm_mode_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder);
+ drm_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder);
drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0);
drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0);
@@ -1418,7 +1418,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
"sor-%04x-%04x", dcbe->hasht, dcbe->hashm);
drm_encoder_helper_add(encoder, &nv50_sor_help);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
if (dcbe->type == DCB_OUTPUT_DP) {
struct nv50_disp *disp = nv50_disp(encoder->dev);
@@ -1576,7 +1576,7 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
"pior-%04x-%04x", dcbe->hasht, dcbe->hashm);
drm_encoder_helper_add(encoder, &nv50_pior_help);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index 5005ecc284d2..1b6601e9b107 100644
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -274,7 +274,7 @@ static int omap_modeset_init(struct drm_device *dev)
if (IS_ERR(crtc))
return PTR_ERR(crtc);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
encoder->possible_crtcs = (1 << crtc_idx);
priv->crtcs[priv->num_crtcs++] = crtc;
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 768207fbbae3..0570c6826bff 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -1086,7 +1086,7 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
/* we get HPD via client monitors config */
connector->polled = DRM_CONNECTOR_POLL_HPD;
encoder->possible_crtcs = 1 << num_output;
- drm_mode_connector_attach_encoder(&qxl_output->base,
+ drm_connector_attach_encoder(&qxl_output->base,
&qxl_output->enc);
drm_encoder_helper_add(encoder, &qxl_enc_helper_funcs);
drm_connector_helper_add(connector, &qxl_connector_helper_funcs);
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index c6ee80216cf4..c341fb2a5b56 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -211,7 +211,7 @@ radeon_link_encoder_connector(struct drm_device *dev)
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
radeon_encoder = to_radeon_encoder(encoder);
if (radeon_encoder->devices & radeon_connector->devices) {
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))
radeon_encoder_add_backlight(radeon_encoder, connector);
}
diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index 155ad840f3c5..4feea76a3967 100644
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -353,7 +353,7 @@ static int rcar_lvds_attach(struct drm_bridge *bridge)
drm_connector_helper_add(connector, &rcar_lvds_conn_helper_funcs);
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret < 0)
return ret;
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index a40cb2be50e1..8ad0d773dc33 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
drm_connector_helper_add(connector, &cdn_dp_connector_helper_funcs);
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret) {
DRM_ERROR("failed to attach connector and encoder\n");
goto err_free_connector;
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
index d53d5a09547f..7bbbf52758b5 100644
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
@@ -1129,7 +1129,7 @@ static int dw_mipi_dsi_register(struct drm_device *drm,
&dw_mipi_dsi_atomic_connector_funcs,
DRM_MODE_CONNECTOR_DSI);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index 510fcb33e31d..1c02b3e61299 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -634,7 +634,7 @@ static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi)
drm_connector_init(drm, &hdmi->connector, &inno_hdmi_connector_funcs,
DRM_MODE_CONNECTOR_HDMIA);
- drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
+ drm_connector_attach_encoder(&hdmi->connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index b3f6f524b402..456bd9f13bae 100644
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -434,7 +434,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
drm_connector_helper_add(connector,
&rockchip_lvds_connector_helper_funcs);
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret < 0) {
DRM_DEV_ERROR(drm_dev->dev,
"failed to attach encoder: %d\n", ret);
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index 40df8887fc17..fc66167b0641 100644
--- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -675,7 +675,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
if (ret < 0)
goto err_cleanup;
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret < 0)
goto err_backlight;
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
index a5979cd25cc7..21929dc616a3 100644
--- a/drivers/gpu/drm/sti/sti_dvo.c
+++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -484,7 +484,7 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data)
drm_connector_helper_add(drm_connector,
&sti_dvo_connector_helper_funcs);
- err = drm_mode_connector_attach_encoder(drm_connector, encoder);
+ err = drm_connector_attach_encoder(drm_connector, encoder);
if (err) {
DRM_ERROR("Failed to attach a connector to a encoder\n");
goto err_sysfs;
diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
index 67bbdb49fffc..49438337f70d 100644
--- a/drivers/gpu/drm/sti/sti_hda.c
+++ b/drivers/gpu/drm/sti/sti_hda.c
@@ -709,7 +709,7 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
drm_connector_helper_add(drm_connector,
&sti_hda_connector_helper_funcs);
- err = drm_mode_connector_attach_encoder(drm_connector, encoder);
+ err = drm_connector_attach_encoder(drm_connector, encoder);
if (err) {
DRM_ERROR("Failed to attach a connector to a encoder\n");
goto err_sysfs;
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
index 0c3008356ab8..34cdc4644435 100644
--- a/drivers/gpu/drm/sti/sti_hdmi.c
+++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -1290,7 +1290,7 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
hdmi->drm_connector = drm_connector;
- err = drm_mode_connector_attach_encoder(drm_connector, encoder);
+ err = drm_connector_attach_encoder(drm_connector, encoder);
if (err) {
DRM_ERROR("Failed to attach a connector to a encoder\n");
goto err_sysfs;
diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
index 9b4b1d015423..061d2e0d9011 100644
--- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
@@ -623,7 +623,7 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
ret = cec_register_adapter(hdmi->cec_adap, dev);
if (ret < 0)
goto err_cleanup_connector;
- drm_mode_connector_attach_encoder(&hdmi->connector, &hdmi->encoder);
+ drm_connector_attach_encoder(&hdmi->connector, &hdmi->encoder);
return 0;
diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c
index a69fe2e1f9d1..af7dcb6da351 100644
--- a/drivers/gpu/drm/sun4i/sun4i_lvds.c
+++ b/drivers/gpu/drm/sun4i/sun4i_lvds.c
@@ -149,7 +149,7 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)
goto err_cleanup_connector;
}
- drm_mode_connector_attach_encoder(&lvds->connector,
+ drm_connector_attach_encoder(&lvds->connector,
&lvds->encoder);
ret = drm_panel_attach(tcon->panel, &lvds->connector);
diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
index 96d21b07f8fc..bf068da6b12e 100644
--- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
+++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
@@ -215,7 +215,7 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)
goto err_cleanup_connector;
}
- drm_mode_connector_attach_encoder(&rgb->connector,
+ drm_connector_attach_encoder(&rgb->connector,
&rgb->encoder);
ret = drm_panel_attach(tcon->panel, &rgb->connector);
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
index b070d522ed8d..1a838d208211 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
@@ -623,7 +623,7 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,
}
tv->connector.interlace_allowed = true;
- drm_mode_connector_attach_encoder(&tv->connector, &tv->encoder);
+ drm_connector_attach_encoder(&tv->connector, &tv->encoder);
return 0;
diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
index da9814f94d00..ce5dca755f7f 100644
--- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
@@ -941,7 +941,7 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master,
goto err_cleanup_connector;
}
- drm_mode_connector_attach_encoder(&dsi->connector, &dsi->encoder);
+ drm_connector_attach_encoder(&dsi->connector, &dsi->encoder);
drm_panel_attach(dsi->panel, &dsi->connector);
return 0;
diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index 87c5d89bc9ba..c1c3f18a8990 100644
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -1052,7 +1052,7 @@ static int tegra_dsi_init(struct host1x_client *client)
drm_encoder_helper_add(&dsi->output.encoder,
&tegra_dsi_encoder_helper_funcs);
- drm_mode_connector_attach_encoder(&dsi->output.connector,
+ drm_connector_attach_encoder(&dsi->output.connector,
&dsi->output.encoder);
drm_connector_register(&dsi->output.connector);
diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
index 784739a9f497..0082468f703c 100644
--- a/drivers/gpu/drm/tegra/hdmi.c
+++ b/drivers/gpu/drm/tegra/hdmi.c
@@ -1488,7 +1488,7 @@ static int tegra_hdmi_init(struct host1x_client *client)
drm_encoder_helper_add(&hdmi->output.encoder,
&tegra_hdmi_encoder_helper_funcs);
- drm_mode_connector_attach_encoder(&hdmi->output.connector,
+ drm_connector_attach_encoder(&hdmi->output.connector,
&hdmi->output.encoder);
drm_connector_register(&hdmi->output.connector);
diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
index 78ec5193741d..28a78d3120bc 100644
--- a/drivers/gpu/drm/tegra/rgb.c
+++ b/drivers/gpu/drm/tegra/rgb.c
@@ -289,7 +289,7 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc)
drm_encoder_helper_add(&output->encoder,
&tegra_rgb_encoder_helper_funcs);
- drm_mode_connector_attach_encoder(&output->connector,
+ drm_connector_attach_encoder(&output->connector,
&output->encoder);
drm_connector_register(&output->connector);
diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 7d2a955fc515..d7fe9f15def1 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -2622,7 +2622,7 @@ static int tegra_sor_init(struct host1x_client *client)
encoder, NULL);
drm_encoder_helper_add(&sor->output.encoder, helpers);
- drm_mode_connector_attach_encoder(&sor->output.connector,
+ drm_connector_attach_encoder(&sor->output.connector,
&sor->output.encoder);
drm_connector_register(&sor->output.connector);
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index d616d64a6725..a1acab39d87f 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -223,7 +223,7 @@ static struct drm_connector *panel_connector_create(struct drm_device *dev,
connector->interlace_allowed = 0;
connector->doublescan_allowed = 0;
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret)
goto fail;
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index 46dacca3cce8..daebf1aa6b0a 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -240,7 +240,7 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev,
connector->interlace_allowed = 0;
connector->doublescan_allowed = 0;
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret)
goto fail;
diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
index 8fac12e1a1a4..68e88bed77ca 100644
--- a/drivers/gpu/drm/udl/udl_connector.c
+++ b/drivers/gpu/drm/udl/udl_connector.c
@@ -200,7 +200,7 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
drm_connector_helper_add(connector, &udl_connector_helper_funcs);
drm_connector_register(connector);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
connector->polled = DRM_CONNECTOR_POLL_HPD |
DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
index 91f284e1b908..fd5522fd179e 100644
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -329,7 +329,7 @@ static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
connector->interlace_allowed = 1;
connector->doublescan_allowed = 0;
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return connector;
}
diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
index 3a9a302247a2..8e7facb6514e 100644
--- a/drivers/gpu/drm/vc4/vc4_vec.c
+++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -404,7 +404,7 @@ static struct drm_connector *vc4_vec_connector_init(struct drm_device *dev,
VC4_VEC_TV_MODE_NTSC);
vec->tv_mode = &vc4_vec_tv_modes[VC4_VEC_TV_MODE_NTSC];
- drm_mode_connector_attach_encoder(connector, vec->encoder);
+ drm_connector_attach_encoder(connector, vec->encoder);
return connector;
}
diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
index ff9933e79416..25503b933599 100644
--- a/drivers/gpu/drm/virtio/virtgpu_display.c
+++ b/drivers/gpu/drm/virtio/virtgpu_display.c
@@ -292,7 +292,7 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs);
encoder->possible_crtcs = 1 << index;
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
drm_connector_register(connector);
return 0;
}
diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
index 48143eac3c12..e8e0e6615ff9 100644
--- a/drivers/gpu/drm/vkms/vkms_output.c
+++ b/drivers/gpu/drm/vkms/vkms_output.c
@@ -63,7 +63,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)
}
encoder->possible_crtcs = 1;
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret) {
DRM_ERROR("Failed to attach connector to encoder\n");
goto err_attach;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index dc0cfda26b1b..a234fe0e1061 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -438,7 +438,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
goto err_free_connector;
}
- (void) drm_mode_connector_attach_encoder(connector, encoder);
+ (void) drm_connector_attach_encoder(connector, encoder);
encoder->possible_crtcs = (1 << unit);
encoder->possible_clones = 0;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 73cf3c6e1591..dd417eb74524 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -695,7 +695,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
goto err_free_connector;
}
- (void) drm_mode_connector_attach_encoder(connector, encoder);
+ (void) drm_connector_attach_encoder(connector, encoder);
encoder->possible_crtcs = (1 << unit);
encoder->possible_clones = 0;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index a474d87b1af3..4cca78cab03f 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -1486,7 +1486,7 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
goto err_free_connector;
}
- (void) drm_mode_connector_attach_encoder(connector, encoder);
+ (void) drm_connector_attach_encoder(connector, encoder);
encoder->possible_crtcs = (1 << unit);
encoder->possible_clones = 0;
diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
index d073c6737500..78655269d843 100644
--- a/drivers/gpu/drm/zte/zx_hdmi.c
+++ b/drivers/gpu/drm/zte/zx_hdmi.c
@@ -326,7 +326,7 @@ static int zx_hdmi_register(struct drm_device *drm, struct zx_hdmi *hdmi)
drm_connector_helper_add(&hdmi->connector,
&zx_hdmi_connector_helper_funcs);
- drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
+ drm_connector_attach_encoder(&hdmi->connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/zte/zx_tvenc.c b/drivers/gpu/drm/zte/zx_tvenc.c
index 0de1a71ca4e0..b73afb212fb2 100644
--- a/drivers/gpu/drm/zte/zx_tvenc.c
+++ b/drivers/gpu/drm/zte/zx_tvenc.c
@@ -297,7 +297,7 @@ static int zx_tvenc_register(struct drm_device *drm, struct zx_tvenc *tvenc)
DRM_MODE_CONNECTOR_Composite);
drm_connector_helper_add(connector, &zx_tvenc_connector_helper_funcs);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
index 3e78ee21b8d0..23d1ff4355a0 100644
--- a/drivers/gpu/drm/zte/zx_vga.c
+++ b/drivers/gpu/drm/zte/zx_vga.c
@@ -175,7 +175,7 @@ static int zx_vga_register(struct drm_device *drm, struct zx_vga *vga)
drm_connector_helper_add(connector, &zx_vga_connector_helper_funcs);
- ret = drm_mode_connector_attach_encoder(connector, encoder);
+ ret = drm_connector_attach_encoder(connector, encoder);
if (ret) {
DRM_DEV_ERROR(dev, "failed to attach encoder: %d\n", ret);
goto clean_connector;
diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
index a943d2f683ed..da4a93df8d75 100644
--- a/drivers/staging/vboxvideo/vbox_mode.c
+++ b/drivers/staging/vboxvideo/vbox_mode.c
@@ -655,7 +655,7 @@ static int vbox_connector_init(struct drm_device *dev,
dev->mode_config.suggested_y_property, 0);
drm_connector_register(connector);
- drm_mode_connector_attach_encoder(connector, encoder);
+ drm_connector_attach_encoder(connector, encoder);
return 0;
}
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 9841d2b6d3eb..dfd7a3595a6c 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1081,7 +1081,7 @@ int drm_connector_init(struct drm_device *dev,
int connector_type);
int drm_connector_register(struct drm_connector *connector);
void drm_connector_unregister(struct drm_connector *connector);
-int drm_mode_connector_attach_encoder(struct drm_connector *connector,
+int drm_connector_attach_encoder(struct drm_connector *connector,
struct drm_encoder *encoder);
void drm_connector_cleanup(struct drm_connector *connector);
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 07/15] drm: drop _mode_ from remaining connector functions
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (5 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 06/15] drm: drop _mode_ from drm_mode_connector_attach_encoder Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-13 15:05 ` Sean Paul
2018-07-09 8:40 ` [PATCH 08/15] drm: Switch drm_plane_state to inline kerneldoc style Daniel Vetter
` (7 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
Since there's very few callers of these I've decided to do them all in
one patch. With this the unecessarily long drm_mode_connector_ prefix
is gone from the codebase! The only exception being struct
drm_mode_connector_set_property, which is part of the uapi so can't be
renamed.
Again done with sed+some manual fixups for indent issues.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
.../display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 ++--
drivers/gpu/drm/drm_atomic_helper.c | 2 +-
drivers/gpu/drm/drm_connector.c | 36 +++++++++----------
drivers/gpu/drm/drm_crtc_internal.h | 6 ++--
drivers/gpu/drm/drm_dp_mst_topology.c | 4 +--
drivers/gpu/drm/drm_ioctl.c | 2 +-
drivers/gpu/drm/drm_mode_object.c | 3 +-
drivers/gpu/drm/drm_modes.c | 6 ++--
drivers/gpu/drm/drm_probe_helper.c | 4 +--
drivers/gpu/drm/i915/intel_dp.c | 4 +--
drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
include/drm/drm_connector.h | 14 ++++----
include/drm/drm_modes.h | 2 +-
17 files changed, 49 insertions(+), 50 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
index 581bb75d08eb..65f210d3497b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
@@ -345,7 +345,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
aconnector, connector->base.id, aconnector->mst_port);
aconnector->port = port;
- drm_mode_connector_set_path_property(connector, pathprop);
+ drm_connector_set_path_property(connector, pathprop);
drm_connector_list_iter_end(&conn_iter);
aconnector->mst_connected = true;
@@ -393,7 +393,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
dev->mode_config.tile_property,
0);
- drm_mode_connector_set_path_property(connector, pathprop);
+ drm_connector_set_path_property(connector, pathprop);
/*
* Initialize connector state before adding the connectror to drm and
@@ -441,7 +441,7 @@ static void dm_dp_mst_hotplug(struct drm_dp_mst_topology_mgr *mgr)
static void dm_dp_mst_link_status_reset(struct drm_connector *connector)
{
mutex_lock(&connector->dev->mode_config.mutex);
- drm_mode_connector_set_link_status_property(connector, DRM_MODE_LINK_STATUS_BAD);
+ drm_connector_set_link_status_property(connector, DRM_MODE_LINK_STATUS_BAD);
mutex_unlock(&connector->dev->mode_config.mutex);
}
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 5bc88f361fef..acf9dbd9fed2 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2809,7 +2809,7 @@ static int update_output_state(struct drm_atomic_state *state,
* resets the "link-status" property to GOOD, to force any link
* re-training. The SETCRTC ioctl does not define whether an update does
* need a full modeset or just a plane update, hence we're allowed to do
- * that. See also drm_mode_connector_set_link_status_property().
+ * that. See also drm_connector_set_link_status_property().
*
* Returns:
* Returns 0 on success, negative errno numbers on failure.
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 43cd636d83b5..93647161f9e6 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -856,7 +856,7 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
* PATH:
* Connector path property to identify how this sink is physically
* connected. Used by DP MST. This should be set by calling
- * drm_mode_connector_set_path_property(), in the case of DP MST with the
+ * drm_connector_set_path_property(), in the case of DP MST with the
* path property the MST manager created. Userspace cannot change this
* property.
* TILE:
@@ -867,14 +867,14 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
* are not gen-locked. Note that for tiled panels which are genlocked, like
* dual-link LVDS or dual-link DSI, the driver should try to not expose the
* tiling and virtualize both &drm_crtc and &drm_plane if needed. Drivers
- * should update this value using drm_mode_connector_set_tile_property().
+ * should update this value using drm_connector_set_tile_property().
* Userspace cannot change this property.
* link-status:
* Connector link-status property to indicate the status of link. The
* default value of link-status is "GOOD". If something fails during or
* after modeset, the kernel driver may set this to "BAD" and issue a
* hotplug uevent. Drivers should update this value using
- * drm_mode_connector_set_link_status_property().
+ * drm_connector_set_link_status_property().
* non_desktop:
* Indicates the output should be ignored for purposes of displaying a
* standard desktop environment or console. This is most likely because
@@ -1429,7 +1429,7 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev)
EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties);
/**
- * drm_mode_connector_set_path_property - set tile property on connector
+ * drm_connector_set_path_property - set tile property on connector
* @connector: connector to set property on.
* @path: path to use for property; must not be NULL.
*
@@ -1441,8 +1441,8 @@ EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties);
* Returns:
* Zero on success, negative errno on failure.
*/
-int drm_mode_connector_set_path_property(struct drm_connector *connector,
- const char *path)
+int drm_connector_set_path_property(struct drm_connector *connector,
+ const char *path)
{
struct drm_device *dev = connector->dev;
int ret;
@@ -1455,10 +1455,10 @@ int drm_mode_connector_set_path_property(struct drm_connector *connector,
dev->mode_config.path_property);
return ret;
}
-EXPORT_SYMBOL(drm_mode_connector_set_path_property);
+EXPORT_SYMBOL(drm_connector_set_path_property);
/**
- * drm_mode_connector_set_tile_property - set tile property on connector
+ * drm_connector_set_tile_property - set tile property on connector
* @connector: connector to set property on.
*
* This looks up the tile information for a connector, and creates a
@@ -1468,7 +1468,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_path_property);
* Returns:
* Zero on success, errno on failure.
*/
-int drm_mode_connector_set_tile_property(struct drm_connector *connector)
+int drm_connector_set_tile_property(struct drm_connector *connector)
{
struct drm_device *dev = connector->dev;
char tile[256];
@@ -1498,7 +1498,7 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector)
dev->mode_config.tile_property);
return ret;
}
-EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
+EXPORT_SYMBOL(drm_connector_set_tile_property);
/**
* drm_connector_update_edid_property - update the edid property of a connector
@@ -1512,7 +1512,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
* Zero on success, negative errno on failure.
*/
int drm_connector_update_edid_property(struct drm_connector *connector,
- const struct edid *edid)
+ const struct edid *edid)
{
struct drm_device *dev = connector->dev;
size_t size = 0;
@@ -1553,7 +1553,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector,
EXPORT_SYMBOL(drm_connector_update_edid_property);
/**
- * drm_mode_connector_set_link_status_property - Set link status property of a connector
+ * drm_connector_set_link_status_property - Set link status property of a connector
* @connector: drm connector
* @link_status: new value of link status property (0: Good, 1: Bad)
*
@@ -1571,8 +1571,8 @@ EXPORT_SYMBOL(drm_connector_update_edid_property);
* it is not limited to DP or link training. For example, if we implement
* asynchronous setcrtc, this property can be used to report any failures in that.
*/
-void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
- uint64_t link_status)
+void drm_connector_set_link_status_property(struct drm_connector *connector,
+ uint64_t link_status)
{
struct drm_device *dev = connector->dev;
@@ -1580,7 +1580,7 @@ void drm_mode_connector_set_link_status_property(struct drm_connector *connector
connector->state->link_status = link_status;
drm_modeset_unlock(&dev->mode_config.connection_mutex);
}
-EXPORT_SYMBOL(drm_mode_connector_set_link_status_property);
+EXPORT_SYMBOL(drm_connector_set_link_status_property);
/**
* drm_connector_init_panel_orientation_property -
@@ -1633,7 +1633,7 @@ int drm_connector_init_panel_orientation_property(
}
EXPORT_SYMBOL(drm_connector_init_panel_orientation_property);
-int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
+int drm_connector_set_obj_prop(struct drm_mode_object *obj,
struct drm_property *property,
uint64_t value)
{
@@ -1651,8 +1651,8 @@ int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
return ret;
}
-int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
- void *data, struct drm_file *file_priv)
+int drm_connector_property_set_ioctl(struct drm_device *dev,
+ void *data, struct drm_file *file_priv)
{
struct drm_mode_connector_set_property *conn_set_prop = data;
struct drm_mode_obj_set_property obj_set_prop = {
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index 235d40fce8b5..b61322763394 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -148,7 +148,7 @@ void drm_connector_ida_init(void);
void drm_connector_ida_destroy(void);
void drm_connector_unregister_all(struct drm_device *dev);
int drm_connector_register_all(struct drm_device *dev);
-int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
+int drm_connector_set_obj_prop(struct drm_mode_object *obj,
struct drm_property *property,
uint64_t value);
int drm_connector_create_standard_properties(struct drm_device *dev);
@@ -156,8 +156,8 @@ const char *drm_get_connector_force_name(enum drm_connector_force force);
void drm_connector_free_work_fn(struct work_struct *work);
/* IOCTL */
-int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
- void *data, struct drm_file *file_priv);
+int drm_connector_property_set_ioctl(struct drm_device *dev,
+ void *data, struct drm_file *file_priv);
int drm_mode_getconnector(struct drm_device *dev,
void *data, struct drm_file *file_priv);
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 658830620ca3..7780567aa669 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1215,7 +1215,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
port->pdt == DP_PEER_DEVICE_SST_SINK) &&
port->port_num >= DP_MST_LOGICAL_PORT_0) {
port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc);
- drm_mode_connector_set_tile_property(port->connector);
+ drm_connector_set_tile_property(port->connector);
}
(*mstb->mgr->cbs->register_connector)(port->connector);
}
@@ -2559,7 +2559,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_
edid = drm_edid_duplicate(port->cached_edid);
else {
edid = drm_get_edid(connector, &port->aux.ddc);
- drm_mode_connector_set_tile_property(connector);
+ drm_connector_set_tile_property(connector);
}
port->has_audio = drm_detect_monitor_audio(edid);
drm_dp_put_port(port);
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index c148eb3be8c2..882777fa66fa 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -641,7 +641,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_UNLOCKED),
- DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_mode_connector_property_set_ioctl, DRM_MASTER|DRM_UNLOCKED),
+ DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_connector_property_set_ioctl, DRM_MASTER|DRM_UNLOCKED),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_UNLOCKED),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_UNLOCKED),
DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb_ioctl, DRM_UNLOCKED),
diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_object.c
index ce4d2fb32810..fcb0ab0abb75 100644
--- a/drivers/gpu/drm/drm_mode_object.c
+++ b/drivers/gpu/drm/drm_mode_object.c
@@ -433,8 +433,7 @@ static int set_property_legacy(struct drm_mode_object *obj,
drm_modeset_lock_all(dev);
switch (obj->type) {
case DRM_MODE_OBJECT_CONNECTOR:
- ret = drm_mode_connector_set_obj_prop(obj, prop,
- prop_value);
+ ret = drm_connector_set_obj_prop(obj, prop, prop_value);
break;
case DRM_MODE_OBJECT_CRTC:
ret = drm_mode_crtc_set_obj_prop(obj, prop, prop_value);
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 7f552d5fa88e..6590e65d0b49 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -1346,7 +1346,7 @@ void drm_mode_sort(struct list_head *mode_list)
EXPORT_SYMBOL(drm_mode_sort);
/**
- * drm_mode_connector_list_update - update the mode list for the connector
+ * drm_connector_list_update - update the mode list for the connector
* @connector: the connector to update
*
* This moves the modes from the @connector probed_modes list
@@ -1356,7 +1356,7 @@ EXPORT_SYMBOL(drm_mode_sort);
* This is just a helper functions doesn't validate any modes itself and also
* doesn't prune any invalid modes. Callers need to do that themselves.
*/
-void drm_mode_connector_list_update(struct drm_connector *connector)
+void drm_connector_list_update(struct drm_connector *connector)
{
struct drm_display_mode *pmode, *pt;
@@ -1405,7 +1405,7 @@ void drm_mode_connector_list_update(struct drm_connector *connector)
}
}
}
-EXPORT_SYMBOL(drm_mode_connector_list_update);
+EXPORT_SYMBOL(drm_connector_list_update);
/**
* drm_mode_parse_command_line_for_connector - parse command line modeline for connector
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 3470ca507df3..7666e4b37d44 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -359,7 +359,7 @@ EXPORT_SYMBOL(drm_helper_probe_detect);
* using the VESA GTF/CVT formulas.
*
* 3. Modes are moved from the probed_modes list to the modes list. Potential
- * duplicates are merged together (see drm_mode_connector_list_update()).
+ * duplicates are merged together (see drm_connector_list_update()).
* After this step the probed_modes list will be empty again.
*
* 4. Any non-stale mode on the modes list then undergoes validation
@@ -484,7 +484,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
if (count == 0)
goto prune;
- drm_mode_connector_list_update(connector);
+ drm_connector_list_update(connector);
if (connector->interlace_allowed)
mode_flags |= DRM_MODE_FLAG_INTERLACE;
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2f3e92167c5f..10150ce859ad 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -6301,8 +6301,8 @@ static void intel_dp_modeset_retry_work_fn(struct work_struct *work)
/* Set connector link status to BAD and send a Uevent to notify
* userspace to do a modeset.
*/
- drm_mode_connector_set_link_status_property(connector,
- DRM_MODE_LINK_STATUS_BAD);
+ drm_connector_set_link_status_property(connector,
+ DRM_MODE_LINK_STATUS_BAD);
mutex_unlock(&connector->dev->mode_config.mutex);
/* Send Hotplug uevent so userspace can reprobe */
drm_kms_helper_hotplug_event(connector->dev);
diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 494e5c40a464..7e3e01607643 100644
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -474,7 +474,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
- ret = drm_mode_connector_set_path_property(connector, pathprop);
+ ret = drm_connector_set_path_property(connector, pathprop);
if (ret)
goto err;
diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
index 21e0dc51531d..d5006d6923e0 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -393,7 +393,7 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)
ret = dsi_dual_connector_tile_init(connector, id);
if (ret)
return ret;
- ret = drm_mode_connector_set_tile_property(connector);
+ ret = drm_connector_set_tile_property(connector);
if (ret) {
pr_err("%s: set tile property failed, %d\n",
__func__, ret);
diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 475456c19b76..5a247eb71899 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -931,7 +931,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0);
drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0);
- drm_mode_connector_set_path_property(&mstc->connector, path);
+ drm_connector_set_path_property(&mstc->connector, path);
return 0;
}
diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
index 37956cfc0b6d..f920be236cc9 100644
--- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -290,7 +290,7 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol
drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
- drm_mode_connector_set_path_property(connector, pathprop);
+ drm_connector_set_path_property(connector, pathprop);
return connector;
}
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index bc5fbd39cf9a..4a0f0f41afa1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -2114,7 +2114,7 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector,
drm_mode_probed_add(connector, mode);
}
- drm_mode_connector_list_update(connector);
+ drm_connector_list_update(connector);
/* Move the prefered mode first, help apps pick the right mode. */
drm_mode_sort(&connector->modes);
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index dfd7a3595a6c..012d2f2d1f88 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -915,7 +915,7 @@ struct drm_connector {
* @path_blob_ptr:
*
* DRM blob property data for the DP MST path property. This should only
- * be updated by calling drm_mode_connector_set_path_property().
+ * be updated by calling drm_connector_set_path_property().
*/
struct drm_property_blob *path_blob_ptr;
@@ -1042,7 +1042,7 @@ struct drm_connector {
* the tiling and virtualize both &drm_crtc and &drm_plane if needed.
*
* This should only be updated by calling
- * drm_mode_connector_set_tile_property().
+ * drm_connector_set_tile_property().
*/
struct drm_property_blob *tile_blob_ptr;
@@ -1187,13 +1187,13 @@ void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
int drm_mode_create_suggested_offset_properties(struct drm_device *dev);
-int drm_mode_connector_set_path_property(struct drm_connector *connector,
- const char *path);
-int drm_mode_connector_set_tile_property(struct drm_connector *connector);
+int drm_connector_set_path_property(struct drm_connector *connector,
+ const char *path);
+int drm_connector_set_tile_property(struct drm_connector *connector);
int drm_connector_update_edid_property(struct drm_connector *connector,
const struct edid *edid);
-void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
- uint64_t link_status);
+void drm_connector_set_link_status_property(struct drm_connector *connector,
+ uint64_t link_status);
int drm_connector_init_panel_orientation_property(
struct drm_connector *connector, int width, int height);
diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
index b159fe07fcf9..baded6514456 100644
--- a/include/drm/drm_modes.h
+++ b/include/drm/drm_modes.h
@@ -530,7 +530,7 @@ drm_mode_validate_ycbcr420(const struct drm_display_mode *mode,
void drm_mode_prune_invalid(struct drm_device *dev,
struct list_head *mode_list, bool verbose);
void drm_mode_sort(struct list_head *mode_list);
-void drm_mode_connector_list_update(struct drm_connector *connector);
+void drm_connector_list_update(struct drm_connector *connector);
/* parsing cmdline modes */
bool
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 08/15] drm: Switch drm_plane_state to inline kerneldoc style
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (6 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 07/15] drm: drop _mode_ from remaining connector functions Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-13 15:08 ` Sean Paul
2018-07-09 8:40 ` [PATCH 09/15] drm: switch drm_plane to inline comments Daniel Vetter
` (6 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
For consistency and to encourage more detailed documentation. While
doing this also beefed up a few of the comments, linking at least to
the setup function. Plus fixed all the hyperlinks.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
include/drm/drm_plane.h | 86 +++++++++++++++++++++++++++--------------
1 file changed, 56 insertions(+), 30 deletions(-)
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index cee9dfaaa740..1a647f8f5661 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -34,31 +34,15 @@ struct drm_modeset_acquire_ctx;
/**
* struct drm_plane_state - mutable plane state
- * @plane: backpointer to the plane
- * @crtc_w: width of visible portion of plane on crtc
- * @crtc_h: height of visible portion of plane on crtc
- * @src_x: left position of visible portion of plane within
- * plane (in 16.16)
- * @src_y: upper position of visible portion of plane within
- * plane (in 16.16)
- * @src_w: width of visible portion of plane (in 16.16)
- * @src_h: height of visible portion of plane (in 16.16)
- * @alpha: opacity of the plane
- * @rotation: rotation of the plane
- * @zpos: priority of the given plane on crtc (optional)
- * Note that multiple active planes on the same crtc can have an identical
- * zpos value. The rule to solving the conflict is to compare the plane
- * object IDs; the plane with a higher ID must be stacked on top of a
- * plane with a lower ID.
- * @normalized_zpos: normalized value of zpos: unique, range from 0 to N-1
- * where N is the number of active planes for given crtc. Note that
- * the driver must set drm_mode_config.normalize_zpos or call
- * drm_atomic_normalize_zpos() to update this before it can be trusted.
- * @src: clipped source coordinates of the plane (in 16.16)
- * @dst: clipped destination coordinates of the plane
- * @state: backpointer to global drm_atomic_state
+ *
+ * Please not that the destination coordinates @crtc_x, @crtc_y, @crtc_h and
+ * @crtc_w and the source coordinates @src_x, @src_y, @src_h and @src_w are the
+ * raw coordinates provided by userspace. Drivers should use
+ * drm_atomic_helper_check_plane_state() and only use the derived rectangles in
+ * @src and @dst to program the hardware.
*/
struct drm_plane_state {
+ /** @plane: backpointer to the plane */
struct drm_plane *plane;
/**
@@ -87,7 +71,7 @@ struct drm_plane_state {
* preserved.
*
* Drivers should store any implicit fence in this from their
- * &drm_plane_helper.prepare_fb callback. See drm_gem_fb_prepare_fb()
+ * &drm_plane_helper_funcs.prepare_fb callback. See drm_gem_fb_prepare_fb()
* and drm_gem_fb_simple_display_pipe_prepare_fb() for suitable helpers.
*/
struct dma_fence *fence;
@@ -108,20 +92,60 @@ struct drm_plane_state {
*/
int32_t crtc_y;
+ /** @crtc_w: width of visible portion of plane on crtc */
+ /** @crtc_h: height of visible portion of plane on crtc */
uint32_t crtc_w, crtc_h;
- /* Source values are 16.16 fixed point */
- uint32_t src_x, src_y;
+ /**
+ * @src_x: left position of visible portion of plane within plane (in
+ * 16.16 fixed point).
+ */
+ uint32_t src_x;
+ /**
+ * @src_y: upper position of visible portion of plane within plane (in
+ * 16.16 fixed point).
+ */
+ uint32_t src_y;
+ /** @src_w: width of visible portion of plane (in 16.16) */
+ /** @src_h: height of visible portion of plane (in 16.16) */
uint32_t src_h, src_w;
- /* Plane opacity */
+ /**
+ * @alpha:
+ * Opacity of the plane with 0 as completely transparent and 0xffff as
+ * completely opaque. See drm_plane_create_alpha_property() for more
+ * details.
+ */
u16 alpha;
- /* Plane rotation */
+ /**
+ * @rotation:
+ * Rotation of the plane. See drm_plane_create_rotation_property() for
+ * more details.
+ */
unsigned int rotation;
- /* Plane zpos */
+ /**
+ * @zpos:
+ * Priority of the given plane on crtc (optional).
+ *
+ * Note that multiple active planes on the same crtc can have an
+ * identical zpos value. The rule to solving the conflict is to compare
+ * the plane object IDs; the plane with a higher ID must be stacked on
+ * top of a plane with a lower ID.
+ *
+ * See drm_plane_create_zpos_property() and
+ * drm_plane_create_zpos_immutable_property() for more details.
+ */
unsigned int zpos;
+
+ /**
+ * @normalized_zpos:
+ * Normalized value of zpos: unique, range from 0 to N-1 where N is the
+ * number of active planes for given crtc. Note that the driver must set
+ * &drm_mode_config.normalize_zpos or call drm_atomic_normalize_zpos() to
+ * update this before it can be trusted.
+ */
unsigned int normalized_zpos;
/**
@@ -138,7 +162,8 @@ struct drm_plane_state {
*/
enum drm_color_range color_range;
- /* Clipped coordinates */
+ /** @src: clipped source coordinates of the plane (in 16.16) */
+ /** @dst: clipped destination coordinates of the plane */
struct drm_rect src, dst;
/**
@@ -157,6 +182,7 @@ struct drm_plane_state {
*/
struct drm_crtc_commit *commit;
+ /** @state: backpointer to global drm_atomic_state */
struct drm_atomic_state *state;
};
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 09/15] drm: switch drm_plane to inline comments
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (7 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 08/15] drm: Switch drm_plane_state to inline kerneldoc style Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-13 15:20 ` Sean Paul
2018-07-09 8:40 ` [PATCH 10/15] drm: drop drmP.h include from drm_plane.c Daniel Vetter
` (5 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
And use that opportunity to polish the kernel doc all around:
- Beef up some of the documentation.
- Intro text for drm_plane and better links
- Fix all the hyperlinks!
v2: Fix linebreaks.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
Documentation/gpu/drm-kms.rst | 11 +++--
include/drm/drm_crtc.h | 4 +-
include/drm/drm_plane.h | 88 +++++++++++++++++++++++++----------
3 files changed, 72 insertions(+), 31 deletions(-)
diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst
index 58eed08fbe31..5dee6b8a4c12 100644
--- a/Documentation/gpu/drm-kms.rst
+++ b/Documentation/gpu/drm-kms.rst
@@ -56,11 +56,12 @@ Overview
The basic object structure KMS presents to userspace is fairly simple.
Framebuffers (represented by :c:type:`struct drm_framebuffer <drm_framebuffer>`,
-see `Frame Buffer Abstraction`_) feed into planes. One or more (or even no)
-planes feed their pixel data into a CRTC (represented by :c:type:`struct
-drm_crtc <drm_crtc>`, see `CRTC Abstraction`_) for blending. The precise
-blending step is explained in more detail in `Plane Composition Properties`_ and
-related chapters.
+see `Frame Buffer Abstraction`_) feed into planes. Planes are represented by
+:c:type:`struct drm_plane <drm_plane>`, see `Plane Abstraction`_ for more
+details. One or more (or even no) planes feed their pixel data into a CRTC
+(represented by :c:type:`struct drm_crtc <drm_crtc>`, see `CRTC Abstraction`_)
+for blending. The precise blending step is explained in more detail in `Plane
+Composition Properties`_ and related chapters.
For the output routing the first step is encoders (represented by
:c:type:`struct drm_encoder <drm_encoder>`, see `Encoder Abstraction`_). Those
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 23eddbccab10..5afe2deb76b7 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -942,8 +942,8 @@ static inline unsigned int drm_crtc_index(const struct drm_crtc *crtc)
* drm_crtc_mask - find the mask of a registered CRTC
* @crtc: CRTC to find mask for
*
- * Given a registered CRTC, return the mask bit of that CRTC for an
- * encoder's possible_crtcs field.
+ * Given a registered CRTC, return the mask bit of that CRTC for the
+ * &drm_encoder.possible_crtcs and &drm_plane.possible_crtcs fields.
*/
static inline uint32_t drm_crtc_mask(const struct drm_crtc *crtc)
{
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index 1a647f8f5661..8a152dc16ea5 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -525,30 +525,27 @@ enum drm_plane_type {
/**
* struct drm_plane - central DRM plane control structure
- * @dev: DRM device this plane belongs to
- * @head: for list management
- * @name: human readable name, can be overwritten by the driver
- * @base: base mode object
- * @possible_crtcs: pipes this plane can be bound to
- * @format_types: array of formats supported by this plane
- * @format_count: number of formats supported
- * @format_default: driver hasn't supplied supported formats for the plane
- * @modifiers: array of modifiers supported by this plane
- * @modifier_count: number of modifiers supported
- * @old_fb: Temporary tracking of the old fb while a modeset is ongoing. Used by
- * drm_mode_set_config_internal() to implement correct refcounting.
- * @funcs: helper functions
- * @properties: property tracking for this plane
- * @type: type of plane (overlay, primary, cursor)
- * @alpha_property: alpha property for this plane
- * @zpos_property: zpos property for this plane
- * @rotation_property: rotation property for this plane
- * @helper_private: mid-layer private data
+ *
+ * Planes represent the scanout hardware of a display block. They receive their
+ * input data from a &drm_framebuffer and feed it to a &drm_crtc. Planes control
+ * the color conversion, see `Plane Composition Properties`_ for more details,
+ * and are also involved in the color conversion of input pixels, see `Color
+ * Management Properties`_ for details on that.
*/
struct drm_plane {
+ /** @dev: DRM device this plane belongs to */
struct drm_device *dev;
+
+ /**
+ * @head:
+ *
+ * List of all planes on @dev, linked from &drm_mode_config.plane_list.
+ * Invariant over the lifetime of @dev and therefore does not need
+ * locking.
+ */
struct list_head head;
+ /** @name: human readable name, can be overwritten by the driver */
char *name;
/**
@@ -562,35 +559,62 @@ struct drm_plane {
*/
struct drm_modeset_lock mutex;
+ /** @base: base mode object */
struct drm_mode_object base;
+ /**
+ * @possible_crtcs: pipes this plane can be bound to constructed from
+ * drm_crtc_mask()
+ */
uint32_t possible_crtcs;
+ /** @format_types: array of formats supported by this plane */
uint32_t *format_types;
+ /** @format_count: Size of the array pointed at by @format_types. */
unsigned int format_count;
+ /**
+ * @format_default: driver hasn't supplied supported formats for the
+ * plane. Used by the drm_plane_init compatibility wrapper only.
+ */
bool format_default;
+ /** @modifiers: array of modifiers supported by this plane */
uint64_t *modifiers;
+ /** @modifier_count: Size of the array pointed at by @modifier_count. */
unsigned int modifier_count;
/**
- * @crtc: Currently bound CRTC, only really meaningful for non-atomic
- * drivers. Atomic drivers should instead check &drm_plane_state.crtc.
+ * @crtc:
+ *
+ * Currently bound CRTC, only meaningful for non-atomic drivers. For
+ * atomic drivers this is forced to be NULL, atomic drivers should
+ * instead check &drm_plane_state.crtc.
*/
struct drm_crtc *crtc;
/**
- * @fb: Currently bound framebuffer, only really meaningful for
- * non-atomic drivers. Atomic drivers should instead check
- * &drm_plane_state.fb.
+ * @fb:
+ *
+ * Currently bound framebuffer, only meaningful for non-atomic drivers.
+ * For atomic drivers this is forced to be NULL, atomic drivers should
+ * instead check &drm_plane_state.fb.
*/
struct drm_framebuffer *fb;
+ /**
+ * @old_fb:
+ *
+ * Temporary tracking of the old fb while a modeset is ongoing. Only
+ * used by non-atomic drivers, forced to be NULL for atomic drivers.
+ */
struct drm_framebuffer *old_fb;
+ /** @funcs: plane control functions */
const struct drm_plane_funcs *funcs;
+ /** @properties: property tracking for this plane */
struct drm_object_properties properties;
+ /** @type: Type of plane, see &enum drm_plane_type for details. */
enum drm_plane_type type;
/**
@@ -599,6 +623,7 @@ struct drm_plane {
*/
unsigned index;
+ /** @helper_private: mid-layer private data */
const struct drm_plane_helper_funcs *helper_private;
/**
@@ -616,8 +641,23 @@ struct drm_plane {
*/
struct drm_plane_state *state;
+ /**
+ * @alpha_property:
+ * Optional alpha property for this plane. See
+ * drm_plane_create_alpha_property().
+ */
struct drm_property *alpha_property;
+ /**
+ * @zpos_property:
+ * Optional zpos property for this plane. See
+ * drm_plane_create_zpos_property().
+ */
struct drm_property *zpos_property;
+ /**
+ * @rotation_property:
+ * Optional rotation property for this plane. See
+ * drm_plane_create_rotation_property().
+ */
struct drm_property *rotation_property;
/**
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 10/15] drm: drop drmP.h include from drm_plane.c
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (8 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 09/15] drm: switch drm_plane to inline comments Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-13 15:22 ` Sean Paul
2018-07-09 8:40 ` [PATCH 11/15] drm/doc: move struct drm_crtc to in-line comments Daniel Vetter
` (4 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
Just a bit of missing includes and pre declarations.
Note: This needs the patch to move for_each_if from drmP.h to kernel.h
or it won't compile.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/drm_crtc_internal.h | 8 ++++++++
drivers/gpu/drm/drm_plane.c | 11 ++++++++++-
include/drm/drm_color_mgmt.h | 1 +
include/drm/drm_plane.h | 2 ++
include/drm/drm_property.h | 2 ++
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index b61322763394..ff5e0d521c21 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -31,6 +31,14 @@
* and are not exported to drivers.
*/
+enum drm_mode_status;
+enum drm_connector_force;
+
+struct drm_display_mode;
+struct work_struct;
+struct drm_connector;
+struct drm_bridge;
+struct edid;
/* drm_crtc.c */
int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,
diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
index df0b4ebbedbf..a26a1b6c8f6a 100644
--- a/drivers/gpu/drm/drm_plane.c
+++ b/drivers/gpu/drm/drm_plane.c
@@ -20,8 +20,17 @@
* OF THIS SOFTWARE.
*/
-#include <drm/drmP.h>
+#include <linux/slab.h>
+#include <linux/uaccess.h>
+
#include <drm/drm_plane.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_print.h>
+#include <drm/drm_framebuffer.h>
+#include <drm/drm_file.h>
+#include <drm/drm_crtc.h>
+#include <drm/drm_fourcc.h>
+#include <drm/drm_vblank.h>
#include "drm_crtc_internal.h"
diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h
index 44f04233e3db..90ef9996d9a4 100644
--- a/include/drm/drm_color_mgmt.h
+++ b/include/drm/drm_color_mgmt.h
@@ -24,6 +24,7 @@
#define __DRM_COLOR_MGMT_H__
#include <linux/ctype.h>
+#include <drm/drm_property.h>
struct drm_crtc;
struct drm_plane;
diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
index 8a152dc16ea5..311c31714c15 100644
--- a/include/drm/drm_plane.h
+++ b/include/drm/drm_plane.h
@@ -27,6 +27,8 @@
#include <linux/ctype.h>
#include <drm/drm_mode_object.h>
#include <drm/drm_color_mgmt.h>
+#include <drm/drm_rect.h>
+#include <drm/drm_modeset_lock.h>
struct drm_crtc;
struct drm_printer;
diff --git a/include/drm/drm_property.h b/include/drm/drm_property.h
index 1d5c0b2a8956..350fb58f819c 100644
--- a/include/drm/drm_property.h
+++ b/include/drm/drm_property.h
@@ -27,6 +27,8 @@
#include <linux/ctype.h>
#include <drm/drm_mode_object.h>
+#include <uapi/drm/drm_mode.h>
+
/**
* struct drm_property_enum - symbolic values for enumerations
* @value: numeric property value for this enum entry
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 11/15] drm/doc: move struct drm_crtc to in-line comments
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (9 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 10/15] drm: drop drmP.h include from drm_plane.c Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-13 15:27 ` Sean Paul
2018-07-09 8:40 ` [PATCH 12/15] drm/doc: Group the fb gem helpers better Daniel Vetter
` (3 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
And clean them up a bit, as usual.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
include/drm/drm_crtc.h | 126 +++++++++++++++++++++++++++++++----------
1 file changed, 97 insertions(+), 29 deletions(-)
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 5afe2deb76b7..0cfc098f31d3 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -724,35 +724,25 @@ struct drm_crtc_funcs {
/**
* struct drm_crtc - central CRTC control structure
- * @dev: parent DRM device
- * @port: OF node used by drm_of_find_possible_crtcs()
- * @head: list management
- * @name: human readable name, can be overwritten by the driver
- * @mutex: per-CRTC locking
- * @base: base KMS object for ID tracking etc.
- * @primary: primary plane for this CRTC
- * @cursor: cursor plane for this CRTC
- * @cursor_x: current x position of the cursor, used for universal cursor planes
- * @cursor_y: current y position of the cursor, used for universal cursor planes
- * @enabled: is this CRTC enabled?
- * @mode: current mode timings
- * @hwmode: mode timings as programmed to hw regs
- * @x: x position on screen
- * @y: y position on screen
- * @funcs: CRTC control functions
- * @gamma_size: size of gamma ramp
- * @gamma_store: gamma ramp values
- * @helper_private: mid-layer private data
- * @properties: property tracking for this CRTC
*
* Each CRTC may have one or more connectors associated with it. This structure
* allows the CRTC to be controlled.
*/
struct drm_crtc {
+ /** @dev: parent DRM device */
struct drm_device *dev;
+ /** @port: OF node used by drm_of_find_possible_crtcs(). */
struct device_node *port;
+ /**
+ * @head:
+ *
+ * List of all CRTCs on @dev, linked from &drm_mode_config.crtc_list.
+ * Invariant over the lifetime of @dev and therefore does not need
+ * locking.
+ */
struct list_head head;
+ /** @name: human readable name, can be overwritten by the driver */
char *name;
/**
@@ -767,10 +757,25 @@ struct drm_crtc {
*/
struct drm_modeset_lock mutex;
+ /** @base: base KMS object for ID tracking etc. */
struct drm_mode_object base;
- /* primary and cursor planes for CRTC */
+ /**
+ * @primary:
+ * Primary plane for this CRTC. Note that this is only
+ * relevant for legacy IOCTL, it specifies the plane implicitly used by
+ * the SETCRTC and PAGE_FLIP IOCTLs. It does not have any significance
+ * beyond that.
+ */
struct drm_plane *primary;
+
+ /**
+ * @cursor:
+ * Cursor plane for this CRTC. Note that this is only relevant for
+ * legacy IOCTL, it specifies the plane implicitly used by the SETCURSOR
+ * and SETCURSOR2 IOCTLs. It does not have any significance
+ * beyond that.
+ */
struct drm_plane *cursor;
/**
@@ -779,30 +784,94 @@ struct drm_crtc {
*/
unsigned index;
- /* position of cursor plane on crtc */
+ /**
+ * @cursor_x: Current x position of the cursor, used for universal
+ * cursor planes because the SETCURSOR IOCTL only can update the
+ * framebuffer without supplying the coordinates. Drivers should not use
+ * this directly, atomic drivers should look at &drm_plane_state.crtc_x
+ * of the cursor plane instead.
+ */
int cursor_x;
+ /**
+ * @cursor_y: Current y position of the cursor, used for universal
+ * cursor planes because the SETCURSOR IOCTL only can update the
+ * framebuffer without supplying the coordinates. Drivers should not use
+ * this directly, atomic drivers should look at &drm_plane_state.crtc_y
+ * of the cursor plane instead.
+ */
int cursor_y;
+ /**
+ * @enabled:
+ *
+ * Is this CRTC enabled? Should only be used by legacy drivers, atomic
+ * drivers should instead consult &drm_crtc_state.enable and
+ * &drm_crtc_state.active. Atomic drivers can update this by calling
+ * drm_atomic_helper_update_legacy_modeset_state().
+ */
bool enabled;
- /* Requested mode from modesetting. */
+ /**
+ * @mode:
+ *
+ * Current mode timings. Should only be used by legacy drivers, atomic
+ * drivers should instead consult &drm_crtc_state.mode. Atomic drivers
+ * can update this by calling
+ * drm_atomic_helper_update_legacy_modeset_state().
+ */
struct drm_display_mode mode;
- /* Programmed mode in hw, after adjustments for encoders,
- * crtc, panel scaling etc. Needed for timestamping etc.
+ /**
+ * @hwmode:
+ *
+ * Programmed mode in hw, after adjustments for encoders, crtc, panel
+ * scaling etc. Should only be used by legacy drivers, for high
+ * precision vblank timestamps in
+ * drm_calc_vbltimestamp_from_scanoutpos().
+ *
+ * Note that atomic drivers should not use this, but instead use
+ * &drm_crtc_state.adjusted_mode. And for high-precision timestamps
+ * drm_calc_vbltimestamp_from_scanoutpos() used &drm_vblank_crtc.hwmode,
+ * which is filled out by calling drm_calc_timestamping_constants().
*/
struct drm_display_mode hwmode;
- int x, y;
+ /**
+ * @x:
+ * x position on screen. Should only be used by legacy drivers, atomic
+ * drivers should look at &drm_plane_state.crtc_x of the primary plane
+ * instead. Updated by calling
+ * drm_atomic_helper_update_legacy_modeset_state().
+ */
+ int x;
+ /**
+ * @y:
+ * y position on screen. Should only be used by legacy drivers, atomic
+ * drivers should look at &drm_plane_state.crtc_y of the primary plane
+ * instead. Updated by calling
+ * drm_atomic_helper_update_legacy_modeset_state().
+ */
+ int y;
+
+ /** @funcs: CRTC control functions */
const struct drm_crtc_funcs *funcs;
- /* Legacy FB CRTC gamma size for reporting to userspace */
+ /**
+ * @gamma_size: Size of legacy gamma ramp reported to userspace. Set up
+ * by calling drm_mode_crtc_set_gamma_size().
+ */
uint32_t gamma_size;
+
+ /**
+ * @gamma_store: Gamma ramp values used by the legacy SETGAMME and
+ * GET_GAMMA IOCTls. Set up by calling drm_mode_crtc_set_gamma_size().
+ */
uint16_t *gamma_store;
- /* if you are using the helper */
+ /** @helper_private: mid-layer private data */
const struct drm_crtc_helper_funcs *helper_private;
+ /** @properties: property tracking for this CRTC */
struct drm_object_properties properties;
/**
@@ -872,7 +941,6 @@ struct drm_crtc {
*
* spinlock to protect the fences in the fence_context.
*/
-
spinlock_t fence_lock;
/**
* @fence_seqno:
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 12/15] drm/doc: Group the fb gem helpers better
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (10 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 11/15] drm/doc: move struct drm_crtc to in-line comments Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-12 12:18 ` Noralf Trønnes
2018-07-09 8:40 ` [PATCH 13/15] drm/doc: Includ drm_of.c helpers Daniel Vetter
` (2 subsequent siblings)
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
Instead of spreading them all over the place.
Cc: Noralf Trønnes <noralf@tronnes.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
Documentation/gpu/drm-kms-helpers.rst | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst
index e37557b30f62..8aece8605f4c 100644
--- a/Documentation/gpu/drm-kms-helpers.rst
+++ b/Documentation/gpu/drm-kms-helpers.rst
@@ -109,6 +109,15 @@ Framebuffer CMA Helper Functions Reference
.. _drm_bridges:
+Framebuffer GEM Helper Reference
+================================
+
+.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
+ :doc: overview
+
+.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
+ :export:
+
Bridges
=======
@@ -282,15 +291,6 @@ Auxiliary Modeset Helpers
.. kernel-doc:: drivers/gpu/drm/drm_modeset_helper.c
:export:
-Framebuffer GEM Helper Reference
-================================
-
-.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
- :doc: overview
-
-.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
- :export:
-
Legacy Plane Helper Reference
=============================
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 13/15] drm/doc: Includ drm_of.c helpers
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (11 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 12/15] drm/doc: Group the fb gem helpers better Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-13 15:28 ` Sean Paul
2018-07-09 8:40 ` [PATCH 14/15] drm/doc: use inline kerneldoc style for drm_crtc_state Daniel Vetter
2018-07-09 8:40 ` [PATCH 15/15] drm: drop drmP.h include from drm_crtc.c Daniel Vetter
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
Fixes a dead link I spotted in the struct drm_crtc docs. Comments
themselves are in a surprisingly good state.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
Documentation/gpu/drm-kms-helpers.rst | 9 +++++++++
drivers/gpu/drm/drm_of.c | 9 ++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst
index 8aece8605f4c..77e5398806a5 100644
--- a/Documentation/gpu/drm-kms-helpers.rst
+++ b/Documentation/gpu/drm-kms-helpers.rst
@@ -291,6 +291,15 @@ Auxiliary Modeset Helpers
.. kernel-doc:: drivers/gpu/drm/drm_modeset_helper.c
:export:
+OF/DT Helpers
+=============
+
+.. kernel-doc:: drivers/gpu/drm/drm_of.c
+ :doc: overview
+
+.. kernel-doc:: drivers/gpu/drm/drm_of.c
+ :export:
+
Legacy Plane Helper Reference
=============================
diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
index 3b8c7a6a5720..e11f91244593 100644
--- a/drivers/gpu/drm/drm_of.c
+++ b/drivers/gpu/drm/drm_of.c
@@ -9,6 +9,13 @@
#include <drm/drm_panel.h>
#include <drm/drm_of.h>
+/**
+ * DOC: overview
+ *
+ * A set of helper functions to aid DRM drivers in parsing standard DT
+ * properties.
+ */
+
static void drm_release_of(struct device *dev, void *data)
{
of_node_put(data);
@@ -94,7 +101,7 @@ EXPORT_SYMBOL_GPL(drm_of_component_match_add);
* drm_of_component_probe - Generic probe function for a component based master
* @dev: master device containing the OF node
* @compare_of: compare function used for matching components
- * @master_ops: component master ops to be used
+ * @m_ops: component master ops to be used
*
* Parse the platform device OF node and bind all the components associated
* with the master. Interface ports are added before the encoders in order to
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 14/15] drm/doc: use inline kerneldoc style for drm_crtc_state
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (12 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 13/15] drm/doc: Includ drm_of.c helpers Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-13 15:33 ` Sean Paul
2018-07-09 8:40 ` [PATCH 15/15] drm: drop drmP.h include from drm_crtc.c Daniel Vetter
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
Lots of added text here since I think the various control flow bits
are worth explaining a bit better.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
include/drm/drm_crtc.h | 110 ++++++++++++++++++++++++++++++++---------
1 file changed, 86 insertions(+), 24 deletions(-)
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 0cfc098f31d3..3788e1235e24 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -77,21 +77,6 @@ struct drm_plane_helper_funcs;
/**
* struct drm_crtc_state - mutable CRTC state
- * @crtc: backpointer to the CRTC
- * @enable: whether the CRTC should be enabled, gates all other state
- * @active: whether the CRTC is actively displaying (used for DPMS)
- * @planes_changed: planes on this crtc are updated
- * @mode_changed: @mode or @enable has been changed
- * @active_changed: @active has been toggled.
- * @connectors_changed: connectors to this crtc have been updated
- * @zpos_changed: zpos values of planes on this crtc have been updated
- * @color_mgmt_changed: color management properties have changed (degamma or
- * gamma LUT or CSC matrix)
- * @plane_mask: bitmask of (1 << drm_plane_index(plane)) of attached planes
- * @connector_mask: bitmask of (1 << drm_connector_index(connector)) of attached connectors
- * @encoder_mask: bitmask of (1 << drm_encoder_index(encoder)) of attached encoders
- * @mode_blob: &drm_property_blob for @mode
- * @state: backpointer to global drm_atomic_state
*
* Note that the distinction between @enable and @active is rather subtile:
* Flipping @active while @enable is set without changing anything else may
@@ -102,31 +87,104 @@ struct drm_plane_helper_funcs;
*
* The three booleans active_changed, connectors_changed and mode_changed are
* intended to indicate whether a full modeset is needed, rather than strictly
- * describing what has changed in a commit.
- * See also: drm_atomic_crtc_needs_modeset()
+ * describing what has changed in a commit. See also:
+ * drm_atomic_crtc_needs_modeset()
+ *
+ * WARNING: Transitional helpers (like drm_helper_crtc_mode_set() or
+ * drm_helper_crtc_mode_set_base()) do not maintain many of the derived control
+ * state like @plane_mask so drivers not converted over to atomic helpers should
+ * not rely on these being accurate!
*/
struct drm_crtc_state {
+ /** @crtc: backpointer to the CRTC */
struct drm_crtc *crtc;
+ /**
+ * @enable: Whether the CRTC should be enabled, gates all other state.
+ * This controls reservations of shared resources. Actual hardware state
+ * is controlled by @active.
+ */
bool enable;
+
+ /**
+ * @active: Whether the CRTC is actively displaying (used for DPMS).
+ * Implies that @enable is set. The driver must not release any shared
+ * resources if @active is set to false but @enable still true, because
+ * userspace expects that a DPMS ON always succeeds.
+ *
+ * Hence drivers must not consult @active in their various
+ * &drm_mode_config_funcs.atomic_check callback to reject an atomic
+ * commit. They can consult it to aid in the computation of derived
+ * hardware state, since even in the DPMS OFF state the display hardware
+ * should be as much powered down as when the CRTC is completely
+ * disabled through setting @enable to false.
+ */
bool active;
- /* computed state bits used by helpers and drivers */
+ /**
+ * @planes_changed: Planes on this crtc are updated. Used by the atomic
+ * helpers and drivers to steer the atomic commit control flow.
+ */
bool planes_changed : 1;
+
+ /**
+ * @mode_changed: @mode or @enable has been changed. Used by the atomic
+ * helpers and drivers to steer the atomic commit control flow. See also
+ * drm_atomic_crtc_needs_modeset().
+ *
+ * Drivers are supposed to set this for any CRTC state changes that
+ * require a full modeset. They can also reset it to false if e.g. a
+ * @mode change can be done without a full modeset by only changing
+ * scaler settings.
+ */
bool mode_changed : 1;
+
+ /**
+ * @active_changed: @active has been toggled. Used by the atomic
+ * helpers and drivers to steer the atomic commit control flow. See also
+ * drm_atomic_crtc_needs_modeset().
+ */
bool active_changed : 1;
+
+ /**
+ * @connectors_changed: Connectors to this crtc have been updated,
+ * either in their state or routing. Used by the atomic
+ * helpers and drivers to steer the atomic commit control flow. See also
+ * drm_atomic_crtc_needs_modeset().
+ *
+ * Drivers are supposed to set this as-needed from their own atomic
+ * check code, e.g. from &drm_encoder_helper_funcs.atomic_check
+ */
bool connectors_changed : 1;
+ /**
+ * @zpos_changed: zpos values of planes on this crtc have been updated.
+ * Used by the atomic helpers and drivers to steer the atomic commit
+ * control flow.
+ */
bool zpos_changed : 1;
+ /**
+ * @color_mgmt_changed: Color management properties have changed
+ * (@gamma_lut, @degamma_lut or @ctm). Used by the atomic helpers and
+ * drivers to steer the atomic commit control flow.
+ */
bool color_mgmt_changed : 1;
- /* attached planes bitmask:
- * WARNING: transitional helpers do not maintain plane_mask so
- * drivers not converted over to atomic helpers should not rely
- * on plane_mask being accurate!
+ /**
+ * @plane_mask: Bitmask of drm_plane_mask(plane) of planes attached to
+ * this CRTC.
*/
u32 plane_mask;
+ /**
+ * @connector_mask: Bitmask of drm_connector_mask(connector) of
+ * connectors attached to this CRTC.
+ */
u32 connector_mask;
+
+ /**
+ * @encoder_mask: Bitmask of drm_encoder_mask(encoder) of encoders
+ * attached to this CRTC.
+ */
u32 encoder_mask;
/**
@@ -136,7 +194,7 @@ struct drm_crtc_state {
* differences between the mode requested by userspace in @mode and what
* is actually programmed into the hardware.
*
- * For drivers using drm_bridge, this stores hardware display timings
+ * For drivers using &drm_bridge, this stores hardware display timings
* used between the CRTC and the first bridge. For other drivers, the
* meaning of the adjusted_mode field is purely driver implementation
* defined information, and will usually be used to store the hardware
@@ -161,7 +219,10 @@ struct drm_crtc_state {
*/
struct drm_display_mode mode;
- /* blob property to expose current mode to atomic userspace */
+ /**
+ * @mode_blob: &drm_property_blob for @mode, for exposing the mode to
+ * atomic userspace.
+ */
struct drm_property_blob *mode_blob;
/**
@@ -265,6 +326,7 @@ struct drm_crtc_state {
*/
struct drm_crtc_commit *commit;
+ /** @state: backpointer to global drm_atomic_state */
struct drm_atomic_state *state;
};
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 15/15] drm: drop drmP.h include from drm_crtc.c
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
` (13 preceding siblings ...)
2018-07-09 8:40 ` [PATCH 14/15] drm/doc: use inline kerneldoc style for drm_crtc_state Daniel Vetter
@ 2018-07-09 8:40 ` Daniel Vetter
2018-07-12 13:51 ` Sean Paul
14 siblings, 1 reply; 33+ messages in thread
From: Daniel Vetter @ 2018-07-09 8:40 UTC (permalink / raw)
To: DRI Development; +Cc: Daniel Vetter, Daniel Vetter
This is starting to become easy!
Note: This needs the patch to move for_each_if from drmP.h to kernel.h
or it won't compile.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
drivers/gpu/drm/drm_crtc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index a6906c4ab880..30f93e460f4e 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -34,7 +34,7 @@
#include <linux/slab.h>
#include <linux/export.h>
#include <linux/dma-fence.h>
-#include <drm/drmP.h>
+#include <linux/uaccess.h>
#include <drm/drm_crtc.h>
#include <drm/drm_edid.h>
#include <drm/drm_fourcc.h>
@@ -42,6 +42,9 @@
#include <drm/drm_atomic.h>
#include <drm/drm_auth.h>
#include <drm/drm_debugfs_crc.h>
+#include <drm/drm_drv.h>
+#include <drm/drm_print.h>
+#include <drm/drm_file.h>
#include "drm_crtc_internal.h"
#include "drm_internal.h"
--
2.18.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH 12/15] drm/doc: Group the fb gem helpers better
2018-07-09 8:40 ` [PATCH 12/15] drm/doc: Group the fb gem helpers better Daniel Vetter
@ 2018-07-12 12:18 ` Noralf Trønnes
0 siblings, 0 replies; 33+ messages in thread
From: Noralf Trønnes @ 2018-07-12 12:18 UTC (permalink / raw)
To: Daniel Vetter, DRI Development; +Cc: Daniel Vetter
Den 09.07.2018 10.40, skrev Daniel Vetter:
> Instead of spreading them all over the place.
>
> Cc: Noralf Trønnes <noralf@tronnes.org>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
Acked-by: Noralf Trønnes <noralf@tronnes.org>
> Documentation/gpu/drm-kms-helpers.rst | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst
> index e37557b30f62..8aece8605f4c 100644
> --- a/Documentation/gpu/drm-kms-helpers.rst
> +++ b/Documentation/gpu/drm-kms-helpers.rst
> @@ -109,6 +109,15 @@ Framebuffer CMA Helper Functions Reference
>
> .. _drm_bridges:
>
> +Framebuffer GEM Helper Reference
> +================================
> +
> +.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
> + :doc: overview
> +
> +.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
> + :export:
> +
> Bridges
> =======
>
> @@ -282,15 +291,6 @@ Auxiliary Modeset Helpers
> .. kernel-doc:: drivers/gpu/drm/drm_modeset_helper.c
> :export:
>
> -Framebuffer GEM Helper Reference
> -================================
> -
> -.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
> - :doc: overview
> -
> -.. kernel-doc:: drivers/gpu/drm/drm_gem_framebuffer_helper.c
> - :export:
> -
> Legacy Plane Helper Reference
> =============================
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 15/15] drm: drop drmP.h include from drm_crtc.c
2018-07-09 8:40 ` [PATCH 15/15] drm: drop drmP.h include from drm_crtc.c Daniel Vetter
@ 2018-07-12 13:51 ` Sean Paul
2018-07-13 16:41 ` Daniel Vetter
0 siblings, 1 reply; 33+ messages in thread
From: Sean Paul @ 2018-07-12 13:51 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:16AM +0200, Daniel Vetter wrote:
> This is starting to become easy!
>
> Note: This needs the patch to move for_each_if from drmP.h to kernel.h
> or it won't compile.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Once for_each_if gets sorted out (however it goes).
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> drivers/gpu/drm/drm_crtc.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index a6906c4ab880..30f93e460f4e 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -34,7 +34,7 @@
> #include <linux/slab.h>
> #include <linux/export.h>
> #include <linux/dma-fence.h>
> -#include <drm/drmP.h>
> +#include <linux/uaccess.h>
> #include <drm/drm_crtc.h>
> #include <drm/drm_edid.h>
> #include <drm/drm_fourcc.h>
> @@ -42,6 +42,9 @@
> #include <drm/drm_atomic.h>
> #include <drm/drm_auth.h>
> #include <drm/drm_debugfs_crc.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_file.h>
>
> #include "drm_crtc_internal.h"
> #include "drm_internal.h"
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 01/15] drm: move drv test macros out of drmP.h
2018-07-09 8:40 ` [PATCH 01/15] drm: move drv test macros out of drmP.h Daniel Vetter
@ 2018-07-12 13:52 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-12 13:52 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:02AM +0200, Daniel Vetter wrote:
> Last bit the prevented us from starting to delete the drmP.h monster
> includes from source files!
>
> Also add kernel-doc while moving them.
>
> A nice consistent drm_dev_ prefix would be cute for these, but since
> they're used everywhere I've figured I'll leave this bikeshed aside
> for now.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> include/drm/drmP.h | 19 -------------------
> include/drm/drm_drv.h | 29 +++++++++++++++++++++++++++++
> 2 files changed, 29 insertions(+), 19 deletions(-)
>
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index c5dfbdb7271d..f7a19c2a7a80 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -102,25 +102,6 @@ struct pci_controller;
> #define DRM_SWITCH_POWER_CHANGING 2
> #define DRM_SWITCH_POWER_DYNAMIC_OFF 3
>
> -static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
> -{
> - return dev->driver->driver_features & feature;
> -}
> -
> -/**
> - * drm_drv_uses_atomic_modeset - check if the driver implements
> - * atomic_commit()
> - * @dev: DRM device
> - *
> - * This check is useful if drivers do not have DRIVER_ATOMIC set but
> - * have atomic modesetting internally implemented.
> - */
> -static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
> -{
> - return drm_core_check_feature(dev, DRIVER_ATOMIC) ||
> - dev->mode_config.funcs->atomic_commit != NULL;
> -}
> -
> /* returns true if currently okay to sleep */
> static inline bool drm_can_sleep(void)
> {
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index 7e545f5f94d3..46a8009784df 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -649,6 +649,35 @@ static inline bool drm_dev_is_unplugged(struct drm_device *dev)
> return true;
> }
>
> +/**
> + * drm_core_check_feature - check driver feature flags
> + * @dev: DRM device to check
> + * @feature: feature flag
> + *
> + * This checks @dev for driver features, see &drm_driver.driver_features and the
> + * various DRIVER_\* flags.
> + *
> + * Returns true if the @feature is supported, false otherwise.
> + */
> +static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
> +{
> + return dev->driver->driver_features & feature;
> +}
> +
> +/**
> + * drm_drv_uses_atomic_modeset - check if the driver implements
> + * atomic_commit()
> + * @dev: DRM device
> + *
> + * This check is useful if drivers do not have DRIVER_ATOMIC set but
> + * have atomic modesetting internally implemented.
> + */
> +static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
> +{
> + return drm_core_check_feature(dev, DRIVER_ATOMIC) ||
> + dev->mode_config.funcs->atomic_commit != NULL;
> +}
> +
>
> int drm_dev_set_unique(struct drm_device *dev, const char *name);
>
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 02/15] drm: Drop drmP.h from drm_connector.c
2018-07-09 8:40 ` [PATCH 02/15] drm: Drop drmP.h from drm_connector.c Daniel Vetter
@ 2018-07-12 13:53 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-12 13:53 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:03AM +0200, Daniel Vetter wrote:
> Only needed minimal changes in drm_internal.h (for the drm_ioctl_t
> type and a few forward declarations), plus a few missing includes in
> drm_connector.c.
>
> Yay, the last stage of the drm header cleanup can finally commence!
>
> Note: This needs the patch to move for_each_if from drmP.h to kernel.h
> or it won't compile.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> drivers/gpu/drm/drm_connector.c | 6 +++++-
> drivers/gpu/drm/drm_internal.h | 5 +++++
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index 5ada0640de5a..dc5a480200d8 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -20,11 +20,15 @@
> * OF THIS SOFTWARE.
> */
>
> -#include <drm/drmP.h>
> #include <drm/drm_connector.h>
> #include <drm/drm_edid.h>
> #include <drm/drm_encoder.h>
> #include <drm/drm_utils.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_file.h>
Whether intentional, or by luck, these were alphabetical. Can we please keep
this convention?
With that nit and for_each_if,
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> +
> +#include <linux/uaccess.h>
>
> #include "drm_crtc_internal.h"
> #include "drm_internal.h"
> diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h
> index 40179c5fc6b8..0c4eb4a9ab31 100644
> --- a/drivers/gpu/drm/drm_internal.h
> +++ b/drivers/gpu/drm/drm_internal.h
> @@ -21,9 +21,14 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> +#include <drm/drm_ioctl.h>
> +
> #define DRM_IF_MAJOR 1
> #define DRM_IF_MINOR 4
>
> +struct drm_prime_file_private;
> +struct dma_buf;
> +
> /* drm_file.c */
> extern struct mutex drm_global_mutex;
> struct drm_file *drm_file_alloc(struct drm_minor *minor);
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 03/15] drm/doc: switch drm_connector_state to inline comments
2018-07-09 8:40 ` [PATCH 03/15] drm/doc: switch drm_connector_state to inline comments Daniel Vetter
@ 2018-07-12 13:54 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-12 13:54 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:04AM +0200, Daniel Vetter wrote:
> For consistency. Also spelled out the docs for ->best_encoder a bit
> more while at it.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> include/drm/drm_connector.h | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index ad397dfc042b..6028638f3108 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -374,12 +374,9 @@ struct drm_tv_connector_state {
>
> /**
> * struct drm_connector_state - mutable connector state
> - * @connector: backpointer to the connector
> - * @best_encoder: can be used by helpers and drivers to select the encoder
> - * @state: backpointer to global drm_atomic_state
> - * @tv: TV connector state
> */
> struct drm_connector_state {
> + /** @connector: backpointer to the connector */
> struct drm_connector *connector;
>
> /**
> @@ -390,6 +387,13 @@ struct drm_connector_state {
> */
> struct drm_crtc *crtc;
>
> + /**
> + * @best_encoder:
> + *
> + * Used by the atomic helpers to select the encoder, through the
> + * &drm_connector_helper_funcs.atomic_best_encoder or
> + * &drm_connector_helper_funcs.best_encoder callbacks.
> + */
> struct drm_encoder *best_encoder;
>
> /**
> @@ -398,6 +402,7 @@ struct drm_connector_state {
> */
> enum drm_link_status link_status;
>
> + /** @state: backpointer to global drm_atomic_state */
> struct drm_atomic_state *state;
>
> /**
> @@ -407,6 +412,7 @@ struct drm_connector_state {
> */
> struct drm_crtc_commit *commit;
>
> + /** @tv: TV connector state */
> struct drm_tv_connector_state tv;
>
> /**
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 04/15] drm/doc: polish for sturct drm_connector
2018-07-09 8:40 ` [PATCH 04/15] drm/doc: polish for sturct drm_connector Daniel Vetter
@ 2018-07-12 14:01 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-12 14:01 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:05AM +0200, Daniel Vetter wrote:
> - switch everything over to inline comments
> - add notes about locking, links to functions and other related stuff
> - also include a note about Ville's soon-to-be-merged
> drm_connector_for_each_possible_encoder().
>
> Also check that all the hyperlinks in drm_connector.h work and fix
> them as needed.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> include/drm/drm_connector.h | 191 ++++++++++++++++++++++--------------
> 1 file changed, 120 insertions(+), 71 deletions(-)
>
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index 6028638f3108..a0300e3468cb 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -557,8 +557,7 @@ struct drm_connector_funcs {
> * received for this output connector->edid must be NULL.
> *
> * Drivers using the probe helpers should use
> - * drm_helper_probe_single_connector_modes() or
> - * drm_helper_probe_single_connector_modes_nomerge() to implement this
> + * drm_helper_probe_single_connector_modes() to implement this
> * function.
> *
> * RETURNS:
> @@ -769,45 +768,6 @@ struct drm_cmdline_mode {
>
> /**
> * struct drm_connector - central DRM connector control structure
> - * @dev: parent DRM device
> - * @kdev: kernel device for sysfs attributes
> - * @attr: sysfs attributes
> - * @head: list management
> - * @base: base KMS object
> - * @name: human readable name, can be overwritten by the driver
> - * @connector_type: one of the DRM_MODE_CONNECTOR_<foo> types from drm_mode.h
> - * @connector_type_id: index into connector type enum
> - * @interlace_allowed: can this connector handle interlaced modes?
> - * @doublescan_allowed: can this connector handle doublescan?
> - * @stereo_allowed: can this connector handle stereo modes?
> - * @funcs: connector control functions
> - * @edid_blob_ptr: DRM property containing EDID if present
> - * @properties: property tracking for this connector
> - * @dpms: current dpms state
> - * @helper_private: mid-layer private data
> - * @cmdline_mode: mode line parsed from the kernel cmdline for this connector
> - * @force: a DRM_FORCE_<foo> state for forced mode sets
> - * @override_edid: has the EDID been overwritten through debugfs for testing?
> - * @encoder_ids: valid encoders for this connector
> - * @eld: EDID-like data, if present
> - * @latency_present: AV delay info from ELD, if found
> - * @video_latency: video latency info from ELD, if found
> - * @audio_latency: audio latency info from ELD, if found
> - * @null_edid_counter: track sinks that give us all zeros for the EDID
> - * @bad_edid_counter: track sinks that give us an EDID with invalid checksum
> - * @edid_corrupt: indicates whether the last read EDID was corrupt
> - * @debugfs_entry: debugfs directory for this connector
> - * @has_tile: is this connector connected to a tiled monitor
> - * @tile_group: tile group for the connected monitor
> - * @tile_is_single_monitor: whether the tile is one monitor housing
> - * @num_h_tile: number of horizontal tiles in the tile group
> - * @num_v_tile: number of vertical tiles in the tile group
> - * @tile_h_loc: horizontal location of this tile
> - * @tile_v_loc: vertical location of this tile
> - * @tile_h_size: horizontal size of this tile.
> - * @tile_v_size: vertical size of this tile.
> - * @scaling_mode_property: Optional atomic property to control the upscaling.
> - * @content_protection_property: Optional property to control content protection
> *
> * Each connector may be connected to one or more CRTCs, or may be clonable by
> * another connector if they can share a CRTC. Each connector also has a specific
> @@ -815,13 +775,27 @@ struct drm_cmdline_mode {
> * span multiple monitors).
> */
> struct drm_connector {
> + /** @dev: parent DRM device */
> struct drm_device *dev;
> + /** @kdev: kernel device for sysfs attributes */
> struct device *kdev;
> + /** @attr: sysfs attributes */
> struct device_attribute *attr;
> +
> + /**
> + * @head:
> + *
> + * List of all connectors on a @dev, linked from
> + * &drm_mode_config.connector_list. Protected by
> + * &drm_mode_config.connector_list_lock, but please only use
> + * &drm_connector_list_iter to walk this list.
> + */
> struct list_head head;
>
> + /** @base: base KMS object */
> struct drm_mode_object base;
>
> + /** @name: human readable name, can be overwritten by the driver */
> char *name;
>
> /**
> @@ -839,10 +813,30 @@ struct drm_connector {
> */
> unsigned index;
>
> + /**
> + * @connector_type:
> + * one of the DRM_MODE_CONNECTOR_<foo> types from drm_mode.h
> + */
> int connector_type;
> + /** @connector_type_id: index into connector type enum */
> int connector_type_id;
> + /**
> + * @interlace_allowed:
> + * Can this connector handle interlaced modes? Only used by
> + * drm_helper_probe_single_connector_modes() for mode filtering.
> + */
> bool interlace_allowed;
> + /**
> + * @doublescan_allowed:
> + * Can this connector handle doublescan? Only used by
> + * drm_helper_probe_single_connector_modes() for mode filtering.
> + */
> bool doublescan_allowed;
> + /**
> + * @stereo_allowed:
> + * Can this connector handle stereo modes? Only used by
> + * drm_helper_probe_single_connector_modes() for mode filtering.
> + */
> bool stereo_allowed;
>
> /**
> @@ -891,45 +885,42 @@ struct drm_connector {
> * Protected by &drm_mode_config.mutex.
> */
> struct drm_display_info display_info;
> +
> + /** @funcs: connector control functions */
> const struct drm_connector_funcs *funcs;
>
> + /**
> + * @edid_blob_ptr: DRM property containing EDID if present. Protected by
> + * &drm_mode_config.mutex. This should be updated only by calling
> + * drm_mode_connector_update_edid_property().
> + */
> struct drm_property_blob *edid_blob_ptr;
> +
> + /** @properties: property tracking for this connector */
> struct drm_object_properties properties;
>
> + /**
> + * @scaling_mode_property: Optional atomic property to control the
> + * upscaling. See drm_connector_attach_content_protection_property().
> + */
> struct drm_property *scaling_mode_property;
>
> /**
> * @content_protection_property: DRM ENUM property for content
> - * protection
> + * protection. See drm_connector_attach_content_protection_property().
> */
> struct drm_property *content_protection_property;
>
> /**
> * @path_blob_ptr:
> *
> - * DRM blob property data for the DP MST path property.
> + * DRM blob property data for the DP MST path property. This should only
> + * be updated by calling drm_mode_connector_set_path_property().
> */
> struct drm_property_blob *path_blob_ptr;
>
> - /**
> - * @tile_blob_ptr:
> - *
> - * DRM blob property data for the tile property (used mostly by DP MST).
> - * This is meant for screens which are driven through separate display
> - * pipelines represented by &drm_crtc, which might not be running with
> - * genlocked clocks. For tiled panels which are genlocked, like
> - * dual-link LVDS or dual-link DSI, the driver should try to not expose
> - * the tiling and virtualize both &drm_crtc and &drm_plane if needed.
> - */
> - struct drm_property_blob *tile_blob_ptr;
> -
> -/* should we poll this connector for connects and disconnects */
> -/* hot plug detectable */
> #define DRM_CONNECTOR_POLL_HPD (1 << 0)
> -/* poll for connections */
> #define DRM_CONNECTOR_POLL_CONNECT (1 << 1)
> -/* can cleanly poll for disconnections without flickering the screen */
> -/* DACs should rarely do this without a lot of testing */
> #define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2)
>
> /**
> @@ -946,25 +937,40 @@ struct drm_connector {
> * Periodically poll the connector for connection.
> *
> * DRM_CONNECTOR_POLL_DISCONNECT
> - * Periodically poll the connector for disconnection.
> + * Periodically poll the connector for disconnection, without
> + * causing flickering even when the connector is in use. DACs should
> + * rarely do this without a lot of testing.
> *
> * Set to 0 for connectors that don't support connection status
> * discovery.
> */
> uint8_t polled;
>
> - /* requested DPMS state */
> + /**
> + * @dpms: Current dpms state. For legacy drivers the
> + * &drm_connector_funcs.dpms callback must update this. For atomic
> + * drivers, this is handled by the core atomic code, and drivers must
> + * only take &drm_crtc_state.active into account.
> + */
> int dpms;
>
> + /** @helper_private: mid-layer private data */
> const struct drm_connector_helper_funcs *helper_private;
>
> - /* forced on connector */
> + /** @cmdline_mode: mode line parsed from the kernel cmdline for this connector */
> struct drm_cmdline_mode cmdline_mode;
> + /** @force: a DRM_FORCE_<foo> state for forced mode sets */
> enum drm_connector_force force;
> + /** @override_edid: has the EDID been overwritten through debugfs for testing? */
> bool override_edid;
>
> #define DRM_CONNECTOR_MAX_ENCODER 3
> + /**
> + * @encoder_ids: Valid encoders for this connector. Please only use
> + * drm_connector_for_each_possible_encoder() to enumerate these.
> + */
> uint32_t encoder_ids[DRM_CONNECTOR_MAX_ENCODER];
> +
> /**
> * @encoder: Currently bound encoder driving this connector, if any.
> * Only really meaningful for non-atomic drivers. Atomic drivers should
> @@ -974,19 +980,37 @@ struct drm_connector {
> struct drm_encoder *encoder;
>
> #define MAX_ELD_BYTES 128
> - /* EDID bits */
> + /** @eld: EDID-like data, if present */
> uint8_t eld[MAX_ELD_BYTES];
> + /** @latency_present: AV delay info from ELD, if found */
> bool latency_present[2];
> - int video_latency[2]; /* [0]: progressive, [1]: interlaced */
> + /**
> + * @video_latency: Video latency info from ELD, if found.
> + * [0]: progressive, [1]: interlaced
> + */
> + int video_latency[2];
> + /**
> + * @audio_latency: audio latency info from ELD, if found
> + * [0]: progressive, [1]: interlaced
> + */
> int audio_latency[2];
> - int null_edid_counter; /* needed to workaround some HW bugs where we get all 0s */
> + /**
> + * @null_edid_counter: track sinks that give us all zeros for the EDID.
> + * Needed to workaround some HW bugs where we get all 0s
> + */
> + int null_edid_counter;
> +
> + /** @bad_edid_counter: track sinks that give us an EDID with invalid checksum */
> unsigned bad_edid_counter;
>
> - /* Flag for raw EDID header corruption - used in Displayport
> - * compliance testing - * Displayport Link CTS Core 1.2 rev1.1 4.2.2.6
> + /**
> + * @edid_corrupt: Indicates whether the last read EDID was corrupt. Used
> + * in Displayport compliance testing - Displayport Link CTS Core 1.2
> + * rev1.1 4.2.2.6
> */
> bool edid_corrupt;
>
> + /** @debugfs_entry: debugfs directory for this connector */
> struct dentry *debugfs_entry;
>
> /**
> @@ -994,7 +1018,7 @@ struct drm_connector {
> *
> * Current atomic state for this connector.
> *
> - * This is protected by @drm_mode_config.connection_mutex. Note that
> + * This is protected by &drm_mode_config.connection_mutex. Note that
> * nonblocking atomic commits access the current connector state without
> * taking locks. Either by going through the &struct drm_atomic_state
> * pointers, see for_each_oldnew_connector_in_state(),
> @@ -1005,19 +1029,44 @@ struct drm_connector {
> */
> struct drm_connector_state *state;
>
> - /* DisplayID bits */
> + /* DisplayID bits. FIXME: Extract into a substruct? */
> +
> + /**
> + * @tile_blob_ptr:
> + *
> + * DRM blob property data for the tile property (used mostly by DP MST).
> + * This is meant for screens which are driven through separate display
> + * pipelines represented by &drm_crtc, which might not be running with
> + * genlocked clocks. For tiled panels which are genlocked, like
> + * dual-link LVDS or dual-link DSI, the driver should try to not expose
> + * the tiling and virtualize both &drm_crtc and &drm_plane if needed.
> + *
> + * This should only be updated by calling
> + * drm_mode_connector_set_tile_property().
> + */
> + struct drm_property_blob *tile_blob_ptr;
> +
> + /** @has_tile: is this connector connected to a tiled monitor */
> bool has_tile;
> + /** @tile_group: tile group for the connected monitor */
> struct drm_tile_group *tile_group;
> + /** @tile_is_single_monitor: whether the tile is one monitor housing */
> bool tile_is_single_monitor;
>
> + /** @num_h_tile: number of horizontal tiles in the tile group */
> + /** @num_v_tile: number of vertical tiles in the tile group */
> uint8_t num_h_tile, num_v_tile;
> + /** @tile_h_loc: horizontal location of this tile */
> + /** @tile_v_loc: vertical location of this tile */
> uint8_t tile_h_loc, tile_v_loc;
> + /** @tile_h_size: horizontal size of this tile. */
> + /** @tile_v_size: vertical size of this tile. */
> uint16_t tile_h_size, tile_v_size;
>
> /**
> * @free_node:
> *
> - * List used only by &drm_connector_iter to be able to clean up a
> + * List used only by &drm_connector_list_iter to be able to clean up a
> * connector from any context, in conjunction with
> * &drm_mode_config.connector_free_work.
> */
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 05/15] drm: drop _mode_ from update_edit_property()
2018-07-09 8:40 ` [PATCH 05/15] drm: drop _mode_ from update_edit_property() Daniel Vetter
@ 2018-07-13 14:59 ` Sean Paul
2018-07-13 16:05 ` Daniel Vetter
0 siblings, 1 reply; 33+ messages in thread
From: Sean Paul @ 2018-07-13 14:59 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:06AM +0200, Daniel Vetter wrote:
> 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.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 ++--
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++--
> drivers/gpu/drm/ast/ast_mode.c | 4 ++--
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
> drivers/gpu/drm/bridge/analogix-anx78xx.c | 4 ++--
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 ++--
> drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +-
> drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 2 +-
> drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 +-
> drivers/gpu/drm/bridge/sii902x.c | 2 +-
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
> drivers/gpu/drm/bridge/tc358767.c | 2 +-
> drivers/gpu/drm/bridge/ti-tfp410.c | 2 +-
> drivers/gpu/drm/drm_connector.c | 8 ++++----
> drivers/gpu/drm/drm_debugfs.c | 4 ++--
> drivers/gpu/drm/drm_probe_helper.c | 2 +-
> drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +-
> drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
> drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
> drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +-
> drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
> drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +-
> drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +-
> drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +-
> drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
> drivers/gpu/drm/i915/intel_dp.c | 2 +-
> drivers/gpu/drm/i915/intel_lvds.c | 2 +-
> drivers/gpu/drm/i915/intel_modes.c | 2 +-
> drivers/gpu/drm/i915/intel_sdvo.c | 2 +-
> drivers/gpu/drm/imx/imx-ldb.c | 2 +-
> drivers/gpu/drm/imx/imx-tve.c | 2 +-
> drivers/gpu/drm/imx/parallel-display.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +-
> drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
> drivers/gpu/drm/msm/edp/edp_connector.c | 2 +-
> drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
> drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
> drivers/gpu/drm/omapdrm/omap_connector.c | 4 ++--
> drivers/gpu/drm/panel/panel-simple.c | 2 +-
> drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++--
> drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 ++--
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
> drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +-
> drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
> drivers/gpu/drm/tegra/output.c | 2 +-
> drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 +-
> drivers/gpu/drm/udl/udl_connector.c | 2 +-
> drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
> drivers/gpu/drm/zte/zx_hdmi.c | 2 +-
> drivers/gpu/drm/zte/zx_vga.c | 2 +-
> drivers/staging/vboxvideo/vbox_mode.c | 2 +-
Is this any closer to graduating from staging? From a glance at the history, it
doesn't seem like it's moved closer in a very long time.
Anyways,
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> include/drm/drm_connector.h | 6 +++---
> include/drm/drm_modeset_helper_vtables.h | 2 +-
> 56 files changed, 74 insertions(+), 74 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> index 881f7cb7ae6e..c770d73352a7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> @@ -334,11 +334,11 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector)
> int ret;
>
> if (amdgpu_connector->edid) {
> - drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid);
> + drm_connector_update_edid_property(connector, amdgpu_connector->edid);
> ret = drm_add_edid_modes(connector, amdgpu_connector->edid);
> return ret;
> }
> - drm_mode_connector_update_edid_property(connector, NULL);
> + drm_connector_update_edid_property(connector, NULL);
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index f0fc3067ab5d..b93fa4b3841f 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -900,14 +900,14 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
> (struct edid *) sink->dc_edid.raw_edid;
>
>
> - drm_mode_connector_update_edid_property(connector,
> + drm_connector_update_edid_property(connector,
> aconnector->edid);
> }
> amdgpu_dm_add_sink_to_freesync_module(connector, aconnector->edid);
>
> } else {
> amdgpu_dm_remove_sink_from_freesync_module(connector);
> - drm_mode_connector_update_edid_property(connector, NULL);
> + drm_connector_update_edid_property(connector, NULL);
> aconnector->num_modes = 0;
> aconnector->dc_sink = NULL;
> aconnector->edid = NULL;
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> index 4304d9e408b8..581bb75d08eb 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> @@ -233,7 +233,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
> edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
>
> if (!edid) {
> - drm_mode_connector_update_edid_property(
> + drm_connector_update_edid_property(
> &aconnector->base,
> NULL);
> return ret;
> @@ -261,7 +261,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
> connector, aconnector->edid);
> }
>
> - drm_mode_connector_update_edid_property(
> + drm_connector_update_edid_property(
> &aconnector->base, aconnector->edid);
>
> ret = drm_add_edid_modes(connector, aconnector->edid);
> diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> index 036dff8a1f33..1bb8174ad155 100644
> --- a/drivers/gpu/drm/ast/ast_mode.c
> +++ b/drivers/gpu/drm/ast/ast_mode.c
> @@ -790,12 +790,12 @@ static int ast_get_modes(struct drm_connector *connector)
> if (!flags)
> edid = drm_get_edid(connector, &ast_connector->i2c->adapter);
> if (edid) {
> - drm_mode_connector_update_edid_property(&ast_connector->base, edid);
> + drm_connector_update_edid_property(&ast_connector->base, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> return ret;
> } else
> - drm_mode_connector_update_edid_property(&ast_connector->base, NULL);
> + drm_connector_update_edid_property(&ast_connector->base, NULL);
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 73021b388e12..1f4745953aca 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -601,7 +601,7 @@ static int adv7511_get_modes(struct adv7511 *adv7511,
> __adv7511_power_off(adv7511);
>
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> count = drm_add_edid_modes(connector, edid);
>
> adv7511_set_config_csc(adv7511, connector, adv7511->rgb,
> diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> index b49043866be6..37f947dcadec 100644
> --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
> +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> @@ -969,8 +969,8 @@ static int anx78xx_get_modes(struct drm_connector *connector)
> goto unlock;
> }
>
> - err = drm_mode_connector_update_edid_property(connector,
> - anx78xx->edid);
> + err = drm_connector_update_edid_property(connector,
> + anx78xx->edid);
> if (err) {
> DRM_ERROR("Failed to update EDID property: %d\n", err);
> goto unlock;
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index 2bcbfadb6ac5..288c015f7460 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -1119,8 +1119,8 @@ static int analogix_dp_get_modes(struct drm_connector *connector)
> edid = drm_get_edid(connector, &dp->aux.ddc);
> pm_runtime_put(dp->dev);
> if (edid) {
> - drm_mode_connector_update_edid_property(&dp->connector,
> - edid);
> + drm_connector_update_edid_property(&dp->connector,
> + edid);
> num_modes += drm_add_edid_modes(&dp->connector, edid);
> kfree(edid);
> }
> diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> index 9837c8d69e69..da99b8ba4ee1 100644
> --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
> +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> @@ -55,7 +55,7 @@ static int dumb_vga_get_modes(struct drm_connector *connector)
> goto fallback;
> }
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> return ret;
> diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> index 7ccadba7c98c..b49b543bd1f6 100644
> --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> @@ -152,7 +152,7 @@ static int ge_b850v3_lvds_get_modes(struct drm_connector *connector)
> ge_b850v3_lvds_ptr->edid = (struct edid *)stdp2690_get_edid(client);
>
> if (ge_b850v3_lvds_ptr->edid) {
> - drm_mode_connector_update_edid_property(connector,
> + drm_connector_update_edid_property(connector,
> ge_b850v3_lvds_ptr->edid);
> num_modes = drm_add_edid_modes(connector,
> ge_b850v3_lvds_ptr->edid);
> diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> index d64a3283822a..bd5c191858cb 100644
> --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
> +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> @@ -222,7 +222,7 @@ static int ptn3460_get_modes(struct drm_connector *connector)
> }
>
> ptn_bridge->edid = (struct edid *)edid;
> - drm_mode_connector_update_edid_property(connector, ptn_bridge->edid);
> + drm_connector_update_edid_property(connector, ptn_bridge->edid);
>
> num_modes = drm_add_edid_modes(connector, ptn_bridge->edid);
>
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index 60373d7eb220..cd331933c230 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -170,7 +170,7 @@ static int sii902x_get_modes(struct drm_connector *connector)
> return ret;
>
> edid = drm_get_edid(connector, sii902x->i2c->adapter);
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> if (edid) {
> num = drm_add_edid_modes(connector, edid);
> kfree(edid);
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index 3c136f2b954f..ab32aceb6f24 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -1922,7 +1922,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
>
> hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> index 0fd9cf27542c..ee2fd0a349b3 100644
> --- a/drivers/gpu/drm/bridge/tc358767.c
> +++ b/drivers/gpu/drm/bridge/tc358767.c
> @@ -1140,7 +1140,7 @@ static int tc_connector_get_modes(struct drm_connector *connector)
> if (!edid)
> return 0;
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> count = drm_add_edid_modes(connector, edid);
>
> return count;
> diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> index acb857030951..c81bf7910bbe 100644
> --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> @@ -62,7 +62,7 @@ static int tfp410_get_modes(struct drm_connector *connector)
> goto fallback;
> }
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
>
> return drm_add_edid_modes(connector, edid);
> fallback:
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index dc5a480200d8..ccb70a4490d3 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -818,7 +818,7 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
> * Blob property which contains the current EDID read from the sink. This
> * is useful to parse sink identification information like vendor, model
> * and serial. Drivers should update this property by calling
> - * drm_mode_connector_update_edid_property(), usually after having parsed
> + * drm_connector_update_edid_property(), usually after having parsed
> * the EDID using drm_add_edid_modes(). Userspace cannot change this
> * property.
> * DPMS:
> @@ -1501,7 +1501,7 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector)
> EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
>
> /**
> - * drm_mode_connector_update_edid_property - update the edid property of a connector
> + * drm_connector_update_edid_property - update the edid property of a connector
> * @connector: drm connector
> * @edid: new value of the edid property
> *
> @@ -1511,7 +1511,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
> * Returns:
> * Zero on success, negative errno on failure.
> */
> -int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> +int drm_connector_update_edid_property(struct drm_connector *connector,
> const struct edid *edid)
> {
> struct drm_device *dev = connector->dev;
> @@ -1550,7 +1550,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> dev->mode_config.edid_property);
> return ret;
> }
> -EXPORT_SYMBOL(drm_mode_connector_update_edid_property);
> +EXPORT_SYMBOL(drm_connector_update_edid_property);
>
> /**
> * drm_mode_connector_set_link_status_property - Set link status property of a connector
> diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
> index b2482818fee8..df8ca4548f9f 100644
> --- a/drivers/gpu/drm/drm_debugfs.c
> +++ b/drivers/gpu/drm/drm_debugfs.c
> @@ -307,13 +307,13 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,
>
> if (len == 5 && !strncmp(buf, "reset", 5)) {
> connector->override_edid = false;
> - ret = drm_mode_connector_update_edid_property(connector, NULL);
> + ret = drm_connector_update_edid_property(connector, NULL);
> } else if (len < EDID_LENGTH ||
> EDID_LENGTH * (1 + edid->extensions) > len)
> ret = -EINVAL;
> else {
> connector->override_edid = false;
> - ret = drm_mode_connector_update_edid_property(connector, edid);
> + ret = drm_connector_update_edid_property(connector, edid);
> if (!ret)
> connector->override_edid = true;
> }
> diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
> index 1a901fe9e23e..3470ca507df3 100644
> --- a/drivers/gpu/drm/drm_probe_helper.c
> +++ b/drivers/gpu/drm/drm_probe_helper.c
> @@ -471,7 +471,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
> if (connector->status == connector_status_disconnected) {
> DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",
> connector->base.id, connector->name);
> - drm_mode_connector_update_edid_property(connector, NULL);
> + drm_connector_update_edid_property(connector, NULL);
> verbose_prune = false;
> goto prune;
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> index e6b0940b1ac2..dfea61edba4a 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> @@ -319,7 +319,7 @@ static int vidi_get_modes(struct drm_connector *connector)
> return -ENOMEM;
> }
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
>
> return drm_add_edid_modes(connector, edid);
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index db91932550cf..6672d0ff0423 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -888,7 +888,7 @@ static int hdmi_get_modes(struct drm_connector *connector)
> (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
> edid->width_cm, edid->height_cm);
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
>
> ret = drm_add_edid_modes(connector, edid);
> diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
> index 5ea785f07ba8..90ed20083009 100644
> --- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
> +++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
> @@ -1770,7 +1770,7 @@ static int cdv_intel_dp_get_modes(struct drm_connector *connector)
>
> edid = drm_get_edid(connector, &intel_dp->adapter);
> if (edid) {
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> }
> diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
> index f0878998526a..4e4e4a66eaee 100644
> --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
> +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
> @@ -216,7 +216,7 @@ static int cdv_hdmi_get_modes(struct drm_connector *connector)
>
> edid = drm_get_edid(connector, &gma_encoder->i2c_bus->adapter);
> if (edid) {
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> }
> diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
> index 78566a80ad25..c6d72de1c054 100644
> --- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
> +++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
> @@ -578,7 +578,7 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector)
> }
>
> if (edid) {
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> }
> return ret;
> diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
> index e6943fef0611..83babb815a5d 100644
> --- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
> +++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
> @@ -376,7 +376,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
> * preferred mode is the right one.
> */
> if (edid) {
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> drm_add_edid_modes(connector, edid);
> kfree(edid);
>
> diff --git a/drivers/gpu/drm/gma500/psb_intel_modes.c b/drivers/gpu/drm/gma500/psb_intel_modes.c
> index e5360726d80b..fb4da3cd6681 100644
> --- a/drivers/gpu/drm/gma500/psb_intel_modes.c
> +++ b/drivers/gpu/drm/gma500/psb_intel_modes.c
> @@ -66,7 +66,7 @@ int psb_intel_ddc_get_modes(struct drm_connector *connector,
>
> edid = drm_get_edid(connector, adapter);
> if (edid) {
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> }
> diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
> index 1d40746ab625..dd3cec0e3190 100644
> --- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
> +++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
> @@ -1472,7 +1472,7 @@ static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector)
> bool connector_is_digital = !!IS_TMDS(psb_intel_sdvo_connector);
>
> if (connector_is_digital == monitor_is_digital) {
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> drm_add_edid_modes(connector, edid);
> }
>
> diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> index 0038c976536a..d434f576e6b2 100644
> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> @@ -1243,7 +1243,7 @@ static int tda998x_connector_get_modes(struct drm_connector *connector)
> return 0;
> }
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> n = drm_add_edid_modes(connector, edid);
>
> kfree(edid);
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 5be07e1d816d..2f3e92167c5f 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -6212,7 +6212,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
> edid = drm_get_edid(connector, &intel_dp->aux.ddc);
> if (edid) {
> if (drm_add_edid_modes(connector, edid)) {
> - drm_mode_connector_update_edid_property(connector,
> + drm_connector_update_edid_property(connector,
> edid);
> } else {
> kfree(edid);
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index bb06744d28a4..ca55b0a82ba6 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -1131,7 +1131,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> intel_gmbus_get_adapter(dev_priv, pin));
> if (edid) {
> if (drm_add_edid_modes(connector, edid)) {
> - drm_mode_connector_update_edid_property(connector,
> + drm_connector_update_edid_property(connector,
> edid);
> } else {
> kfree(edid);
> diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
> index b39846613e3c..ca44bf368e24 100644
> --- a/drivers/gpu/drm/i915/intel_modes.c
> +++ b/drivers/gpu/drm/i915/intel_modes.c
> @@ -40,7 +40,7 @@ int intel_connector_update_modes(struct drm_connector *connector,
> {
> int ret;
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
>
> return ret;
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 396cb59ca4b8..812fe7b06f87 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1911,7 +1911,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
> if (edid != NULL) {
> if (intel_sdvo_connector_matches_edid(to_intel_sdvo_connector(connector),
> edid)) {
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> drm_add_edid_modes(connector, edid);
> }
>
> diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
> index 56dd7a9a8e25..ae81cbb75f51 100644
> --- a/drivers/gpu/drm/imx/imx-ldb.c
> +++ b/drivers/gpu/drm/imx/imx-ldb.c
> @@ -143,7 +143,7 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)
> imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc);
>
> if (imx_ldb_ch->edid) {
> - drm_mode_connector_update_edid_property(connector,
> + drm_connector_update_edid_property(connector,
> imx_ldb_ch->edid);
> num_modes = drm_add_edid_modes(connector, imx_ldb_ch->edid);
> }
> diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
> index bc27c2699464..1a4ced5c09b5 100644
> --- a/drivers/gpu/drm/imx/imx-tve.c
> +++ b/drivers/gpu/drm/imx/imx-tve.c
> @@ -235,7 +235,7 @@ static int imx_tve_connector_get_modes(struct drm_connector *connector)
>
> edid = drm_get_edid(connector, tve->ddc);
> if (edid) {
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> }
> diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
> index aedecda9728a..4fc1cf583435 100644
> --- a/drivers/gpu/drm/imx/parallel-display.c
> +++ b/drivers/gpu/drm/imx/parallel-display.c
> @@ -63,7 +63,7 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
> }
>
> if (imxpd->edid) {
> - drm_mode_connector_update_edid_property(connector, imxpd->edid);
> + drm_connector_update_edid_property(connector, imxpd->edid);
> num_modes = drm_add_edid_modes(connector, imxpd->edid);
> }
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 59a11026dceb..835313940395 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1220,7 +1220,7 @@ static int mtk_hdmi_conn_get_modes(struct drm_connector *conn)
>
> hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
>
> - drm_mode_connector_update_edid_property(conn, edid);
> + drm_connector_update_edid_property(conn, edid);
>
> ret = drm_add_edid_modes(conn, edid);
> kfree(edid);
> diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
> index 8918539a19aa..5f104f139197 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_mode.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
> @@ -1553,7 +1553,7 @@ static int mga_vga_get_modes(struct drm_connector *connector)
>
> edid = drm_get_edid(connector, &mga_connector->i2c->adapter);
> if (edid) {
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> }
> diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
> index 6f3fc6b0f0a3..0b5eac054195 100644
> --- a/drivers/gpu/drm/msm/edp/edp_connector.c
> +++ b/drivers/gpu/drm/msm/edp/edp_connector.c
> @@ -56,7 +56,7 @@ static int edp_connector_get_modes(struct drm_connector *connector)
> if (ret)
> return ret;
>
> - drm_mode_connector_update_edid_property(connector, drm_edid);
> + drm_connector_update_edid_property(connector, drm_edid);
> if (drm_edid)
> ret = drm_add_edid_modes(connector, drm_edid);
>
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> index c0848dfedd50..07feacc5a441 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> @@ -392,7 +392,7 @@ static int msm_hdmi_connector_get_modes(struct drm_connector *connector)
> hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl);
>
> hdmi->hdmi_mode = drm_detect_hdmi_monitor(edid);
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
>
> if (edid) {
> ret = drm_add_edid_modes(connector, edid);
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> index b83465ae7c1b..2fabb69e452b 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -850,7 +850,7 @@ nv50_mstc_get_modes(struct drm_connector *connector)
> int ret = 0;
>
> mstc->edid = drm_dp_mst_get_edid(&mstc->connector, mstc->port->mgr, mstc->port);
> - drm_mode_connector_update_edid_property(&mstc->connector, mstc->edid);
> + drm_connector_update_edid_property(&mstc->connector, mstc->edid);
> if (mstc->edid)
> ret = drm_add_edid_modes(&mstc->connector, mstc->edid);
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
> index bb46c1d489cf..22a15478d23d 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> @@ -550,7 +550,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
>
> /* Cleanup the previous EDID block. */
> if (nv_connector->edid) {
> - drm_mode_connector_update_edid_property(connector, NULL);
> + drm_connector_update_edid_property(connector, NULL);
> kfree(nv_connector->edid);
> nv_connector->edid = NULL;
> }
> @@ -575,7 +575,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
> else
> nv_connector->edid = drm_get_edid(connector, i2c);
>
> - drm_mode_connector_update_edid_property(connector,
> + drm_connector_update_edid_property(connector,
> nv_connector->edid);
> if (!nv_connector->edid) {
> NV_ERROR(drm, "DDC responded, but no EDID for %s\n",
> @@ -657,7 +657,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
>
> /* Cleanup the previous EDID block. */
> if (nv_connector->edid) {
> - drm_mode_connector_update_edid_property(connector, NULL);
> + drm_connector_update_edid_property(connector, NULL);
> kfree(nv_connector->edid);
> nv_connector->edid = NULL;
> }
> @@ -721,7 +721,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
> status = connector_status_unknown;
> #endif
>
> - drm_mode_connector_update_edid_property(connector, nv_connector->edid);
> + drm_connector_update_edid_property(connector, nv_connector->edid);
> nouveau_connector_set_encoder(connector, nv_encoder);
> return status;
> }
> diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
> index 5cde26ac937b..2ddb856666c4 100644
> --- a/drivers/gpu/drm/omapdrm/omap_connector.c
> +++ b/drivers/gpu/drm/omapdrm/omap_connector.c
> @@ -126,14 +126,14 @@ static int omap_connector_get_modes(struct drm_connector *connector)
>
> if ((dssdrv->read_edid(dssdev, edid, MAX_EDID) > 0) &&
> drm_edid_is_valid(edid)) {
> - drm_mode_connector_update_edid_property(
> + drm_connector_update_edid_property(
> connector, edid);
> n = drm_add_edid_modes(connector, edid);
>
> omap_connector->hdmi_mode =
> drm_detect_hdmi_monitor(edid);
> } else {
> - drm_mode_connector_update_edid_property(
> + drm_connector_update_edid_property(
> connector, NULL);
> }
>
> diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
> index ac6aaa174c0b..3c229d134359 100644
> --- a/drivers/gpu/drm/panel/panel-simple.c
> +++ b/drivers/gpu/drm/panel/panel-simple.c
> @@ -252,7 +252,7 @@ static int panel_simple_get_modes(struct drm_panel *panel)
> /* probe EDID if a DDC bus is available */
> if (p->ddc) {
> struct edid *edid = drm_get_edid(panel->connector, p->ddc);
> - drm_mode_connector_update_edid_property(panel->connector, edid);
> + drm_connector_update_edid_property(panel->connector, edid);
> if (edid) {
> num += drm_add_edid_modes(panel->connector, edid);
> kfree(edid);
> diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
> index 0655698f2956..414642e5b7a3 100644
> --- a/drivers/gpu/drm/radeon/radeon_connectors.c
> +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
> @@ -368,11 +368,11 @@ static int radeon_ddc_get_modes(struct drm_connector *connector)
> int ret;
>
> if (radeon_connector->edid) {
> - drm_mode_connector_update_edid_property(connector, radeon_connector->edid);
> + drm_connector_update_edid_property(connector, radeon_connector->edid);
> ret = drm_add_edid_modes(connector, radeon_connector->edid);
> return ret;
> }
> - drm_mode_connector_update_edid_property(connector, NULL);
> + drm_connector_update_edid_property(connector, NULL);
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> index cd8a3ee16649..37956cfc0b6d 100644
> --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
> +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> @@ -195,11 +195,11 @@ static int radeon_dp_mst_get_ddc_modes(struct drm_connector *connector)
> radeon_connector->edid = edid;
> DRM_DEBUG_KMS("edid retrieved %p\n", edid);
> if (radeon_connector->edid) {
> - drm_mode_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
> + drm_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
> ret = drm_add_edid_modes(&radeon_connector->base, radeon_connector->edid);
> return ret;
> }
> - drm_mode_connector_update_edid_property(&radeon_connector->base, NULL);
> + drm_connector_update_edid_property(&radeon_connector->base, NULL);
>
> return ret;
> }
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index c6fbdcd87c16..a40cb2be50e1 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -275,7 +275,7 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
> dp->sink_has_audio = drm_detect_monitor_audio(edid);
> ret = drm_add_edid_modes(connector, edid);
> if (ret)
> - drm_mode_connector_update_edid_property(connector,
> + drm_connector_update_edid_property(connector,
> edid);
> }
> mutex_unlock(&dp->lock);
> diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
> index 88d0774c97bd..510fcb33e31d 100644
> --- a/drivers/gpu/drm/rockchip/inno_hdmi.c
> +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
> @@ -565,7 +565,7 @@ static int inno_hdmi_connector_get_modes(struct drm_connector *connector)
> if (edid) {
> hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> }
> diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
> index 58f431102512..0c3008356ab8 100644
> --- a/drivers/gpu/drm/sti/sti_hdmi.c
> +++ b/drivers/gpu/drm/sti/sti_hdmi.c
> @@ -977,7 +977,7 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
> cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid);
>
> count = drm_add_edid_modes(connector, edid);
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
>
> kfree(edid);
> return count;
> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> index fa4bcd092eaf..9b4b1d015423 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> @@ -220,7 +220,7 @@ static int sun4i_hdmi_get_modes(struct drm_connector *connector)
> DRM_DEBUG_DRIVER("Monitor is %s monitor\n",
> hdmi->hdmi_monitor ? "an HDMI" : "a DVI");
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> cec_s_phys_addr_from_edid(hdmi->cec_adap, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
> diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
> index ffe34bd0bb9d..983657c47067 100644
> --- a/drivers/gpu/drm/tegra/output.c
> +++ b/drivers/gpu/drm/tegra/output.c
> @@ -37,7 +37,7 @@ int tegra_output_connector_get_modes(struct drm_connector *connector)
> edid = drm_get_edid(connector, output->ddc);
>
> cec_notifier_set_phys_addr_from_edid(output->notifier, edid);
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
>
> if (edid) {
> err = drm_add_edid_modes(connector, edid);
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> index c45cabb38db0..46dacca3cce8 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> @@ -173,7 +173,7 @@ static int tfp410_connector_get_modes(struct drm_connector *connector)
>
> edid = drm_get_edid(connector, tfp410_connector->mod->i2c);
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
>
> if (edid) {
> ret = drm_add_edid_modes(connector, edid);
> diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
> index 09dc585aa46f..8fac12e1a1a4 100644
> --- a/drivers/gpu/drm/udl/udl_connector.c
> +++ b/drivers/gpu/drm/udl/udl_connector.c
> @@ -99,7 +99,7 @@ static int udl_get_modes(struct drm_connector *connector)
> struct udl_drm_connector,
> connector);
>
> - drm_mode_connector_update_edid_property(connector, udl_connector->edid);
> + drm_connector_update_edid_property(connector, udl_connector->edid);
> if (udl_connector->edid)
> return drm_add_edid_modes(connector, udl_connector->edid);
> return 0;
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index b8d50533e2bb..91f284e1b908 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -285,7 +285,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
> drm_rgb_quant_range_selectable(edid);
> }
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
>
> diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
> index 13ea90f7a185..d073c6737500 100644
> --- a/drivers/gpu/drm/zte/zx_hdmi.c
> +++ b/drivers/gpu/drm/zte/zx_hdmi.c
> @@ -272,7 +272,7 @@ static int zx_hdmi_connector_get_modes(struct drm_connector *connector)
>
> hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
>
> diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
> index 3e7e33cd3dfa..3e78ee21b8d0 100644
> --- a/drivers/gpu/drm/zte/zx_vga.c
> +++ b/drivers/gpu/drm/zte/zx_vga.c
> @@ -109,7 +109,7 @@ static int zx_vga_connector_get_modes(struct drm_connector *connector)
> */
> zx_writel(vga->mmio + VGA_AUTO_DETECT_SEL, VGA_DETECT_SEL_HAS_DEVICE);
>
> - drm_mode_connector_update_edid_property(connector, edid);
> + drm_connector_update_edid_property(connector, edid);
> ret = drm_add_edid_modes(connector, edid);
> kfree(edid);
>
> diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
> index 5c7ea237893e..a943d2f683ed 100644
> --- a/drivers/staging/vboxvideo/vbox_mode.c
> +++ b/drivers/staging/vboxvideo/vbox_mode.c
> @@ -504,7 +504,7 @@ static void vbox_set_edid(struct drm_connector *connector, int width,
> for (i = 0; i < EDID_SIZE - 1; ++i)
> sum += edid[i];
> edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
> - drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
> + drm_connector_update_edid_property(connector, (struct edid *)edid);
> }
>
> static int vbox_get_modes(struct drm_connector *connector)
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index a0300e3468cb..9841d2b6d3eb 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -892,7 +892,7 @@ struct drm_connector {
> /**
> * @edid_blob_ptr: DRM property containing EDID if present. Protected by
> * &drm_mode_config.mutex. This should be updated only by calling
> - * drm_mode_connector_update_edid_property().
> + * drm_connector_update_edid_property().
> */
> struct drm_property_blob *edid_blob_ptr;
>
> @@ -1190,8 +1190,8 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev);
> int drm_mode_connector_set_path_property(struct drm_connector *connector,
> const char *path);
> int drm_mode_connector_set_tile_property(struct drm_connector *connector);
> -int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> - const struct edid *edid);
> +int drm_connector_update_edid_property(struct drm_connector *connector,
> + const struct edid *edid);
> void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
> uint64_t link_status);
> int drm_connector_init_panel_orientation_property(
> diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
> index 3b289773297c..5873d15821cf 100644
> --- a/include/drm/drm_modeset_helper_vtables.h
> +++ b/include/drm/drm_modeset_helper_vtables.h
> @@ -785,7 +785,7 @@ struct drm_connector_helper_funcs {
> *
> * This function should fill in all modes currently valid for the sink
> * into the &drm_connector.probed_modes list. It should also update the
> - * EDID property by calling drm_mode_connector_update_edid_property().
> + * EDID property by calling drm_connector_update_edid_property().
> *
> * The usual way to implement this is to cache the EDID retrieved in the
> * probe callback somewhere in the driver-private connector structure.
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 06/15] drm: drop _mode_ from drm_mode_connector_attach_encoder
2018-07-09 8:40 ` [PATCH 06/15] drm: drop _mode_ from drm_mode_connector_attach_encoder Daniel Vetter
@ 2018-07-13 15:01 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-13 15:01 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:07AM +0200, Daniel Vetter wrote:
> Again to align with the usual prefix of just drm_connector_. Again
> done with sed + manual fixup for indent issues.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> Documentation/gpu/drm-kms.rst | 2 +-
> drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 2 +-
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +-
> drivers/gpu/drm/arc/arcpgu_sim.c | 2 +-
> drivers/gpu/drm/ast/ast_mode.c | 2 +-
> drivers/gpu/drm/bochs/bochs_kms.c | 2 +-
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
> drivers/gpu/drm/bridge/analogix-anx78xx.c | 4 ++--
> drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 +-
> drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +-
> .../gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 2 +-
> drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 +-
> drivers/gpu/drm/bridge/panel.c | 2 +-
> drivers/gpu/drm/bridge/parade-ps8622.c | 2 +-
> drivers/gpu/drm/bridge/sii902x.c | 2 +-
> drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
> drivers/gpu/drm/bridge/tc358767.c | 2 +-
> drivers/gpu/drm/bridge/ti-tfp410.c | 2 +-
> drivers/gpu/drm/cirrus/cirrus_mode.c | 2 +-
> drivers/gpu/drm/drm_connector.c | 10 +++++-----
> drivers/gpu/drm/drm_simple_kms_helper.c | 2 +-
> drivers/gpu/drm/drm_writeback.c | 2 +-
> drivers/gpu/drm/exynos/exynos_drm_dpi.c | 2 +-
> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +-
> drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +-
> drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
> drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +-
> drivers/gpu/drm/gma500/gma_display.c | 2 +-
> drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 2 +-
> drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +-
> drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
> drivers/gpu/drm/i915/intel_display.c | 3 +--
> drivers/gpu/drm/i915/intel_dp_mst.c | 3 +--
> drivers/gpu/drm/imx/imx-ldb.c | 3 +--
> drivers/gpu/drm/imx/imx-tve.c | 2 +-
> drivers/gpu/drm/imx/parallel-display.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +-
> drivers/gpu/drm/meson/meson_venc_cvbs.c | 2 +-
> drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
> drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c | 2 +-
> drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +-
> drivers/gpu/drm/msm/edp/edp_connector.c | 2 +-
> drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 ++++----
> drivers/gpu/drm/omapdrm/omap_drv.c | 2 +-
> drivers/gpu/drm/qxl/qxl_display.c | 2 +-
> drivers/gpu/drm/radeon/radeon_encoders.c | 2 +-
> drivers/gpu/drm/rcar-du/rcar_lvds.c | 2 +-
> drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
> drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 2 +-
> drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +-
> drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +-
> drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +-
> drivers/gpu/drm/sti/sti_dvo.c | 2 +-
> drivers/gpu/drm/sti/sti_hda.c | 2 +-
> drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_lvds.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_rgb.c | 2 +-
> drivers/gpu/drm/sun4i/sun4i_tv.c | 2 +-
> drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 2 +-
> drivers/gpu/drm/tegra/dsi.c | 2 +-
> drivers/gpu/drm/tegra/hdmi.c | 2 +-
> drivers/gpu/drm/tegra/rgb.c | 2 +-
> drivers/gpu/drm/tegra/sor.c | 2 +-
> drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 +-
> drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 +-
> drivers/gpu/drm/udl/udl_connector.c | 2 +-
> drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
> drivers/gpu/drm/vc4/vc4_vec.c | 2 +-
> drivers/gpu/drm/virtio/virtgpu_display.c | 2 +-
> drivers/gpu/drm/vkms/vkms_output.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 2 +-
> drivers/gpu/drm/zte/zx_hdmi.c | 2 +-
> drivers/gpu/drm/zte/zx_tvenc.c | 2 +-
> drivers/gpu/drm/zte/zx_vga.c | 2 +-
> drivers/staging/vboxvideo/vbox_mode.c | 2 +-
> include/drm/drm_connector.h | 2 +-
> 86 files changed, 94 insertions(+), 97 deletions(-)
>
> diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst
> index 514939433004..58eed08fbe31 100644
> --- a/Documentation/gpu/drm-kms.rst
> +++ b/Documentation/gpu/drm-kms.rst
> @@ -466,7 +466,7 @@ Output discovery and initialization example
> drm_encoder_init(dev, &intel_output->enc, &intel_crt_enc_funcs,
> DRM_MODE_ENCODER_DAC);
>
> - drm_mode_connector_attach_encoder(&intel_output->base,
> + drm_connector_attach_encoder(&intel_output->base,
> &intel_output->enc);
>
> /* Set up the DDC bus. */
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
> index 94138abe093b..ae8fac34f7a5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c
> @@ -46,7 +46,7 @@ amdgpu_link_encoder_connector(struct drm_device *dev)
> list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
> amdgpu_encoder = to_amdgpu_encoder(encoder);
> if (amdgpu_encoder->devices & amdgpu_connector->devices) {
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> if (amdgpu_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
> amdgpu_atombios_encoder_init_backlight(amdgpu_encoder, connector);
> adev->mode_info.bl_encoder = amdgpu_encoder;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index 016f15093173..677e96a56330 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -627,7 +627,7 @@ static int dce_virtual_connector_encoder_init(struct amdgpu_device *adev,
> drm_connector_register(connector);
>
> /* link them */
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index b93fa4b3841f..a1e6aac9ed11 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -3660,7 +3660,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,
> link,
> link_index);
>
> - drm_mode_connector_attach_encoder(
> + drm_connector_attach_encoder(
> &aconnector->base, &aencoder->base);
>
> drm_connector_register(&aconnector->base);
> diff --git a/drivers/gpu/drm/arc/arcpgu_sim.c b/drivers/gpu/drm/arc/arcpgu_sim.c
> index b8f6f9a5dfbe..68629e614990 100644
> --- a/drivers/gpu/drm/arc/arcpgu_sim.c
> +++ b/drivers/gpu/drm/arc/arcpgu_sim.c
> @@ -99,7 +99,7 @@ int arcpgu_drm_sim_init(struct drm_device *drm, struct device_node *np)
> goto error_encoder_cleanup;
> }
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0) {
> dev_err(drm->dev, "could not attach connector to encoder\n");
> drm_connector_unregister(connector);
> diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> index 1bb8174ad155..5e77d456d9bb 100644
> --- a/drivers/gpu/drm/ast/ast_mode.c
> +++ b/drivers/gpu/drm/ast/ast_mode.c
> @@ -900,7 +900,7 @@ static int ast_connector_init(struct drm_device *dev)
> connector->polled = DRM_CONNECTOR_POLL_CONNECT;
>
> encoder = list_first_entry(&dev->mode_config.encoder_list, struct drm_encoder, head);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> ast_connector->i2c = ast_i2c_create(dev);
> if (!ast_connector->i2c)
> diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
> index 233980a78591..ca5a9afdd5cf 100644
> --- a/drivers/gpu/drm/bochs/bochs_kms.c
> +++ b/drivers/gpu/drm/bochs/bochs_kms.c
> @@ -259,7 +259,7 @@ int bochs_kms_init(struct bochs_device *bochs)
> bochs_crtc_init(bochs->dev);
> bochs_encoder_init(bochs->dev);
> bochs_connector_init(bochs->dev);
> - drm_mode_connector_attach_encoder(&bochs->connector,
> + drm_connector_attach_encoder(&bochs->connector,
> &bochs->encoder);
>
> return 0;
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 1f4745953aca..6437b878724a 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -860,7 +860,7 @@ static int adv7511_bridge_attach(struct drm_bridge *bridge)
> }
> drm_connector_helper_add(&adv->connector,
> &adv7511_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(&adv->connector, bridge->encoder);
> + drm_connector_attach_encoder(&adv->connector, bridge->encoder);
>
> if (adv->type == ADV7533)
> ret = adv7533_attach_dsi(adv);
> diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> index 37f947dcadec..f8433c93f463 100644
> --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
> +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> @@ -1048,8 +1048,8 @@ static int anx78xx_bridge_attach(struct drm_bridge *bridge)
>
> anx78xx->connector.polled = DRM_CONNECTOR_POLL_HPD;
>
> - err = drm_mode_connector_attach_encoder(&anx78xx->connector,
> - bridge->encoder);
> + err = drm_connector_attach_encoder(&anx78xx->connector,
> + bridge->encoder);
> if (err) {
> DRM_ERROR("Failed to link up connector to encoder: %d\n", err);
> return err;
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index 288c015f7460..d68986cea132 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -1210,7 +1210,7 @@ static int analogix_dp_bridge_attach(struct drm_bridge *bridge)
>
> drm_connector_helper_add(connector,
> &analogix_dp_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> }
>
> /*
> diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> index da99b8ba4ee1..9b706789a341 100644
> --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
> +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> @@ -122,7 +122,7 @@ static int dumb_vga_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> - drm_mode_connector_attach_encoder(&vga->connector,
> + drm_connector_attach_encoder(&vga->connector,
> bridge->encoder);
>
> return 0;
> diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> index b49b543bd1f6..2136c97aeb8e 100644
> --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> @@ -241,7 +241,7 @@ static int ge_b850v3_lvds_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> - ret = drm_mode_connector_attach_encoder(connector, bridge->encoder);
> + ret = drm_connector_attach_encoder(connector, bridge->encoder);
> if (ret)
> return ret;
>
> diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> index bd5c191858cb..a3e817abace1 100644
> --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
> +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> @@ -265,7 +265,7 @@ static int ptn3460_bridge_attach(struct drm_bridge *bridge)
> drm_connector_helper_add(&ptn_bridge->connector,
> &ptn3460_connector_helper_funcs);
> drm_connector_register(&ptn_bridge->connector);
> - drm_mode_connector_attach_encoder(&ptn_bridge->connector,
> + drm_connector_attach_encoder(&ptn_bridge->connector,
> bridge->encoder);
>
> if (ptn_bridge->panel)
> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
> index 6d99d4a3beb3..7cbaba213ef6 100644
> --- a/drivers/gpu/drm/bridge/panel.c
> +++ b/drivers/gpu/drm/bridge/panel.c
> @@ -79,7 +79,7 @@ static int panel_bridge_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> - drm_mode_connector_attach_encoder(&panel_bridge->connector,
> + drm_connector_attach_encoder(&panel_bridge->connector,
> bridge->encoder);
>
> ret = drm_panel_attach(panel_bridge->panel, &panel_bridge->connector);
> diff --git a/drivers/gpu/drm/bridge/parade-ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c
> index 81198f5e9afa..7334d1b62b71 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8622.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8622.c
> @@ -503,7 +503,7 @@ static int ps8622_attach(struct drm_bridge *bridge)
> drm_connector_helper_add(&ps8622->connector,
> &ps8622_connector_helper_funcs);
> drm_connector_register(&ps8622->connector);
> - drm_mode_connector_attach_encoder(&ps8622->connector,
> + drm_connector_attach_encoder(&ps8622->connector,
> bridge->encoder);
>
> if (ps8622->panel)
> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> index cd331933c230..e59a13542333 100644
> --- a/drivers/gpu/drm/bridge/sii902x.c
> +++ b/drivers/gpu/drm/bridge/sii902x.c
> @@ -324,7 +324,7 @@ static int sii902x_bridge_attach(struct drm_bridge *bridge)
> else
> sii902x->connector.polled = DRM_CONNECTOR_POLL_CONNECT;
>
> - drm_mode_connector_attach_encoder(&sii902x->connector, bridge->encoder);
> + drm_connector_attach_encoder(&sii902x->connector, bridge->encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> index ab32aceb6f24..5971976284bf 100644
> --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> @@ -1974,7 +1974,7 @@ static int dw_hdmi_bridge_attach(struct drm_bridge *bridge)
> drm_connector_init(bridge->dev, connector, &dw_hdmi_connector_funcs,
> DRM_MODE_CONNECTOR_HDMIA);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> index ee2fd0a349b3..8e28e738cb52 100644
> --- a/drivers/gpu/drm/bridge/tc358767.c
> +++ b/drivers/gpu/drm/bridge/tc358767.c
> @@ -1195,7 +1195,7 @@ static int tc_bridge_attach(struct drm_bridge *bridge)
>
> drm_display_info_set_bus_formats(&tc->connector.display_info,
> &bus_format, 1);
> - drm_mode_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
> + drm_connector_attach_encoder(&tc->connector, tc->bridge.encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> index c81bf7910bbe..c3e32138c6bb 100644
> --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> @@ -132,7 +132,7 @@ static int tfp410_attach(struct drm_bridge *bridge)
> return ret;
> }
>
> - drm_mode_connector_attach_encoder(&dvi->connector,
> + drm_connector_attach_encoder(&dvi->connector,
> bridge->encoder);
>
> return 0;
> diff --git a/drivers/gpu/drm/cirrus/cirrus_mode.c b/drivers/gpu/drm/cirrus/cirrus_mode.c
> index b529f8c8e2a6..336bfda40125 100644
> --- a/drivers/gpu/drm/cirrus/cirrus_mode.c
> +++ b/drivers/gpu/drm/cirrus/cirrus_mode.c
> @@ -530,7 +530,7 @@ int cirrus_modeset_init(struct cirrus_device *cdev)
> return -1;
> }
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> ret = cirrus_fbdev_init(cdev);
> if (ret) {
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index ccb70a4490d3..43cd636d83b5 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -52,7 +52,7 @@
> *
> * Connectors must be attached to an encoder to be used. For devices that map
> * connectors to encoders 1:1, the connector should be attached at
> - * initialization time with a call to drm_mode_connector_attach_encoder(). The
> + * initialization time with a call to drm_connector_attach_encoder(). The
> * driver must also set the &drm_connector.encoder field to point to the
> * attached encoder.
> *
> @@ -295,7 +295,7 @@ int drm_connector_init(struct drm_device *dev,
> EXPORT_SYMBOL(drm_connector_init);
>
> /**
> - * drm_mode_connector_attach_encoder - attach a connector to an encoder
> + * drm_connector_attach_encoder - attach a connector to an encoder
> * @connector: connector to attach
> * @encoder: encoder to attach @connector to
> *
> @@ -306,8 +306,8 @@ EXPORT_SYMBOL(drm_connector_init);
> * Returns:
> * Zero on success, negative errno on failure.
> */
> -int drm_mode_connector_attach_encoder(struct drm_connector *connector,
> - struct drm_encoder *encoder)
> +int drm_connector_attach_encoder(struct drm_connector *connector,
> + struct drm_encoder *encoder)
> {
> int i;
>
> @@ -333,7 +333,7 @@ int drm_mode_connector_attach_encoder(struct drm_connector *connector,
> }
> return -ENOMEM;
> }
> -EXPORT_SYMBOL(drm_mode_connector_attach_encoder);
> +EXPORT_SYMBOL(drm_connector_attach_encoder);
>
> /**
> * drm_connector_has_possible_encoder - check if the connector and encoder are assosicated with each other
> diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c
> index b72fcf1e9605..51fa978f0d23 100644
> --- a/drivers/gpu/drm/drm_simple_kms_helper.c
> +++ b/drivers/gpu/drm/drm_simple_kms_helper.c
> @@ -287,7 +287,7 @@ int drm_simple_display_pipe_init(struct drm_device *dev,
> if (ret || !connector)
> return ret;
>
> - return drm_mode_connector_attach_encoder(connector, encoder);
> + return drm_connector_attach_encoder(connector, encoder);
> }
> EXPORT_SYMBOL(drm_simple_display_pipe_init);
>
> diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
> index 827395071f0b..e655bcc6c75c 100644
> --- a/drivers/gpu/drm/drm_writeback.c
> +++ b/drivers/gpu/drm/drm_writeback.c
> @@ -199,7 +199,7 @@ int drm_writeback_connector_init(struct drm_device *dev,
> if (ret)
> goto connector_fail;
>
> - ret = drm_mode_connector_attach_encoder(connector,
> + ret = drm_connector_attach_encoder(connector,
> &wb_connector->encoder);
> if (ret)
> goto attach_fail;
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dpi.c b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> index 66945e0dc57f..e3a343bb14b7 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dpi.c
> @@ -113,7 +113,7 @@ static int exynos_dpi_create_connector(struct drm_encoder *encoder)
> }
>
> drm_connector_helper_add(connector, &exynos_dpi_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_dsi.c b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> index 6d29777884f9..bee6d4a4078d 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_dsi.c
> @@ -1479,7 +1479,7 @@ static int exynos_dsi_create_connector(struct drm_encoder *encoder)
>
> connector->status = connector_status_disconnected;
> drm_connector_helper_add(connector, &exynos_dsi_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> index dfea61edba4a..19697c1362d8 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> @@ -344,7 +344,7 @@ static int vidi_create_connector(struct drm_encoder *encoder)
> }
>
> drm_connector_helper_add(connector, &vidi_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> index 6672d0ff0423..3a11c719a580 100644
> --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> @@ -951,7 +951,7 @@ static int hdmi_create_connector(struct drm_encoder *encoder)
> }
>
> drm_connector_helper_add(connector, &hdmi_connector_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> if (hdata->bridge) {
> ret = drm_bridge_attach(encoder, hdata->bridge, NULL);
> diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> index c54806d08dd7..a37c06996ffe 100644
> --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
> @@ -117,7 +117,7 @@ static int fsl_dcu_attach_panel(struct fsl_dcu_drm_device *fsl_dev,
> if (ret < 0)
> goto err_cleanup;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0)
> goto err_sysfs;
>
> diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
> index 08f17f85b801..09c1161a7ac6 100644
> --- a/drivers/gpu/drm/gma500/gma_display.c
> +++ b/drivers/gpu/drm/gma500/gma_display.c
> @@ -665,7 +665,7 @@ void gma_connector_attach_encoder(struct gma_connector *connector,
> struct gma_encoder *encoder)
> {
> connector->encoder = encoder;
> - drm_mode_connector_attach_encoder(&connector->base,
> + drm_connector_attach_encoder(&connector->base,
> &encoder->base);
> }
>
> diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
> index a05c020602bd..d0bf5a1e94e8 100644
> --- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
> +++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
> @@ -999,7 +999,7 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev,
> p_funcs->encoder_helper_funcs);
>
> /*attach to given connector*/
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> /*set possible crtcs and clones*/
> if (dsi_connector->pipe) {
> diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> index d2f4749ebf8d..744956cea749 100644
> --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c
> @@ -133,7 +133,7 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv)
> }
>
> drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> index d434f576e6b2..eecdc327b9f8 100644
> --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> @@ -1301,7 +1301,7 @@ static int tda998x_connector_init(struct tda998x_priv *priv,
> if (ret)
> return ret;
>
> - drm_mode_connector_attach_encoder(&priv->connector, &priv->encoder);
> + drm_connector_attach_encoder(&priv->connector, &priv->encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index bb930755544d..be5d5dd75c3b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15934,8 +15934,7 @@ void intel_connector_attach_encoder(struct intel_connector *connector,
> struct intel_encoder *encoder)
> {
> connector->encoder = encoder;
> - drm_mode_connector_attach_encoder(&connector->base,
> - &encoder->base);
> + drm_connector_attach_encoder(&connector->base, &encoder->base);
> }
>
> /*
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 85ecf41eeabb..494e5c40a464 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -466,8 +466,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
> struct drm_encoder *enc =
> &intel_dp->mst_encoders[pipe]->base.base;
>
> - ret = drm_mode_connector_attach_encoder(&intel_connector->base,
> - enc);
> + ret = drm_connector_attach_encoder(&intel_connector->base, enc);
> if (ret)
> goto err;
> }
> diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
> index ae81cbb75f51..7312beb6f1fc 100644
> --- a/drivers/gpu/drm/imx/imx-ldb.c
> +++ b/drivers/gpu/drm/imx/imx-ldb.c
> @@ -471,8 +471,7 @@ static int imx_ldb_register(struct drm_device *drm,
> drm_connector_init(drm, &imx_ldb_ch->connector,
> &imx_ldb_connector_funcs,
> DRM_MODE_CONNECTOR_LVDS);
> - drm_mode_connector_attach_encoder(&imx_ldb_ch->connector,
> - encoder);
> + drm_connector_attach_encoder(&imx_ldb_ch->connector, encoder);
> }
>
> if (imx_ldb_ch->panel) {
> diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
> index 1a4ced5c09b5..cffd3310240e 100644
> --- a/drivers/gpu/drm/imx/imx-tve.c
> +++ b/drivers/gpu/drm/imx/imx-tve.c
> @@ -493,7 +493,7 @@ static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve)
> drm_connector_init(drm, &tve->connector, &imx_tve_connector_funcs,
> DRM_MODE_CONNECTOR_VGA);
>
> - drm_mode_connector_attach_encoder(&tve->connector, &tve->encoder);
> + drm_connector_attach_encoder(&tve->connector, &tve->encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
> index 4fc1cf583435..aefd04e18f93 100644
> --- a/drivers/gpu/drm/imx/parallel-display.c
> +++ b/drivers/gpu/drm/imx/parallel-display.c
> @@ -197,7 +197,7 @@ static int imx_pd_register(struct drm_device *drm,
> return ret;
> }
> } else {
> - drm_mode_connector_attach_encoder(&imxpd->connector, encoder);
> + drm_connector_attach_encoder(&imxpd->connector, encoder);
> }
>
> return 0;
> diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
> index aa0943ec32b0..66df1b177959 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dsi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
> @@ -782,7 +782,7 @@ static int mtk_dsi_create_connector(struct drm_device *drm, struct mtk_dsi *dsi)
> drm_connector_helper_add(&dsi->conn, &mtk_dsi_connector_helper_funcs);
>
> dsi->conn.dpms = DRM_MODE_DPMS_OFF;
> - drm_mode_connector_attach_encoder(&dsi->conn, &dsi->encoder);
> + drm_connector_attach_encoder(&dsi->conn, &dsi->encoder);
>
> if (dsi->panel) {
> ret = drm_panel_attach(dsi->panel, &dsi->conn);
> diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> index 835313940395..2d45d1dd9554 100644
> --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> @@ -1306,7 +1306,7 @@ static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge)
> hdmi->conn.interlace_allowed = true;
> hdmi->conn.doublescan_allowed = false;
>
> - ret = drm_mode_connector_attach_encoder(&hdmi->conn,
> + ret = drm_connector_attach_encoder(&hdmi->conn,
> bridge->encoder);
> if (ret) {
> dev_err(hdmi->dev,
> diff --git a/drivers/gpu/drm/meson/meson_venc_cvbs.c b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> index 79d95ca8a0c0..f7945bae3b4a 100644
> --- a/drivers/gpu/drm/meson/meson_venc_cvbs.c
> +++ b/drivers/gpu/drm/meson/meson_venc_cvbs.c
> @@ -282,7 +282,7 @@ int meson_venc_cvbs_create(struct meson_drm *priv)
>
> encoder->possible_crtcs = BIT(0);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
> index 5f104f139197..acf7bfe68454 100644
> --- a/drivers/gpu/drm/mgag200/mgag200_mode.c
> +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
> @@ -1747,7 +1747,7 @@ int mgag200_modeset_init(struct mga_device *mdev)
> return -1;
> }
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> ret = mgag200_fbdev_init(mdev);
> if (ret) {
> diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
> index e3b1c86b7aae..df642e06ed0d 100644
> --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
> +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
> @@ -129,7 +129,7 @@ struct drm_connector *mdp4_lvds_connector_init(struct drm_device *dev,
> connector->interlace_allowed = 0;
> connector->doublescan_allowed = 0;
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> index 4beba3f7d067..21e0dc51531d 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> @@ -684,7 +684,7 @@ struct drm_connector *msm_dsi_manager_connector_init(u8 id)
> connector->interlace_allowed = 0;
> connector->doublescan_allowed = 0;
>
> - drm_mode_connector_attach_encoder(connector, msm_dsi->encoder);
> + drm_connector_attach_encoder(connector, msm_dsi->encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
> index 0b5eac054195..058ff92a0207 100644
> --- a/drivers/gpu/drm/msm/edp/edp_connector.c
> +++ b/drivers/gpu/drm/msm/edp/edp_connector.c
> @@ -134,7 +134,7 @@ struct drm_connector *msm_edp_connector_init(struct msm_edp *edp)
> connector->interlace_allowed = false;
> connector->doublescan_allowed = false;
>
> - drm_mode_connector_attach_encoder(connector, edp->encoder);
> + drm_connector_attach_encoder(connector, edp->encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> index 07feacc5a441..e9c9a0af508e 100644
> --- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> +++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> @@ -477,7 +477,7 @@ struct drm_connector *msm_hdmi_connector_init(struct hdmi *hdmi)
> return ERR_PTR(ret);
> }
>
> - drm_mode_connector_attach_encoder(connector, hdmi->encoder);
> + drm_connector_attach_encoder(connector, hdmi->encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
> index 4feab0a5419d..e7af95d37ddb 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
> @@ -556,6 +556,6 @@ nv04_dac_create(struct drm_connector *connector, struct dcb_output *entry)
> encoder->possible_crtcs = entry->heads;
> encoder->possible_clones = 0;
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> index 9805d2cdc1a1..73d41abbb510 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> @@ -716,6 +716,6 @@ nv04_dfp_create(struct drm_connector *connector, struct dcb_output *entry)
> entry->location != DCB_LOC_ON_CHIP)
> nv04_tmds_slave_init(encoder);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
> index 01664357d3e1..de4490b4ed30 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
> @@ -244,7 +244,7 @@ nv04_tv_create(struct drm_connector *connector, struct dcb_output *entry)
>
> /* Attach it to the specified connector. */
> get_slave_funcs(encoder)->create_resources(encoder, connector);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
> index 6d99f11fee4e..6a4ca139cf5d 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
> @@ -821,6 +821,6 @@ nv17_tv_create(struct drm_connector *connector, struct dcb_output *entry)
> encoder->possible_clones = 0;
>
> nv17_tv_create_resources(encoder, connector);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> index 2fabb69e452b..475456c19b76 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -424,7 +424,7 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe)
> "dac-%04x-%04x", dcbe->hasht, dcbe->hashm);
> drm_encoder_helper_add(encoder, &nv50_dac_help);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
>
> @@ -927,7 +927,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
> nouveau_conn_attach_properties(&mstc->connector);
>
> for (i = 0; i < ARRAY_SIZE(mstm->msto) && mstm->msto[i]; i++)
> - drm_mode_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder);
> + drm_connector_attach_encoder(&mstc->connector, &mstm->msto[i]->encoder);
>
> drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0);
> drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0);
> @@ -1418,7 +1418,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe)
> "sor-%04x-%04x", dcbe->hasht, dcbe->hashm);
> drm_encoder_helper_add(encoder, &nv50_sor_help);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> if (dcbe->type == DCB_OUTPUT_DP) {
> struct nv50_disp *disp = nv50_disp(encoder->dev);
> @@ -1576,7 +1576,7 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe)
> "pior-%04x-%04x", dcbe->hasht, dcbe->hashm);
> drm_encoder_helper_add(encoder, &nv50_pior_help);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> index 5005ecc284d2..1b6601e9b107 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> @@ -274,7 +274,7 @@ static int omap_modeset_init(struct drm_device *dev)
> if (IS_ERR(crtc))
> return PTR_ERR(crtc);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> encoder->possible_crtcs = (1 << crtc_idx);
>
> priv->crtcs[priv->num_crtcs++] = crtc;
> diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
> index 768207fbbae3..0570c6826bff 100644
> --- a/drivers/gpu/drm/qxl/qxl_display.c
> +++ b/drivers/gpu/drm/qxl/qxl_display.c
> @@ -1086,7 +1086,7 @@ static int qdev_output_init(struct drm_device *dev, int num_output)
> /* we get HPD via client monitors config */
> connector->polled = DRM_CONNECTOR_POLL_HPD;
> encoder->possible_crtcs = 1 << num_output;
> - drm_mode_connector_attach_encoder(&qxl_output->base,
> + drm_connector_attach_encoder(&qxl_output->base,
> &qxl_output->enc);
> drm_encoder_helper_add(encoder, &qxl_enc_helper_funcs);
> drm_connector_helper_add(connector, &qxl_connector_helper_funcs);
> diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
> index c6ee80216cf4..c341fb2a5b56 100644
> --- a/drivers/gpu/drm/radeon/radeon_encoders.c
> +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
> @@ -211,7 +211,7 @@ radeon_link_encoder_connector(struct drm_device *dev)
> list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
> radeon_encoder = to_radeon_encoder(encoder);
> if (radeon_encoder->devices & radeon_connector->devices) {
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT))
> radeon_encoder_add_backlight(radeon_encoder, connector);
> }
> diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> index 155ad840f3c5..4feea76a3967 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> @@ -353,7 +353,7 @@ static int rcar_lvds_attach(struct drm_bridge *bridge)
>
> drm_connector_helper_add(connector, &rcar_lvds_conn_helper_funcs);
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0)
> return ret;
>
> diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> index a40cb2be50e1..8ad0d773dc33 100644
> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> @@ -1062,7 +1062,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
>
> drm_connector_helper_add(connector, &cdn_dp_connector_helper_funcs);
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret) {
> DRM_ERROR("failed to attach connector and encoder\n");
> goto err_free_connector;
> diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> index d53d5a09547f..7bbbf52758b5 100644
> --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
> @@ -1129,7 +1129,7 @@ static int dw_mipi_dsi_register(struct drm_device *drm,
> &dw_mipi_dsi_atomic_connector_funcs,
> DRM_MODE_CONNECTOR_DSI);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
> index 510fcb33e31d..1c02b3e61299 100644
> --- a/drivers/gpu/drm/rockchip/inno_hdmi.c
> +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
> @@ -634,7 +634,7 @@ static int inno_hdmi_register(struct drm_device *drm, struct inno_hdmi *hdmi)
> drm_connector_init(drm, &hdmi->connector, &inno_hdmi_connector_funcs,
> DRM_MODE_CONNECTOR_HDMIA);
>
> - drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
> + drm_connector_attach_encoder(&hdmi->connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> index b3f6f524b402..456bd9f13bae 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
> @@ -434,7 +434,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
> drm_connector_helper_add(connector,
> &rockchip_lvds_connector_helper_funcs);
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0) {
> DRM_DEV_ERROR(drm_dev->dev,
> "failed to attach encoder: %d\n", ret);
> diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
> index 40df8887fc17..fc66167b0641 100644
> --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
> +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
> @@ -675,7 +675,7 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
> if (ret < 0)
> goto err_cleanup;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret < 0)
> goto err_backlight;
>
> diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c
> index a5979cd25cc7..21929dc616a3 100644
> --- a/drivers/gpu/drm/sti/sti_dvo.c
> +++ b/drivers/gpu/drm/sti/sti_dvo.c
> @@ -484,7 +484,7 @@ static int sti_dvo_bind(struct device *dev, struct device *master, void *data)
> drm_connector_helper_add(drm_connector,
> &sti_dvo_connector_helper_funcs);
>
> - err = drm_mode_connector_attach_encoder(drm_connector, encoder);
> + err = drm_connector_attach_encoder(drm_connector, encoder);
> if (err) {
> DRM_ERROR("Failed to attach a connector to a encoder\n");
> goto err_sysfs;
> diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c
> index 67bbdb49fffc..49438337f70d 100644
> --- a/drivers/gpu/drm/sti/sti_hda.c
> +++ b/drivers/gpu/drm/sti/sti_hda.c
> @@ -709,7 +709,7 @@ static int sti_hda_bind(struct device *dev, struct device *master, void *data)
> drm_connector_helper_add(drm_connector,
> &sti_hda_connector_helper_funcs);
>
> - err = drm_mode_connector_attach_encoder(drm_connector, encoder);
> + err = drm_connector_attach_encoder(drm_connector, encoder);
> if (err) {
> DRM_ERROR("Failed to attach a connector to a encoder\n");
> goto err_sysfs;
> diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
> index 0c3008356ab8..34cdc4644435 100644
> --- a/drivers/gpu/drm/sti/sti_hdmi.c
> +++ b/drivers/gpu/drm/sti/sti_hdmi.c
> @@ -1290,7 +1290,7 @@ static int sti_hdmi_bind(struct device *dev, struct device *master, void *data)
>
> hdmi->drm_connector = drm_connector;
>
> - err = drm_mode_connector_attach_encoder(drm_connector, encoder);
> + err = drm_connector_attach_encoder(drm_connector, encoder);
> if (err) {
> DRM_ERROR("Failed to attach a connector to a encoder\n");
> goto err_sysfs;
> diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> index 9b4b1d015423..061d2e0d9011 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> @@ -623,7 +623,7 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
> ret = cec_register_adapter(hdmi->cec_adap, dev);
> if (ret < 0)
> goto err_cleanup_connector;
> - drm_mode_connector_attach_encoder(&hdmi->connector, &hdmi->encoder);
> + drm_connector_attach_encoder(&hdmi->connector, &hdmi->encoder);
>
> return 0;
>
> diff --git a/drivers/gpu/drm/sun4i/sun4i_lvds.c b/drivers/gpu/drm/sun4i/sun4i_lvds.c
> index a69fe2e1f9d1..af7dcb6da351 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_lvds.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_lvds.c
> @@ -149,7 +149,7 @@ int sun4i_lvds_init(struct drm_device *drm, struct sun4i_tcon *tcon)
> goto err_cleanup_connector;
> }
>
> - drm_mode_connector_attach_encoder(&lvds->connector,
> + drm_connector_attach_encoder(&lvds->connector,
> &lvds->encoder);
>
> ret = drm_panel_attach(tcon->panel, &lvds->connector);
> diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
> index 96d21b07f8fc..bf068da6b12e 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
> @@ -215,7 +215,7 @@ int sun4i_rgb_init(struct drm_device *drm, struct sun4i_tcon *tcon)
> goto err_cleanup_connector;
> }
>
> - drm_mode_connector_attach_encoder(&rgb->connector,
> + drm_connector_attach_encoder(&rgb->connector,
> &rgb->encoder);
>
> ret = drm_panel_attach(tcon->panel, &rgb->connector);
> diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
> index b070d522ed8d..1a838d208211 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_tv.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
> @@ -623,7 +623,7 @@ static int sun4i_tv_bind(struct device *dev, struct device *master,
> }
> tv->connector.interlace_allowed = true;
>
> - drm_mode_connector_attach_encoder(&tv->connector, &tv->encoder);
> + drm_connector_attach_encoder(&tv->connector, &tv->encoder);
>
> return 0;
>
> diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
> index da9814f94d00..ce5dca755f7f 100644
> --- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
> +++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
> @@ -941,7 +941,7 @@ static int sun6i_dsi_bind(struct device *dev, struct device *master,
> goto err_cleanup_connector;
> }
>
> - drm_mode_connector_attach_encoder(&dsi->connector, &dsi->encoder);
> + drm_connector_attach_encoder(&dsi->connector, &dsi->encoder);
> drm_panel_attach(dsi->panel, &dsi->connector);
>
> return 0;
> diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
> index 87c5d89bc9ba..c1c3f18a8990 100644
> --- a/drivers/gpu/drm/tegra/dsi.c
> +++ b/drivers/gpu/drm/tegra/dsi.c
> @@ -1052,7 +1052,7 @@ static int tegra_dsi_init(struct host1x_client *client)
> drm_encoder_helper_add(&dsi->output.encoder,
> &tegra_dsi_encoder_helper_funcs);
>
> - drm_mode_connector_attach_encoder(&dsi->output.connector,
> + drm_connector_attach_encoder(&dsi->output.connector,
> &dsi->output.encoder);
> drm_connector_register(&dsi->output.connector);
>
> diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
> index 784739a9f497..0082468f703c 100644
> --- a/drivers/gpu/drm/tegra/hdmi.c
> +++ b/drivers/gpu/drm/tegra/hdmi.c
> @@ -1488,7 +1488,7 @@ static int tegra_hdmi_init(struct host1x_client *client)
> drm_encoder_helper_add(&hdmi->output.encoder,
> &tegra_hdmi_encoder_helper_funcs);
>
> - drm_mode_connector_attach_encoder(&hdmi->output.connector,
> + drm_connector_attach_encoder(&hdmi->output.connector,
> &hdmi->output.encoder);
> drm_connector_register(&hdmi->output.connector);
>
> diff --git a/drivers/gpu/drm/tegra/rgb.c b/drivers/gpu/drm/tegra/rgb.c
> index 78ec5193741d..28a78d3120bc 100644
> --- a/drivers/gpu/drm/tegra/rgb.c
> +++ b/drivers/gpu/drm/tegra/rgb.c
> @@ -289,7 +289,7 @@ int tegra_dc_rgb_init(struct drm_device *drm, struct tegra_dc *dc)
> drm_encoder_helper_add(&output->encoder,
> &tegra_rgb_encoder_helper_funcs);
>
> - drm_mode_connector_attach_encoder(&output->connector,
> + drm_connector_attach_encoder(&output->connector,
> &output->encoder);
> drm_connector_register(&output->connector);
>
> diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
> index 7d2a955fc515..d7fe9f15def1 100644
> --- a/drivers/gpu/drm/tegra/sor.c
> +++ b/drivers/gpu/drm/tegra/sor.c
> @@ -2622,7 +2622,7 @@ static int tegra_sor_init(struct host1x_client *client)
> encoder, NULL);
> drm_encoder_helper_add(&sor->output.encoder, helpers);
>
> - drm_mode_connector_attach_encoder(&sor->output.connector,
> + drm_connector_attach_encoder(&sor->output.connector,
> &sor->output.encoder);
> drm_connector_register(&sor->output.connector);
>
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> index d616d64a6725..a1acab39d87f 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
> @@ -223,7 +223,7 @@ static struct drm_connector *panel_connector_create(struct drm_device *dev,
> connector->interlace_allowed = 0;
> connector->doublescan_allowed = 0;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret)
> goto fail;
>
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> index 46dacca3cce8..daebf1aa6b0a 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> @@ -240,7 +240,7 @@ static struct drm_connector *tfp410_connector_create(struct drm_device *dev,
> connector->interlace_allowed = 0;
> connector->doublescan_allowed = 0;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret)
> goto fail;
>
> diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
> index 8fac12e1a1a4..68e88bed77ca 100644
> --- a/drivers/gpu/drm/udl/udl_connector.c
> +++ b/drivers/gpu/drm/udl/udl_connector.c
> @@ -200,7 +200,7 @@ int udl_connector_init(struct drm_device *dev, struct drm_encoder *encoder)
> drm_connector_helper_add(connector, &udl_connector_helper_funcs);
>
> drm_connector_register(connector);
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> connector->polled = DRM_CONNECTOR_POLL_HPD |
> DRM_CONNECTOR_POLL_CONNECT | DRM_CONNECTOR_POLL_DISCONNECT;
>
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> index 91f284e1b908..fd5522fd179e 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -329,7 +329,7 @@ static struct drm_connector *vc4_hdmi_connector_init(struct drm_device *dev,
> connector->interlace_allowed = 1;
> connector->doublescan_allowed = 0;
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c
> index 3a9a302247a2..8e7facb6514e 100644
> --- a/drivers/gpu/drm/vc4/vc4_vec.c
> +++ b/drivers/gpu/drm/vc4/vc4_vec.c
> @@ -404,7 +404,7 @@ static struct drm_connector *vc4_vec_connector_init(struct drm_device *dev,
> VC4_VEC_TV_MODE_NTSC);
> vec->tv_mode = &vc4_vec_tv_modes[VC4_VEC_TV_MODE_NTSC];
>
> - drm_mode_connector_attach_encoder(connector, vec->encoder);
> + drm_connector_attach_encoder(connector, vec->encoder);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c
> index ff9933e79416..25503b933599 100644
> --- a/drivers/gpu/drm/virtio/virtgpu_display.c
> +++ b/drivers/gpu/drm/virtio/virtgpu_display.c
> @@ -292,7 +292,7 @@ static int vgdev_output_init(struct virtio_gpu_device *vgdev, int index)
> drm_encoder_helper_add(encoder, &virtio_gpu_enc_helper_funcs);
> encoder->possible_crtcs = 1 << index;
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
> drm_connector_register(connector);
> return 0;
> }
> diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c
> index 48143eac3c12..e8e0e6615ff9 100644
> --- a/drivers/gpu/drm/vkms/vkms_output.c
> +++ b/drivers/gpu/drm/vkms/vkms_output.c
> @@ -63,7 +63,7 @@ int vkms_output_init(struct vkms_device *vkmsdev)
> }
> encoder->possible_crtcs = 1;
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret) {
> DRM_ERROR("Failed to attach connector to encoder\n");
> goto err_attach;
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> index dc0cfda26b1b..a234fe0e1061 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> @@ -438,7 +438,7 @@ static int vmw_ldu_init(struct vmw_private *dev_priv, unsigned unit)
> goto err_free_connector;
> }
>
> - (void) drm_mode_connector_attach_encoder(connector, encoder);
> + (void) drm_connector_attach_encoder(connector, encoder);
> encoder->possible_crtcs = (1 << unit);
> encoder->possible_clones = 0;
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> index 73cf3c6e1591..dd417eb74524 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> @@ -695,7 +695,7 @@ static int vmw_sou_init(struct vmw_private *dev_priv, unsigned unit)
> goto err_free_connector;
> }
>
> - (void) drm_mode_connector_attach_encoder(connector, encoder);
> + (void) drm_connector_attach_encoder(connector, encoder);
> encoder->possible_crtcs = (1 << unit);
> encoder->possible_clones = 0;
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> index a474d87b1af3..4cca78cab03f 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
> @@ -1486,7 +1486,7 @@ static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
> goto err_free_connector;
> }
>
> - (void) drm_mode_connector_attach_encoder(connector, encoder);
> + (void) drm_connector_attach_encoder(connector, encoder);
> encoder->possible_crtcs = (1 << unit);
> encoder->possible_clones = 0;
>
> diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
> index d073c6737500..78655269d843 100644
> --- a/drivers/gpu/drm/zte/zx_hdmi.c
> +++ b/drivers/gpu/drm/zte/zx_hdmi.c
> @@ -326,7 +326,7 @@ static int zx_hdmi_register(struct drm_device *drm, struct zx_hdmi *hdmi)
> drm_connector_helper_add(&hdmi->connector,
> &zx_hdmi_connector_helper_funcs);
>
> - drm_mode_connector_attach_encoder(&hdmi->connector, encoder);
> + drm_connector_attach_encoder(&hdmi->connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/zte/zx_tvenc.c b/drivers/gpu/drm/zte/zx_tvenc.c
> index 0de1a71ca4e0..b73afb212fb2 100644
> --- a/drivers/gpu/drm/zte/zx_tvenc.c
> +++ b/drivers/gpu/drm/zte/zx_tvenc.c
> @@ -297,7 +297,7 @@ static int zx_tvenc_register(struct drm_device *drm, struct zx_tvenc *tvenc)
> DRM_MODE_CONNECTOR_Composite);
> drm_connector_helper_add(connector, &zx_tvenc_connector_helper_funcs);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
> index 3e78ee21b8d0..23d1ff4355a0 100644
> --- a/drivers/gpu/drm/zte/zx_vga.c
> +++ b/drivers/gpu/drm/zte/zx_vga.c
> @@ -175,7 +175,7 @@ static int zx_vga_register(struct drm_device *drm, struct zx_vga *vga)
>
> drm_connector_helper_add(connector, &zx_vga_connector_helper_funcs);
>
> - ret = drm_mode_connector_attach_encoder(connector, encoder);
> + ret = drm_connector_attach_encoder(connector, encoder);
> if (ret) {
> DRM_DEV_ERROR(dev, "failed to attach encoder: %d\n", ret);
> goto clean_connector;
> diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
> index a943d2f683ed..da4a93df8d75 100644
> --- a/drivers/staging/vboxvideo/vbox_mode.c
> +++ b/drivers/staging/vboxvideo/vbox_mode.c
> @@ -655,7 +655,7 @@ static int vbox_connector_init(struct drm_device *dev,
> dev->mode_config.suggested_y_property, 0);
> drm_connector_register(connector);
>
> - drm_mode_connector_attach_encoder(connector, encoder);
> + drm_connector_attach_encoder(connector, encoder);
>
> return 0;
> }
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index 9841d2b6d3eb..dfd7a3595a6c 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -1081,7 +1081,7 @@ int drm_connector_init(struct drm_device *dev,
> int connector_type);
> int drm_connector_register(struct drm_connector *connector);
> void drm_connector_unregister(struct drm_connector *connector);
> -int drm_mode_connector_attach_encoder(struct drm_connector *connector,
> +int drm_connector_attach_encoder(struct drm_connector *connector,
> struct drm_encoder *encoder);
>
> void drm_connector_cleanup(struct drm_connector *connector);
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 07/15] drm: drop _mode_ from remaining connector functions
2018-07-09 8:40 ` [PATCH 07/15] drm: drop _mode_ from remaining connector functions Daniel Vetter
@ 2018-07-13 15:05 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-13 15:05 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:08AM +0200, Daniel Vetter wrote:
> Since there's very few callers of these I've decided to do them all in
> one patch. With this the unecessarily long drm_mode_connector_ prefix
> is gone from the codebase! The only exception being struct
> drm_mode_connector_set_property, which is part of the uapi so can't be
> renamed.
>
> Again done with sed+some manual fixups for indent issues.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
LGTM. There's an unrelated indent change in the arguments of
drm_connector_update_edid_property(), but it's an improvement, so I won't
nitpick it :-)
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 ++--
> drivers/gpu/drm/drm_atomic_helper.c | 2 +-
> drivers/gpu/drm/drm_connector.c | 36 +++++++++----------
> drivers/gpu/drm/drm_crtc_internal.h | 6 ++--
> drivers/gpu/drm/drm_dp_mst_topology.c | 4 +--
> drivers/gpu/drm/drm_ioctl.c | 2 +-
> drivers/gpu/drm/drm_mode_object.c | 3 +-
> drivers/gpu/drm/drm_modes.c | 6 ++--
> drivers/gpu/drm/drm_probe_helper.c | 4 +--
> drivers/gpu/drm/i915/intel_dp.c | 4 +--
> drivers/gpu/drm/i915/intel_dp_mst.c | 2 +-
> drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
> drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
> include/drm/drm_connector.h | 14 ++++----
> include/drm/drm_modes.h | 2 +-
> 17 files changed, 49 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> index 581bb75d08eb..65f210d3497b 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> @@ -345,7 +345,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
> aconnector, connector->base.id, aconnector->mst_port);
>
> aconnector->port = port;
> - drm_mode_connector_set_path_property(connector, pathprop);
> + drm_connector_set_path_property(connector, pathprop);
>
> drm_connector_list_iter_end(&conn_iter);
> aconnector->mst_connected = true;
> @@ -393,7 +393,7 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr *mgr,
> dev->mode_config.tile_property,
> 0);
>
> - drm_mode_connector_set_path_property(connector, pathprop);
> + drm_connector_set_path_property(connector, pathprop);
>
> /*
> * Initialize connector state before adding the connectror to drm and
> @@ -441,7 +441,7 @@ static void dm_dp_mst_hotplug(struct drm_dp_mst_topology_mgr *mgr)
> static void dm_dp_mst_link_status_reset(struct drm_connector *connector)
> {
> mutex_lock(&connector->dev->mode_config.mutex);
> - drm_mode_connector_set_link_status_property(connector, DRM_MODE_LINK_STATUS_BAD);
> + drm_connector_set_link_status_property(connector, DRM_MODE_LINK_STATUS_BAD);
> mutex_unlock(&connector->dev->mode_config.mutex);
> }
>
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 5bc88f361fef..acf9dbd9fed2 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -2809,7 +2809,7 @@ static int update_output_state(struct drm_atomic_state *state,
> * resets the "link-status" property to GOOD, to force any link
> * re-training. The SETCRTC ioctl does not define whether an update does
> * need a full modeset or just a plane update, hence we're allowed to do
> - * that. See also drm_mode_connector_set_link_status_property().
> + * that. See also drm_connector_set_link_status_property().
> *
> * Returns:
> * Returns 0 on success, negative errno numbers on failure.
> diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> index 43cd636d83b5..93647161f9e6 100644
> --- a/drivers/gpu/drm/drm_connector.c
> +++ b/drivers/gpu/drm/drm_connector.c
> @@ -856,7 +856,7 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
> * PATH:
> * Connector path property to identify how this sink is physically
> * connected. Used by DP MST. This should be set by calling
> - * drm_mode_connector_set_path_property(), in the case of DP MST with the
> + * drm_connector_set_path_property(), in the case of DP MST with the
> * path property the MST manager created. Userspace cannot change this
> * property.
> * TILE:
> @@ -867,14 +867,14 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
> * are not gen-locked. Note that for tiled panels which are genlocked, like
> * dual-link LVDS or dual-link DSI, the driver should try to not expose the
> * tiling and virtualize both &drm_crtc and &drm_plane if needed. Drivers
> - * should update this value using drm_mode_connector_set_tile_property().
> + * should update this value using drm_connector_set_tile_property().
> * Userspace cannot change this property.
> * link-status:
> * Connector link-status property to indicate the status of link. The
> * default value of link-status is "GOOD". If something fails during or
> * after modeset, the kernel driver may set this to "BAD" and issue a
> * hotplug uevent. Drivers should update this value using
> - * drm_mode_connector_set_link_status_property().
> + * drm_connector_set_link_status_property().
> * non_desktop:
> * Indicates the output should be ignored for purposes of displaying a
> * standard desktop environment or console. This is most likely because
> @@ -1429,7 +1429,7 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev)
> EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties);
>
> /**
> - * drm_mode_connector_set_path_property - set tile property on connector
> + * drm_connector_set_path_property - set tile property on connector
> * @connector: connector to set property on.
> * @path: path to use for property; must not be NULL.
> *
> @@ -1441,8 +1441,8 @@ EXPORT_SYMBOL(drm_mode_create_suggested_offset_properties);
> * Returns:
> * Zero on success, negative errno on failure.
> */
> -int drm_mode_connector_set_path_property(struct drm_connector *connector,
> - const char *path)
> +int drm_connector_set_path_property(struct drm_connector *connector,
> + const char *path)
> {
> struct drm_device *dev = connector->dev;
> int ret;
> @@ -1455,10 +1455,10 @@ int drm_mode_connector_set_path_property(struct drm_connector *connector,
> dev->mode_config.path_property);
> return ret;
> }
> -EXPORT_SYMBOL(drm_mode_connector_set_path_property);
> +EXPORT_SYMBOL(drm_connector_set_path_property);
>
> /**
> - * drm_mode_connector_set_tile_property - set tile property on connector
> + * drm_connector_set_tile_property - set tile property on connector
> * @connector: connector to set property on.
> *
> * This looks up the tile information for a connector, and creates a
> @@ -1468,7 +1468,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_path_property);
> * Returns:
> * Zero on success, errno on failure.
> */
> -int drm_mode_connector_set_tile_property(struct drm_connector *connector)
> +int drm_connector_set_tile_property(struct drm_connector *connector)
> {
> struct drm_device *dev = connector->dev;
> char tile[256];
> @@ -1498,7 +1498,7 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector)
> dev->mode_config.tile_property);
> return ret;
> }
> -EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
> +EXPORT_SYMBOL(drm_connector_set_tile_property);
>
> /**
> * drm_connector_update_edid_property - update the edid property of a connector
> @@ -1512,7 +1512,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
> * Zero on success, negative errno on failure.
> */
> int drm_connector_update_edid_property(struct drm_connector *connector,
> - const struct edid *edid)
> + const struct edid *edid)
> {
> struct drm_device *dev = connector->dev;
> size_t size = 0;
> @@ -1553,7 +1553,7 @@ int drm_connector_update_edid_property(struct drm_connector *connector,
> EXPORT_SYMBOL(drm_connector_update_edid_property);
>
> /**
> - * drm_mode_connector_set_link_status_property - Set link status property of a connector
> + * drm_connector_set_link_status_property - Set link status property of a connector
> * @connector: drm connector
> * @link_status: new value of link status property (0: Good, 1: Bad)
> *
> @@ -1571,8 +1571,8 @@ EXPORT_SYMBOL(drm_connector_update_edid_property);
> * it is not limited to DP or link training. For example, if we implement
> * asynchronous setcrtc, this property can be used to report any failures in that.
> */
> -void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
> - uint64_t link_status)
> +void drm_connector_set_link_status_property(struct drm_connector *connector,
> + uint64_t link_status)
> {
> struct drm_device *dev = connector->dev;
>
> @@ -1580,7 +1580,7 @@ void drm_mode_connector_set_link_status_property(struct drm_connector *connector
> connector->state->link_status = link_status;
> drm_modeset_unlock(&dev->mode_config.connection_mutex);
> }
> -EXPORT_SYMBOL(drm_mode_connector_set_link_status_property);
> +EXPORT_SYMBOL(drm_connector_set_link_status_property);
>
> /**
> * drm_connector_init_panel_orientation_property -
> @@ -1633,7 +1633,7 @@ int drm_connector_init_panel_orientation_property(
> }
> EXPORT_SYMBOL(drm_connector_init_panel_orientation_property);
>
> -int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
> +int drm_connector_set_obj_prop(struct drm_mode_object *obj,
> struct drm_property *property,
> uint64_t value)
> {
> @@ -1651,8 +1651,8 @@ int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
> return ret;
> }
>
> -int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
> - void *data, struct drm_file *file_priv)
> +int drm_connector_property_set_ioctl(struct drm_device *dev,
> + void *data, struct drm_file *file_priv)
> {
> struct drm_mode_connector_set_property *conn_set_prop = data;
> struct drm_mode_obj_set_property obj_set_prop = {
> diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
> index 235d40fce8b5..b61322763394 100644
> --- a/drivers/gpu/drm/drm_crtc_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_internal.h
> @@ -148,7 +148,7 @@ void drm_connector_ida_init(void);
> void drm_connector_ida_destroy(void);
> void drm_connector_unregister_all(struct drm_device *dev);
> int drm_connector_register_all(struct drm_device *dev);
> -int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
> +int drm_connector_set_obj_prop(struct drm_mode_object *obj,
> struct drm_property *property,
> uint64_t value);
> int drm_connector_create_standard_properties(struct drm_device *dev);
> @@ -156,8 +156,8 @@ const char *drm_get_connector_force_name(enum drm_connector_force force);
> void drm_connector_free_work_fn(struct work_struct *work);
>
> /* IOCTL */
> -int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
> - void *data, struct drm_file *file_priv);
> +int drm_connector_property_set_ioctl(struct drm_device *dev,
> + void *data, struct drm_file *file_priv);
> int drm_mode_getconnector(struct drm_device *dev,
> void *data, struct drm_file *file_priv);
>
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 658830620ca3..7780567aa669 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -1215,7 +1215,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
> port->pdt == DP_PEER_DEVICE_SST_SINK) &&
> port->port_num >= DP_MST_LOGICAL_PORT_0) {
> port->cached_edid = drm_get_edid(port->connector, &port->aux.ddc);
> - drm_mode_connector_set_tile_property(port->connector);
> + drm_connector_set_tile_property(port->connector);
> }
> (*mstb->mgr->cbs->register_connector)(port->connector);
> }
> @@ -2559,7 +2559,7 @@ struct edid *drm_dp_mst_get_edid(struct drm_connector *connector, struct drm_dp_
> edid = drm_edid_duplicate(port->cached_edid);
> else {
> edid = drm_get_edid(connector, &port->aux.ddc);
> - drm_mode_connector_set_tile_property(connector);
> + drm_connector_set_tile_property(connector);
> }
> port->has_audio = drm_detect_monitor_audio(edid);
> drm_dp_put_port(port);
> diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
> index c148eb3be8c2..882777fa66fa 100644
> --- a/drivers/gpu/drm/drm_ioctl.c
> +++ b/drivers/gpu/drm/drm_ioctl.c
> @@ -641,7 +641,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = {
> DRM_IOCTL_DEF(DRM_IOCTL_MODE_ATTACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED),
> DRM_IOCTL_DEF(DRM_IOCTL_MODE_DETACHMODE, drm_noop, DRM_MASTER|DRM_UNLOCKED),
> DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPERTY, drm_mode_getproperty_ioctl, DRM_UNLOCKED),
> - DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_mode_connector_property_set_ioctl, DRM_MASTER|DRM_UNLOCKED),
> + DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETPROPERTY, drm_connector_property_set_ioctl, DRM_MASTER|DRM_UNLOCKED),
> DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPROPBLOB, drm_mode_getblob_ioctl, DRM_UNLOCKED),
> DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETFB, drm_mode_getfb, DRM_UNLOCKED),
> DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb_ioctl, DRM_UNLOCKED),
> diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_object.c
> index ce4d2fb32810..fcb0ab0abb75 100644
> --- a/drivers/gpu/drm/drm_mode_object.c
> +++ b/drivers/gpu/drm/drm_mode_object.c
> @@ -433,8 +433,7 @@ static int set_property_legacy(struct drm_mode_object *obj,
> drm_modeset_lock_all(dev);
> switch (obj->type) {
> case DRM_MODE_OBJECT_CONNECTOR:
> - ret = drm_mode_connector_set_obj_prop(obj, prop,
> - prop_value);
> + ret = drm_connector_set_obj_prop(obj, prop, prop_value);
> break;
> case DRM_MODE_OBJECT_CRTC:
> ret = drm_mode_crtc_set_obj_prop(obj, prop, prop_value);
> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
> index 7f552d5fa88e..6590e65d0b49 100644
> --- a/drivers/gpu/drm/drm_modes.c
> +++ b/drivers/gpu/drm/drm_modes.c
> @@ -1346,7 +1346,7 @@ void drm_mode_sort(struct list_head *mode_list)
> EXPORT_SYMBOL(drm_mode_sort);
>
> /**
> - * drm_mode_connector_list_update - update the mode list for the connector
> + * drm_connector_list_update - update the mode list for the connector
> * @connector: the connector to update
> *
> * This moves the modes from the @connector probed_modes list
> @@ -1356,7 +1356,7 @@ EXPORT_SYMBOL(drm_mode_sort);
> * This is just a helper functions doesn't validate any modes itself and also
> * doesn't prune any invalid modes. Callers need to do that themselves.
> */
> -void drm_mode_connector_list_update(struct drm_connector *connector)
> +void drm_connector_list_update(struct drm_connector *connector)
> {
> struct drm_display_mode *pmode, *pt;
>
> @@ -1405,7 +1405,7 @@ void drm_mode_connector_list_update(struct drm_connector *connector)
> }
> }
> }
> -EXPORT_SYMBOL(drm_mode_connector_list_update);
> +EXPORT_SYMBOL(drm_connector_list_update);
>
> /**
> * drm_mode_parse_command_line_for_connector - parse command line modeline for connector
> diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
> index 3470ca507df3..7666e4b37d44 100644
> --- a/drivers/gpu/drm/drm_probe_helper.c
> +++ b/drivers/gpu/drm/drm_probe_helper.c
> @@ -359,7 +359,7 @@ EXPORT_SYMBOL(drm_helper_probe_detect);
> * using the VESA GTF/CVT formulas.
> *
> * 3. Modes are moved from the probed_modes list to the modes list. Potential
> - * duplicates are merged together (see drm_mode_connector_list_update()).
> + * duplicates are merged together (see drm_connector_list_update()).
> * After this step the probed_modes list will be empty again.
> *
> * 4. Any non-stale mode on the modes list then undergoes validation
> @@ -484,7 +484,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
> if (count == 0)
> goto prune;
>
> - drm_mode_connector_list_update(connector);
> + drm_connector_list_update(connector);
>
> if (connector->interlace_allowed)
> mode_flags |= DRM_MODE_FLAG_INTERLACE;
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 2f3e92167c5f..10150ce859ad 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -6301,8 +6301,8 @@ static void intel_dp_modeset_retry_work_fn(struct work_struct *work)
> /* Set connector link status to BAD and send a Uevent to notify
> * userspace to do a modeset.
> */
> - drm_mode_connector_set_link_status_property(connector,
> - DRM_MODE_LINK_STATUS_BAD);
> + drm_connector_set_link_status_property(connector,
> + DRM_MODE_LINK_STATUS_BAD);
> mutex_unlock(&connector->dev->mode_config.mutex);
> /* Send Hotplug uevent so userspace can reprobe */
> drm_kms_helper_hotplug_event(connector->dev);
> diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
> index 494e5c40a464..7e3e01607643 100644
> --- a/drivers/gpu/drm/i915/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/intel_dp_mst.c
> @@ -474,7 +474,7 @@ static struct drm_connector *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
> drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
> drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
>
> - ret = drm_mode_connector_set_path_property(connector, pathprop);
> + ret = drm_connector_set_path_property(connector, pathprop);
> if (ret)
> goto err;
>
> diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> index 21e0dc51531d..d5006d6923e0 100644
> --- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
> +++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
> @@ -393,7 +393,7 @@ static int dsi_mgr_connector_get_modes(struct drm_connector *connector)
> ret = dsi_dual_connector_tile_init(connector, id);
> if (ret)
> return ret;
> - ret = drm_mode_connector_set_tile_property(connector);
> + ret = drm_connector_set_tile_property(connector);
> if (ret) {
> pr_err("%s: set tile property failed, %d\n",
> __func__, ret);
> diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> index 475456c19b76..5a247eb71899 100644
> --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> @@ -931,7 +931,7 @@ nv50_mstc_new(struct nv50_mstm *mstm, struct drm_dp_mst_port *port,
>
> drm_object_attach_property(&mstc->connector.base, dev->mode_config.path_property, 0);
> drm_object_attach_property(&mstc->connector.base, dev->mode_config.tile_property, 0);
> - drm_mode_connector_set_path_property(&mstc->connector, path);
> + drm_connector_set_path_property(&mstc->connector, path);
> return 0;
> }
>
> diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> index 37956cfc0b6d..f920be236cc9 100644
> --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
> +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> @@ -290,7 +290,7 @@ static struct drm_connector *radeon_dp_add_mst_connector(struct drm_dp_mst_topol
>
> drm_object_attach_property(&connector->base, dev->mode_config.path_property, 0);
> drm_object_attach_property(&connector->base, dev->mode_config.tile_property, 0);
> - drm_mode_connector_set_path_property(connector, pathprop);
> + drm_connector_set_path_property(connector, pathprop);
>
> return connector;
> }
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> index bc5fbd39cf9a..4a0f0f41afa1 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> @@ -2114,7 +2114,7 @@ int vmw_du_connector_fill_modes(struct drm_connector *connector,
> drm_mode_probed_add(connector, mode);
> }
>
> - drm_mode_connector_list_update(connector);
> + drm_connector_list_update(connector);
> /* Move the prefered mode first, help apps pick the right mode. */
> drm_mode_sort(&connector->modes);
>
> diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> index dfd7a3595a6c..012d2f2d1f88 100644
> --- a/include/drm/drm_connector.h
> +++ b/include/drm/drm_connector.h
> @@ -915,7 +915,7 @@ struct drm_connector {
> * @path_blob_ptr:
> *
> * DRM blob property data for the DP MST path property. This should only
> - * be updated by calling drm_mode_connector_set_path_property().
> + * be updated by calling drm_connector_set_path_property().
> */
> struct drm_property_blob *path_blob_ptr;
>
> @@ -1042,7 +1042,7 @@ struct drm_connector {
> * the tiling and virtualize both &drm_crtc and &drm_plane if needed.
> *
> * This should only be updated by calling
> - * drm_mode_connector_set_tile_property().
> + * drm_connector_set_tile_property().
> */
> struct drm_property_blob *tile_blob_ptr;
>
> @@ -1187,13 +1187,13 @@ void drm_hdmi_avi_infoframe_content_type(struct hdmi_avi_infoframe *frame,
>
> int drm_mode_create_suggested_offset_properties(struct drm_device *dev);
>
> -int drm_mode_connector_set_path_property(struct drm_connector *connector,
> - const char *path);
> -int drm_mode_connector_set_tile_property(struct drm_connector *connector);
> +int drm_connector_set_path_property(struct drm_connector *connector,
> + const char *path);
> +int drm_connector_set_tile_property(struct drm_connector *connector);
> int drm_connector_update_edid_property(struct drm_connector *connector,
> const struct edid *edid);
> -void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
> - uint64_t link_status);
> +void drm_connector_set_link_status_property(struct drm_connector *connector,
> + uint64_t link_status);
> int drm_connector_init_panel_orientation_property(
> struct drm_connector *connector, int width, int height);
>
> diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
> index b159fe07fcf9..baded6514456 100644
> --- a/include/drm/drm_modes.h
> +++ b/include/drm/drm_modes.h
> @@ -530,7 +530,7 @@ drm_mode_validate_ycbcr420(const struct drm_display_mode *mode,
> void drm_mode_prune_invalid(struct drm_device *dev,
> struct list_head *mode_list, bool verbose);
> void drm_mode_sort(struct list_head *mode_list);
> -void drm_mode_connector_list_update(struct drm_connector *connector);
> +void drm_connector_list_update(struct drm_connector *connector);
>
> /* parsing cmdline modes */
> bool
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 08/15] drm: Switch drm_plane_state to inline kerneldoc style
2018-07-09 8:40 ` [PATCH 08/15] drm: Switch drm_plane_state to inline kerneldoc style Daniel Vetter
@ 2018-07-13 15:08 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-13 15:08 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:09AM +0200, Daniel Vetter wrote:
> For consistency and to encourage more detailed documentation. While
> doing this also beefed up a few of the comments, linking at least to
> the setup function. Plus fixed all the hyperlinks.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> include/drm/drm_plane.h | 86 +++++++++++++++++++++++++++--------------
> 1 file changed, 56 insertions(+), 30 deletions(-)
>
> diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
> index cee9dfaaa740..1a647f8f5661 100644
> --- a/include/drm/drm_plane.h
> +++ b/include/drm/drm_plane.h
> @@ -34,31 +34,15 @@ struct drm_modeset_acquire_ctx;
>
> /**
> * struct drm_plane_state - mutable plane state
> - * @plane: backpointer to the plane
> - * @crtc_w: width of visible portion of plane on crtc
> - * @crtc_h: height of visible portion of plane on crtc
> - * @src_x: left position of visible portion of plane within
> - * plane (in 16.16)
> - * @src_y: upper position of visible portion of plane within
> - * plane (in 16.16)
> - * @src_w: width of visible portion of plane (in 16.16)
> - * @src_h: height of visible portion of plane (in 16.16)
> - * @alpha: opacity of the plane
> - * @rotation: rotation of the plane
> - * @zpos: priority of the given plane on crtc (optional)
> - * Note that multiple active planes on the same crtc can have an identical
> - * zpos value. The rule to solving the conflict is to compare the plane
> - * object IDs; the plane with a higher ID must be stacked on top of a
> - * plane with a lower ID.
> - * @normalized_zpos: normalized value of zpos: unique, range from 0 to N-1
> - * where N is the number of active planes for given crtc. Note that
> - * the driver must set drm_mode_config.normalize_zpos or call
> - * drm_atomic_normalize_zpos() to update this before it can be trusted.
> - * @src: clipped source coordinates of the plane (in 16.16)
> - * @dst: clipped destination coordinates of the plane
> - * @state: backpointer to global drm_atomic_state
> + *
> + * Please not that the destination coordinates @crtc_x, @crtc_y, @crtc_h and
> + * @crtc_w and the source coordinates @src_x, @src_y, @src_h and @src_w are the
> + * raw coordinates provided by userspace. Drivers should use
> + * drm_atomic_helper_check_plane_state() and only use the derived rectangles in
> + * @src and @dst to program the hardware.
> */
> struct drm_plane_state {
> + /** @plane: backpointer to the plane */
> struct drm_plane *plane;
>
> /**
> @@ -87,7 +71,7 @@ struct drm_plane_state {
> * preserved.
> *
> * Drivers should store any implicit fence in this from their
> - * &drm_plane_helper.prepare_fb callback. See drm_gem_fb_prepare_fb()
> + * &drm_plane_helper_funcs.prepare_fb callback. See drm_gem_fb_prepare_fb()
> * and drm_gem_fb_simple_display_pipe_prepare_fb() for suitable helpers.
> */
> struct dma_fence *fence;
> @@ -108,20 +92,60 @@ struct drm_plane_state {
> */
> int32_t crtc_y;
>
> + /** @crtc_w: width of visible portion of plane on crtc */
> + /** @crtc_h: height of visible portion of plane on crtc */
> uint32_t crtc_w, crtc_h;
>
> - /* Source values are 16.16 fixed point */
> - uint32_t src_x, src_y;
> + /**
> + * @src_x: left position of visible portion of plane within plane (in
> + * 16.16 fixed point).
> + */
> + uint32_t src_x;
> + /**
> + * @src_y: upper position of visible portion of plane within plane (in
> + * 16.16 fixed point).
> + */
> + uint32_t src_y;
> + /** @src_w: width of visible portion of plane (in 16.16) */
> + /** @src_h: height of visible portion of plane (in 16.16) */
> uint32_t src_h, src_w;
>
> - /* Plane opacity */
> + /**
> + * @alpha:
> + * Opacity of the plane with 0 as completely transparent and 0xffff as
> + * completely opaque. See drm_plane_create_alpha_property() for more
> + * details.
> + */
> u16 alpha;
>
> - /* Plane rotation */
> + /**
> + * @rotation:
> + * Rotation of the plane. See drm_plane_create_rotation_property() for
> + * more details.
> + */
> unsigned int rotation;
>
> - /* Plane zpos */
> + /**
> + * @zpos:
> + * Priority of the given plane on crtc (optional).
> + *
> + * Note that multiple active planes on the same crtc can have an
> + * identical zpos value. The rule to solving the conflict is to compare
> + * the plane object IDs; the plane with a higher ID must be stacked on
> + * top of a plane with a lower ID.
> + *
> + * See drm_plane_create_zpos_property() and
> + * drm_plane_create_zpos_immutable_property() for more details.
> + */
> unsigned int zpos;
> +
> + /**
> + * @normalized_zpos:
> + * Normalized value of zpos: unique, range from 0 to N-1 where N is the
> + * number of active planes for given crtc. Note that the driver must set
> + * &drm_mode_config.normalize_zpos or call drm_atomic_normalize_zpos() to
> + * update this before it can be trusted.
> + */
> unsigned int normalized_zpos;
>
> /**
> @@ -138,7 +162,8 @@ struct drm_plane_state {
> */
> enum drm_color_range color_range;
>
> - /* Clipped coordinates */
> + /** @src: clipped source coordinates of the plane (in 16.16) */
> + /** @dst: clipped destination coordinates of the plane */
> struct drm_rect src, dst;
>
> /**
> @@ -157,6 +182,7 @@ struct drm_plane_state {
> */
> struct drm_crtc_commit *commit;
>
> + /** @state: backpointer to global drm_atomic_state */
> struct drm_atomic_state *state;
> };
>
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 09/15] drm: switch drm_plane to inline comments
2018-07-09 8:40 ` [PATCH 09/15] drm: switch drm_plane to inline comments Daniel Vetter
@ 2018-07-13 15:20 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-13 15:20 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:10AM +0200, Daniel Vetter wrote:
> And use that opportunity to polish the kernel doc all around:
> - Beef up some of the documentation.
> - Intro text for drm_plane and better links
> - Fix all the hyperlinks!
>
> v2: Fix linebreaks.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> Documentation/gpu/drm-kms.rst | 11 +++--
> include/drm/drm_crtc.h | 4 +-
> include/drm/drm_plane.h | 88 +++++++++++++++++++++++++----------
> 3 files changed, 72 insertions(+), 31 deletions(-)
>
> diff --git a/Documentation/gpu/drm-kms.rst b/Documentation/gpu/drm-kms.rst
> index 58eed08fbe31..5dee6b8a4c12 100644
> --- a/Documentation/gpu/drm-kms.rst
> +++ b/Documentation/gpu/drm-kms.rst
> @@ -56,11 +56,12 @@ Overview
>
> The basic object structure KMS presents to userspace is fairly simple.
> Framebuffers (represented by :c:type:`struct drm_framebuffer <drm_framebuffer>`,
> -see `Frame Buffer Abstraction`_) feed into planes. One or more (or even no)
> -planes feed their pixel data into a CRTC (represented by :c:type:`struct
> -drm_crtc <drm_crtc>`, see `CRTC Abstraction`_) for blending. The precise
> -blending step is explained in more detail in `Plane Composition Properties`_ and
> -related chapters.
> +see `Frame Buffer Abstraction`_) feed into planes. Planes are represented by
> +:c:type:`struct drm_plane <drm_plane>`, see `Plane Abstraction`_ for more
> +details. One or more (or even no) planes feed their pixel data into a CRTC
> +(represented by :c:type:`struct drm_crtc <drm_crtc>`, see `CRTC Abstraction`_)
> +for blending. The precise blending step is explained in more detail in `Plane
> +Composition Properties`_ and related chapters.
>
> For the output routing the first step is encoders (represented by
> :c:type:`struct drm_encoder <drm_encoder>`, see `Encoder Abstraction`_). Those
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 23eddbccab10..5afe2deb76b7 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -942,8 +942,8 @@ static inline unsigned int drm_crtc_index(const struct drm_crtc *crtc)
> * drm_crtc_mask - find the mask of a registered CRTC
> * @crtc: CRTC to find mask for
> *
> - * Given a registered CRTC, return the mask bit of that CRTC for an
> - * encoder's possible_crtcs field.
> + * Given a registered CRTC, return the mask bit of that CRTC for the
> + * &drm_encoder.possible_crtcs and &drm_plane.possible_crtcs fields.
> */
> static inline uint32_t drm_crtc_mask(const struct drm_crtc *crtc)
> {
> diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
> index 1a647f8f5661..8a152dc16ea5 100644
> --- a/include/drm/drm_plane.h
> +++ b/include/drm/drm_plane.h
> @@ -525,30 +525,27 @@ enum drm_plane_type {
>
> /**
> * struct drm_plane - central DRM plane control structure
> - * @dev: DRM device this plane belongs to
> - * @head: for list management
> - * @name: human readable name, can be overwritten by the driver
> - * @base: base mode object
> - * @possible_crtcs: pipes this plane can be bound to
> - * @format_types: array of formats supported by this plane
> - * @format_count: number of formats supported
> - * @format_default: driver hasn't supplied supported formats for the plane
> - * @modifiers: array of modifiers supported by this plane
> - * @modifier_count: number of modifiers supported
> - * @old_fb: Temporary tracking of the old fb while a modeset is ongoing. Used by
> - * drm_mode_set_config_internal() to implement correct refcounting.
> - * @funcs: helper functions
> - * @properties: property tracking for this plane
> - * @type: type of plane (overlay, primary, cursor)
> - * @alpha_property: alpha property for this plane
> - * @zpos_property: zpos property for this plane
> - * @rotation_property: rotation property for this plane
> - * @helper_private: mid-layer private data
> + *
> + * Planes represent the scanout hardware of a display block. They receive their
> + * input data from a &drm_framebuffer and feed it to a &drm_crtc. Planes control
> + * the color conversion, see `Plane Composition Properties`_ for more details,
> + * and are also involved in the color conversion of input pixels, see `Color
> + * Management Properties`_ for details on that.
> */
> struct drm_plane {
> + /** @dev: DRM device this plane belongs to */
> struct drm_device *dev;
> +
> + /**
> + * @head:
> + *
> + * List of all planes on @dev, linked from &drm_mode_config.plane_list.
> + * Invariant over the lifetime of @dev and therefore does not need
> + * locking.
> + */
> struct list_head head;
>
> + /** @name: human readable name, can be overwritten by the driver */
> char *name;
>
> /**
> @@ -562,35 +559,62 @@ struct drm_plane {
> */
> struct drm_modeset_lock mutex;
>
> + /** @base: base mode object */
> struct drm_mode_object base;
>
> + /**
> + * @possible_crtcs: pipes this plane can be bound to constructed from
> + * drm_crtc_mask()
> + */
> uint32_t possible_crtcs;
> + /** @format_types: array of formats supported by this plane */
> uint32_t *format_types;
> + /** @format_count: Size of the array pointed at by @format_types. */
> unsigned int format_count;
> + /**
> + * @format_default: driver hasn't supplied supported formats for the
> + * plane. Used by the drm_plane_init compatibility wrapper only.
> + */
> bool format_default;
>
> + /** @modifiers: array of modifiers supported by this plane */
> uint64_t *modifiers;
> + /** @modifier_count: Size of the array pointed at by @modifier_count. */
> unsigned int modifier_count;
>
> /**
> - * @crtc: Currently bound CRTC, only really meaningful for non-atomic
> - * drivers. Atomic drivers should instead check &drm_plane_state.crtc.
> + * @crtc:
> + *
> + * Currently bound CRTC, only meaningful for non-atomic drivers. For
> + * atomic drivers this is forced to be NULL, atomic drivers should
> + * instead check &drm_plane_state.crtc.
> */
> struct drm_crtc *crtc;
>
> /**
> - * @fb: Currently bound framebuffer, only really meaningful for
> - * non-atomic drivers. Atomic drivers should instead check
> - * &drm_plane_state.fb.
> + * @fb:
> + *
> + * Currently bound framebuffer, only meaningful for non-atomic drivers.
> + * For atomic drivers this is forced to be NULL, atomic drivers should
> + * instead check &drm_plane_state.fb.
> */
> struct drm_framebuffer *fb;
>
> + /**
> + * @old_fb:
> + *
> + * Temporary tracking of the old fb while a modeset is ongoing. Only
> + * used by non-atomic drivers, forced to be NULL for atomic drivers.
> + */
> struct drm_framebuffer *old_fb;
>
> + /** @funcs: plane control functions */
> const struct drm_plane_funcs *funcs;
>
> + /** @properties: property tracking for this plane */
> struct drm_object_properties properties;
>
> + /** @type: Type of plane, see &enum drm_plane_type for details. */
> enum drm_plane_type type;
>
> /**
> @@ -599,6 +623,7 @@ struct drm_plane {
> */
> unsigned index;
>
> + /** @helper_private: mid-layer private data */
> const struct drm_plane_helper_funcs *helper_private;
>
> /**
> @@ -616,8 +641,23 @@ struct drm_plane {
> */
> struct drm_plane_state *state;
>
> + /**
> + * @alpha_property:
> + * Optional alpha property for this plane. See
> + * drm_plane_create_alpha_property().
> + */
> struct drm_property *alpha_property;
> + /**
> + * @zpos_property:
> + * Optional zpos property for this plane. See
> + * drm_plane_create_zpos_property().
> + */
> struct drm_property *zpos_property;
> + /**
> + * @rotation_property:
> + * Optional rotation property for this plane. See
> + * drm_plane_create_rotation_property().
> + */
> struct drm_property *rotation_property;
>
> /**
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 10/15] drm: drop drmP.h include from drm_plane.c
2018-07-09 8:40 ` [PATCH 10/15] drm: drop drmP.h include from drm_plane.c Daniel Vetter
@ 2018-07-13 15:22 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-13 15:22 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:11AM +0200, Daniel Vetter wrote:
> Just a bit of missing includes and pre declarations.
>
> Note: This needs the patch to move for_each_if from drmP.h to kernel.h
> or it won't compile.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> drivers/gpu/drm/drm_crtc_internal.h | 8 ++++++++
> drivers/gpu/drm/drm_plane.c | 11 ++++++++++-
> include/drm/drm_color_mgmt.h | 1 +
> include/drm/drm_plane.h | 2 ++
> include/drm/drm_property.h | 2 ++
> 5 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
> index b61322763394..ff5e0d521c21 100644
> --- a/drivers/gpu/drm/drm_crtc_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_internal.h
> @@ -31,6 +31,14 @@
> * and are not exported to drivers.
> */
>
> +enum drm_mode_status;
> +enum drm_connector_force;
> +
> +struct drm_display_mode;
> +struct work_struct;
> +struct drm_connector;
> +struct drm_bridge;
> +struct edid;
>
> /* drm_crtc.c */
> int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index df0b4ebbedbf..a26a1b6c8f6a 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -20,8 +20,17 @@
> * OF THIS SOFTWARE.
> */
>
> -#include <drm/drmP.h>
> +#include <linux/slab.h>
> +#include <linux/uaccess.h>
> +
> #include <drm/drm_plane.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_framebuffer.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_fourcc.h>
> +#include <drm/drm_vblank.h>
>
> #include "drm_crtc_internal.h"
>
> diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h
> index 44f04233e3db..90ef9996d9a4 100644
> --- a/include/drm/drm_color_mgmt.h
> +++ b/include/drm/drm_color_mgmt.h
> @@ -24,6 +24,7 @@
> #define __DRM_COLOR_MGMT_H__
>
> #include <linux/ctype.h>
> +#include <drm/drm_property.h>
>
> struct drm_crtc;
> struct drm_plane;
> diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
> index 8a152dc16ea5..311c31714c15 100644
> --- a/include/drm/drm_plane.h
> +++ b/include/drm/drm_plane.h
> @@ -27,6 +27,8 @@
> #include <linux/ctype.h>
> #include <drm/drm_mode_object.h>
> #include <drm/drm_color_mgmt.h>
> +#include <drm/drm_rect.h>
> +#include <drm/drm_modeset_lock.h>
>
> struct drm_crtc;
> struct drm_printer;
> diff --git a/include/drm/drm_property.h b/include/drm/drm_property.h
> index 1d5c0b2a8956..350fb58f819c 100644
> --- a/include/drm/drm_property.h
> +++ b/include/drm/drm_property.h
> @@ -27,6 +27,8 @@
> #include <linux/ctype.h>
> #include <drm/drm_mode_object.h>
>
> +#include <uapi/drm/drm_mode.h>
> +
> /**
> * struct drm_property_enum - symbolic values for enumerations
> * @value: numeric property value for this enum entry
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 11/15] drm/doc: move struct drm_crtc to in-line comments
2018-07-09 8:40 ` [PATCH 11/15] drm/doc: move struct drm_crtc to in-line comments Daniel Vetter
@ 2018-07-13 15:27 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-13 15:27 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:12AM +0200, Daniel Vetter wrote:
> And clean them up a bit, as usual.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> include/drm/drm_crtc.h | 126 +++++++++++++++++++++++++++++++----------
> 1 file changed, 97 insertions(+), 29 deletions(-)
>
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 5afe2deb76b7..0cfc098f31d3 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
/snip
> +
> + /**
> + * @gamma_store: Gamma ramp values used by the legacy SETGAMME and
SETGAMMA
> + * GET_GAMMA IOCTls. Set up by calling drm_mode_crtc_set_gamma_size().
GETGAMMA
With the nits fixed,
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> + */
> uint16_t *gamma_store;
>
> - /* if you are using the helper */
> + /** @helper_private: mid-layer private data */
> const struct drm_crtc_helper_funcs *helper_private;
>
> + /** @properties: property tracking for this CRTC */
> struct drm_object_properties properties;
>
> /**
> @@ -872,7 +941,6 @@ struct drm_crtc {
> *
> * spinlock to protect the fences in the fence_context.
> */
> -
> spinlock_t fence_lock;
> /**
> * @fence_seqno:
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 13/15] drm/doc: Includ drm_of.c helpers
2018-07-09 8:40 ` [PATCH 13/15] drm/doc: Includ drm_of.c helpers Daniel Vetter
@ 2018-07-13 15:28 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-13 15:28 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:14AM +0200, Daniel Vetter wrote:
> Fixes a dead link I spotted in the struct drm_crtc docs. Comments
> themselves are in a surprisingly good state.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
In subject, s/Includ/Include/. With that,
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> Documentation/gpu/drm-kms-helpers.rst | 9 +++++++++
> drivers/gpu/drm/drm_of.c | 9 ++++++++-
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-kms-helpers.rst
> index 8aece8605f4c..77e5398806a5 100644
> --- a/Documentation/gpu/drm-kms-helpers.rst
> +++ b/Documentation/gpu/drm-kms-helpers.rst
> @@ -291,6 +291,15 @@ Auxiliary Modeset Helpers
> .. kernel-doc:: drivers/gpu/drm/drm_modeset_helper.c
> :export:
>
> +OF/DT Helpers
> +=============
> +
> +.. kernel-doc:: drivers/gpu/drm/drm_of.c
> + :doc: overview
> +
> +.. kernel-doc:: drivers/gpu/drm/drm_of.c
> + :export:
> +
> Legacy Plane Helper Reference
> =============================
>
> diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c
> index 3b8c7a6a5720..e11f91244593 100644
> --- a/drivers/gpu/drm/drm_of.c
> +++ b/drivers/gpu/drm/drm_of.c
> @@ -9,6 +9,13 @@
> #include <drm/drm_panel.h>
> #include <drm/drm_of.h>
>
> +/**
> + * DOC: overview
> + *
> + * A set of helper functions to aid DRM drivers in parsing standard DT
> + * properties.
> + */
> +
> static void drm_release_of(struct device *dev, void *data)
> {
> of_node_put(data);
> @@ -94,7 +101,7 @@ EXPORT_SYMBOL_GPL(drm_of_component_match_add);
> * drm_of_component_probe - Generic probe function for a component based master
> * @dev: master device containing the OF node
> * @compare_of: compare function used for matching components
> - * @master_ops: component master ops to be used
> + * @m_ops: component master ops to be used
> *
> * Parse the platform device OF node and bind all the components associated
> * with the master. Interface ports are added before the encoders in order to
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 14/15] drm/doc: use inline kerneldoc style for drm_crtc_state
2018-07-09 8:40 ` [PATCH 14/15] drm/doc: use inline kerneldoc style for drm_crtc_state Daniel Vetter
@ 2018-07-13 15:33 ` Sean Paul
0 siblings, 0 replies; 33+ messages in thread
From: Sean Paul @ 2018-07-13 15:33 UTC (permalink / raw)
To: Daniel Vetter; +Cc: Daniel Vetter, DRI Development
On Mon, Jul 09, 2018 at 10:40:15AM +0200, Daniel Vetter wrote:
> Lots of added text here since I think the various control flow bits
> are worth explaining a bit better.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
The added docs surrounding enable/active will be most appreciated :-)
Reviewed-by: Sean Paul <seanpaul@chromium.org>
> ---
> include/drm/drm_crtc.h | 110 ++++++++++++++++++++++++++++++++---------
> 1 file changed, 86 insertions(+), 24 deletions(-)
>
> diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
> index 0cfc098f31d3..3788e1235e24 100644
> --- a/include/drm/drm_crtc.h
> +++ b/include/drm/drm_crtc.h
> @@ -77,21 +77,6 @@ struct drm_plane_helper_funcs;
>
> /**
> * struct drm_crtc_state - mutable CRTC state
> - * @crtc: backpointer to the CRTC
> - * @enable: whether the CRTC should be enabled, gates all other state
> - * @active: whether the CRTC is actively displaying (used for DPMS)
> - * @planes_changed: planes on this crtc are updated
> - * @mode_changed: @mode or @enable has been changed
> - * @active_changed: @active has been toggled.
> - * @connectors_changed: connectors to this crtc have been updated
> - * @zpos_changed: zpos values of planes on this crtc have been updated
> - * @color_mgmt_changed: color management properties have changed (degamma or
> - * gamma LUT or CSC matrix)
> - * @plane_mask: bitmask of (1 << drm_plane_index(plane)) of attached planes
> - * @connector_mask: bitmask of (1 << drm_connector_index(connector)) of attached connectors
> - * @encoder_mask: bitmask of (1 << drm_encoder_index(encoder)) of attached encoders
> - * @mode_blob: &drm_property_blob for @mode
> - * @state: backpointer to global drm_atomic_state
> *
> * Note that the distinction between @enable and @active is rather subtile:
> * Flipping @active while @enable is set without changing anything else may
> @@ -102,31 +87,104 @@ struct drm_plane_helper_funcs;
> *
> * The three booleans active_changed, connectors_changed and mode_changed are
> * intended to indicate whether a full modeset is needed, rather than strictly
> - * describing what has changed in a commit.
> - * See also: drm_atomic_crtc_needs_modeset()
> + * describing what has changed in a commit. See also:
> + * drm_atomic_crtc_needs_modeset()
> + *
> + * WARNING: Transitional helpers (like drm_helper_crtc_mode_set() or
> + * drm_helper_crtc_mode_set_base()) do not maintain many of the derived control
> + * state like @plane_mask so drivers not converted over to atomic helpers should
> + * not rely on these being accurate!
> */
> struct drm_crtc_state {
> + /** @crtc: backpointer to the CRTC */
> struct drm_crtc *crtc;
>
> + /**
> + * @enable: Whether the CRTC should be enabled, gates all other state.
> + * This controls reservations of shared resources. Actual hardware state
> + * is controlled by @active.
> + */
> bool enable;
> +
> + /**
> + * @active: Whether the CRTC is actively displaying (used for DPMS).
> + * Implies that @enable is set. The driver must not release any shared
> + * resources if @active is set to false but @enable still true, because
> + * userspace expects that a DPMS ON always succeeds.
> + *
> + * Hence drivers must not consult @active in their various
> + * &drm_mode_config_funcs.atomic_check callback to reject an atomic
> + * commit. They can consult it to aid in the computation of derived
> + * hardware state, since even in the DPMS OFF state the display hardware
> + * should be as much powered down as when the CRTC is completely
> + * disabled through setting @enable to false.
> + */
> bool active;
>
> - /* computed state bits used by helpers and drivers */
> + /**
> + * @planes_changed: Planes on this crtc are updated. Used by the atomic
> + * helpers and drivers to steer the atomic commit control flow.
> + */
> bool planes_changed : 1;
> +
> + /**
> + * @mode_changed: @mode or @enable has been changed. Used by the atomic
> + * helpers and drivers to steer the atomic commit control flow. See also
> + * drm_atomic_crtc_needs_modeset().
> + *
> + * Drivers are supposed to set this for any CRTC state changes that
> + * require a full modeset. They can also reset it to false if e.g. a
> + * @mode change can be done without a full modeset by only changing
> + * scaler settings.
> + */
> bool mode_changed : 1;
> +
> + /**
> + * @active_changed: @active has been toggled. Used by the atomic
> + * helpers and drivers to steer the atomic commit control flow. See also
> + * drm_atomic_crtc_needs_modeset().
> + */
> bool active_changed : 1;
> +
> + /**
> + * @connectors_changed: Connectors to this crtc have been updated,
> + * either in their state or routing. Used by the atomic
> + * helpers and drivers to steer the atomic commit control flow. See also
> + * drm_atomic_crtc_needs_modeset().
> + *
> + * Drivers are supposed to set this as-needed from their own atomic
> + * check code, e.g. from &drm_encoder_helper_funcs.atomic_check
> + */
> bool connectors_changed : 1;
> + /**
> + * @zpos_changed: zpos values of planes on this crtc have been updated.
> + * Used by the atomic helpers and drivers to steer the atomic commit
> + * control flow.
> + */
> bool zpos_changed : 1;
> + /**
> + * @color_mgmt_changed: Color management properties have changed
> + * (@gamma_lut, @degamma_lut or @ctm). Used by the atomic helpers and
> + * drivers to steer the atomic commit control flow.
> + */
> bool color_mgmt_changed : 1;
>
> - /* attached planes bitmask:
> - * WARNING: transitional helpers do not maintain plane_mask so
> - * drivers not converted over to atomic helpers should not rely
> - * on plane_mask being accurate!
> + /**
> + * @plane_mask: Bitmask of drm_plane_mask(plane) of planes attached to
> + * this CRTC.
> */
> u32 plane_mask;
>
> + /**
> + * @connector_mask: Bitmask of drm_connector_mask(connector) of
> + * connectors attached to this CRTC.
> + */
> u32 connector_mask;
> +
> + /**
> + * @encoder_mask: Bitmask of drm_encoder_mask(encoder) of encoders
> + * attached to this CRTC.
> + */
> u32 encoder_mask;
>
> /**
> @@ -136,7 +194,7 @@ struct drm_crtc_state {
> * differences between the mode requested by userspace in @mode and what
> * is actually programmed into the hardware.
> *
> - * For drivers using drm_bridge, this stores hardware display timings
> + * For drivers using &drm_bridge, this stores hardware display timings
> * used between the CRTC and the first bridge. For other drivers, the
> * meaning of the adjusted_mode field is purely driver implementation
> * defined information, and will usually be used to store the hardware
> @@ -161,7 +219,10 @@ struct drm_crtc_state {
> */
> struct drm_display_mode mode;
>
> - /* blob property to expose current mode to atomic userspace */
> + /**
> + * @mode_blob: &drm_property_blob for @mode, for exposing the mode to
> + * atomic userspace.
> + */
> struct drm_property_blob *mode_blob;
>
> /**
> @@ -265,6 +326,7 @@ struct drm_crtc_state {
> */
> struct drm_crtc_commit *commit;
>
> + /** @state: backpointer to global drm_atomic_state */
> struct drm_atomic_state *state;
> };
>
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 05/15] drm: drop _mode_ from update_edit_property()
2018-07-13 14:59 ` Sean Paul
@ 2018-07-13 16:05 ` Daniel Vetter
0 siblings, 0 replies; 33+ messages in thread
From: Daniel Vetter @ 2018-07-13 16:05 UTC (permalink / raw)
To: Sean Paul; +Cc: Daniel Vetter, DRI Development, Daniel Vetter
On Fri, Jul 13, 2018 at 10:59:06AM -0400, Sean Paul wrote:
> On Mon, Jul 09, 2018 at 10:40:06AM +0200, Daniel Vetter wrote:
> > 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.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 4 ++--
> > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++--
> > .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 ++--
> > drivers/gpu/drm/ast/ast_mode.c | 4 ++--
> > drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +-
> > drivers/gpu/drm/bridge/analogix-anx78xx.c | 4 ++--
> > drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 4 ++--
> > drivers/gpu/drm/bridge/dumb-vga-dac.c | 2 +-
> > drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 2 +-
> > drivers/gpu/drm/bridge/nxp-ptn3460.c | 2 +-
> > drivers/gpu/drm/bridge/sii902x.c | 2 +-
> > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +-
> > drivers/gpu/drm/bridge/tc358767.c | 2 +-
> > drivers/gpu/drm/bridge/ti-tfp410.c | 2 +-
> > drivers/gpu/drm/drm_connector.c | 8 ++++----
> > drivers/gpu/drm/drm_debugfs.c | 4 ++--
> > drivers/gpu/drm/drm_probe_helper.c | 2 +-
> > drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +-
> > drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +-
> > drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
> > drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +-
> > drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +-
> > drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +-
> > drivers/gpu/drm/gma500/psb_intel_modes.c | 2 +-
> > drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 +-
> > drivers/gpu/drm/i2c/tda998x_drv.c | 2 +-
> > drivers/gpu/drm/i915/intel_dp.c | 2 +-
> > drivers/gpu/drm/i915/intel_lvds.c | 2 +-
> > drivers/gpu/drm/i915/intel_modes.c | 2 +-
> > drivers/gpu/drm/i915/intel_sdvo.c | 2 +-
> > drivers/gpu/drm/imx/imx-ldb.c | 2 +-
> > drivers/gpu/drm/imx/imx-tve.c | 2 +-
> > drivers/gpu/drm/imx/parallel-display.c | 2 +-
> > drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +-
> > drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +-
> > drivers/gpu/drm/msm/edp/edp_connector.c | 2 +-
> > drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 2 +-
> > drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
> > drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
> > drivers/gpu/drm/omapdrm/omap_connector.c | 4 ++--
> > drivers/gpu/drm/panel/panel-simple.c | 2 +-
> > drivers/gpu/drm/radeon/radeon_connectors.c | 4 ++--
> > drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 ++--
> > drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +-
> > drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +-
> > drivers/gpu/drm/sti/sti_hdmi.c | 2 +-
> > drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +-
> > drivers/gpu/drm/tegra/output.c | 2 +-
> > drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 +-
> > drivers/gpu/drm/udl/udl_connector.c | 2 +-
> > drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +-
> > drivers/gpu/drm/zte/zx_hdmi.c | 2 +-
> > drivers/gpu/drm/zte/zx_vga.c | 2 +-
> > drivers/staging/vboxvideo/vbox_mode.c | 2 +-
>
> Is this any closer to graduating from staging? From a glance at the history, it
> doesn't seem like it's moved closer in a very long time.
I fear -staging's idea of "long time" and our idea of "long time" do not
match :-)
But yeah I'm also not seeing how putting a drm driver into staging is
helping it getting merged properly. The drivers floating on dri-devel imo
get a lot more attention than anything stuck in staging ghetto.
-Daniel
>
> Anyways,
>
> Reviewed-by: Sean Paul <seanpaul@chromium.org>
>
>
> > include/drm/drm_connector.h | 6 +++---
> > include/drm/drm_modeset_helper_vtables.h | 2 +-
> > 56 files changed, 74 insertions(+), 74 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> > index 881f7cb7ae6e..c770d73352a7 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
> > @@ -334,11 +334,11 @@ static int amdgpu_connector_ddc_get_modes(struct drm_connector *connector)
> > int ret;
> >
> > if (amdgpu_connector->edid) {
> > - drm_mode_connector_update_edid_property(connector, amdgpu_connector->edid);
> > + drm_connector_update_edid_property(connector, amdgpu_connector->edid);
> > ret = drm_add_edid_modes(connector, amdgpu_connector->edid);
> > return ret;
> > }
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > return 0;
> > }
> >
> > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > index f0fc3067ab5d..b93fa4b3841f 100644
> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> > @@ -900,14 +900,14 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector)
> > (struct edid *) sink->dc_edid.raw_edid;
> >
> >
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > aconnector->edid);
> > }
> > amdgpu_dm_add_sink_to_freesync_module(connector, aconnector->edid);
> >
> > } else {
> > amdgpu_dm_remove_sink_from_freesync_module(connector);
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > aconnector->num_modes = 0;
> > aconnector->dc_sink = NULL;
> > aconnector->edid = NULL;
> > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> > index 4304d9e408b8..581bb75d08eb 100644
> > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c
> > @@ -233,7 +233,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
> > edid = drm_dp_mst_get_edid(connector, &aconnector->mst_port->mst_mgr, aconnector->port);
> >
> > if (!edid) {
> > - drm_mode_connector_update_edid_property(
> > + drm_connector_update_edid_property(
> > &aconnector->base,
> > NULL);
> > return ret;
> > @@ -261,7 +261,7 @@ static int dm_dp_mst_get_modes(struct drm_connector *connector)
> > connector, aconnector->edid);
> > }
> >
> > - drm_mode_connector_update_edid_property(
> > + drm_connector_update_edid_property(
> > &aconnector->base, aconnector->edid);
> >
> > ret = drm_add_edid_modes(connector, aconnector->edid);
> > diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c
> > index 036dff8a1f33..1bb8174ad155 100644
> > --- a/drivers/gpu/drm/ast/ast_mode.c
> > +++ b/drivers/gpu/drm/ast/ast_mode.c
> > @@ -790,12 +790,12 @@ static int ast_get_modes(struct drm_connector *connector)
> > if (!flags)
> > edid = drm_get_edid(connector, &ast_connector->i2c->adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(&ast_connector->base, edid);
> > + drm_connector_update_edid_property(&ast_connector->base, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > return ret;
> > } else
> > - drm_mode_connector_update_edid_property(&ast_connector->base, NULL);
> > + drm_connector_update_edid_property(&ast_connector->base, NULL);
> > return 0;
> > }
> >
> > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > index 73021b388e12..1f4745953aca 100644
> > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > @@ -601,7 +601,7 @@ static int adv7511_get_modes(struct adv7511 *adv7511,
> > __adv7511_power_off(adv7511);
> >
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > count = drm_add_edid_modes(connector, edid);
> >
> > adv7511_set_config_csc(adv7511, connector, adv7511->rgb,
> > diff --git a/drivers/gpu/drm/bridge/analogix-anx78xx.c b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> > index b49043866be6..37f947dcadec 100644
> > --- a/drivers/gpu/drm/bridge/analogix-anx78xx.c
> > +++ b/drivers/gpu/drm/bridge/analogix-anx78xx.c
> > @@ -969,8 +969,8 @@ static int anx78xx_get_modes(struct drm_connector *connector)
> > goto unlock;
> > }
> >
> > - err = drm_mode_connector_update_edid_property(connector,
> > - anx78xx->edid);
> > + err = drm_connector_update_edid_property(connector,
> > + anx78xx->edid);
> > if (err) {
> > DRM_ERROR("Failed to update EDID property: %d\n", err);
> > goto unlock;
> > diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> > index 2bcbfadb6ac5..288c015f7460 100644
> > --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> > +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> > @@ -1119,8 +1119,8 @@ static int analogix_dp_get_modes(struct drm_connector *connector)
> > edid = drm_get_edid(connector, &dp->aux.ddc);
> > pm_runtime_put(dp->dev);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(&dp->connector,
> > - edid);
> > + drm_connector_update_edid_property(&dp->connector,
> > + edid);
> > num_modes += drm_add_edid_modes(&dp->connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> > index 9837c8d69e69..da99b8ba4ee1 100644
> > --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c
> > +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c
> > @@ -55,7 +55,7 @@ static int dumb_vga_get_modes(struct drm_connector *connector)
> > goto fallback;
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > return ret;
> > diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> > index 7ccadba7c98c..b49b543bd1f6 100644
> > --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> > +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
> > @@ -152,7 +152,7 @@ static int ge_b850v3_lvds_get_modes(struct drm_connector *connector)
> > ge_b850v3_lvds_ptr->edid = (struct edid *)stdp2690_get_edid(client);
> >
> > if (ge_b850v3_lvds_ptr->edid) {
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > ge_b850v3_lvds_ptr->edid);
> > num_modes = drm_add_edid_modes(connector,
> > ge_b850v3_lvds_ptr->edid);
> > diff --git a/drivers/gpu/drm/bridge/nxp-ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> > index d64a3283822a..bd5c191858cb 100644
> > --- a/drivers/gpu/drm/bridge/nxp-ptn3460.c
> > +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c
> > @@ -222,7 +222,7 @@ static int ptn3460_get_modes(struct drm_connector *connector)
> > }
> >
> > ptn_bridge->edid = (struct edid *)edid;
> > - drm_mode_connector_update_edid_property(connector, ptn_bridge->edid);
> > + drm_connector_update_edid_property(connector, ptn_bridge->edid);
> >
> > num_modes = drm_add_edid_modes(connector, ptn_bridge->edid);
> >
> > diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
> > index 60373d7eb220..cd331933c230 100644
> > --- a/drivers/gpu/drm/bridge/sii902x.c
> > +++ b/drivers/gpu/drm/bridge/sii902x.c
> > @@ -170,7 +170,7 @@ static int sii902x_get_modes(struct drm_connector *connector)
> > return ret;
> >
> > edid = drm_get_edid(connector, sii902x->i2c->adapter);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > if (edid) {
> > num = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > index 3c136f2b954f..ab32aceb6f24 100644
> > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
> > @@ -1922,7 +1922,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector)
> >
> > hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> > hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c
> > index 0fd9cf27542c..ee2fd0a349b3 100644
> > --- a/drivers/gpu/drm/bridge/tc358767.c
> > +++ b/drivers/gpu/drm/bridge/tc358767.c
> > @@ -1140,7 +1140,7 @@ static int tc_connector_get_modes(struct drm_connector *connector)
> > if (!edid)
> > return 0;
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > count = drm_add_edid_modes(connector, edid);
> >
> > return count;
> > diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
> > index acb857030951..c81bf7910bbe 100644
> > --- a/drivers/gpu/drm/bridge/ti-tfp410.c
> > +++ b/drivers/gpu/drm/bridge/ti-tfp410.c
> > @@ -62,7 +62,7 @@ static int tfp410_get_modes(struct drm_connector *connector)
> > goto fallback;
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > return drm_add_edid_modes(connector, edid);
> > fallback:
> > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
> > index dc5a480200d8..ccb70a4490d3 100644
> > --- a/drivers/gpu/drm/drm_connector.c
> > +++ b/drivers/gpu/drm/drm_connector.c
> > @@ -818,7 +818,7 @@ DRM_ENUM_NAME_FN(drm_get_content_protection_name, drm_cp_enum_list)
> > * Blob property which contains the current EDID read from the sink. This
> > * is useful to parse sink identification information like vendor, model
> > * and serial. Drivers should update this property by calling
> > - * drm_mode_connector_update_edid_property(), usually after having parsed
> > + * drm_connector_update_edid_property(), usually after having parsed
> > * the EDID using drm_add_edid_modes(). Userspace cannot change this
> > * property.
> > * DPMS:
> > @@ -1501,7 +1501,7 @@ int drm_mode_connector_set_tile_property(struct drm_connector *connector)
> > EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
> >
> > /**
> > - * drm_mode_connector_update_edid_property - update the edid property of a connector
> > + * drm_connector_update_edid_property - update the edid property of a connector
> > * @connector: drm connector
> > * @edid: new value of the edid property
> > *
> > @@ -1511,7 +1511,7 @@ EXPORT_SYMBOL(drm_mode_connector_set_tile_property);
> > * Returns:
> > * Zero on success, negative errno on failure.
> > */
> > -int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> > +int drm_connector_update_edid_property(struct drm_connector *connector,
> > const struct edid *edid)
> > {
> > struct drm_device *dev = connector->dev;
> > @@ -1550,7 +1550,7 @@ int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> > dev->mode_config.edid_property);
> > return ret;
> > }
> > -EXPORT_SYMBOL(drm_mode_connector_update_edid_property);
> > +EXPORT_SYMBOL(drm_connector_update_edid_property);
> >
> > /**
> > * drm_mode_connector_set_link_status_property - Set link status property of a connector
> > diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
> > index b2482818fee8..df8ca4548f9f 100644
> > --- a/drivers/gpu/drm/drm_debugfs.c
> > +++ b/drivers/gpu/drm/drm_debugfs.c
> > @@ -307,13 +307,13 @@ static ssize_t edid_write(struct file *file, const char __user *ubuf,
> >
> > if (len == 5 && !strncmp(buf, "reset", 5)) {
> > connector->override_edid = false;
> > - ret = drm_mode_connector_update_edid_property(connector, NULL);
> > + ret = drm_connector_update_edid_property(connector, NULL);
> > } else if (len < EDID_LENGTH ||
> > EDID_LENGTH * (1 + edid->extensions) > len)
> > ret = -EINVAL;
> > else {
> > connector->override_edid = false;
> > - ret = drm_mode_connector_update_edid_property(connector, edid);
> > + ret = drm_connector_update_edid_property(connector, edid);
> > if (!ret)
> > connector->override_edid = true;
> > }
> > diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
> > index 1a901fe9e23e..3470ca507df3 100644
> > --- a/drivers/gpu/drm/drm_probe_helper.c
> > +++ b/drivers/gpu/drm/drm_probe_helper.c
> > @@ -471,7 +471,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector,
> > if (connector->status == connector_status_disconnected) {
> > DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",
> > connector->base.id, connector->name);
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > verbose_prune = false;
> > goto prune;
> > }
> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> > index e6b0940b1ac2..dfea61edba4a 100644
> > --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
> > @@ -319,7 +319,7 @@ static int vidi_get_modes(struct drm_connector *connector)
> > return -ENOMEM;
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > return drm_add_edid_modes(connector, edid);
> > }
> > diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c
> > index db91932550cf..6672d0ff0423 100644
> > --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
> > +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
> > @@ -888,7 +888,7 @@ static int hdmi_get_modes(struct drm_connector *connector)
> > (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),
> > edid->width_cm, edid->height_cm);
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > cec_notifier_set_phys_addr_from_edid(hdata->notifier, edid);
> >
> > ret = drm_add_edid_modes(connector, edid);
> > diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
> > index 5ea785f07ba8..90ed20083009 100644
> > --- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
> > +++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
> > @@ -1770,7 +1770,7 @@ static int cdv_intel_dp_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, &intel_dp->adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
> > index f0878998526a..4e4e4a66eaee 100644
> > --- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
> > +++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
> > @@ -216,7 +216,7 @@ static int cdv_hdmi_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, &gma_encoder->i2c_bus->adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/gma500/oaktrail_hdmi.c b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
> > index 78566a80ad25..c6d72de1c054 100644
> > --- a/drivers/gpu/drm/gma500/oaktrail_hdmi.c
> > +++ b/drivers/gpu/drm/gma500/oaktrail_hdmi.c
> > @@ -578,7 +578,7 @@ static int oaktrail_hdmi_get_modes(struct drm_connector *connector)
> > }
> >
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > }
> > return ret;
> > diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c
> > index e6943fef0611..83babb815a5d 100644
> > --- a/drivers/gpu/drm/gma500/oaktrail_lvds.c
> > +++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c
> > @@ -376,7 +376,7 @@ void oaktrail_lvds_init(struct drm_device *dev,
> > * preferred mode is the right one.
> > */
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > drm_add_edid_modes(connector, edid);
> > kfree(edid);
> >
> > diff --git a/drivers/gpu/drm/gma500/psb_intel_modes.c b/drivers/gpu/drm/gma500/psb_intel_modes.c
> > index e5360726d80b..fb4da3cd6681 100644
> > --- a/drivers/gpu/drm/gma500/psb_intel_modes.c
> > +++ b/drivers/gpu/drm/gma500/psb_intel_modes.c
> > @@ -66,7 +66,7 @@ int psb_intel_ddc_get_modes(struct drm_connector *connector,
> >
> > edid = drm_get_edid(connector, adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
> > index 1d40746ab625..dd3cec0e3190 100644
> > --- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
> > +++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
> > @@ -1472,7 +1472,7 @@ static void psb_intel_sdvo_get_ddc_modes(struct drm_connector *connector)
> > bool connector_is_digital = !!IS_TMDS(psb_intel_sdvo_connector);
> >
> > if (connector_is_digital == monitor_is_digital) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > drm_add_edid_modes(connector, edid);
> > }
> >
> > diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c
> > index 0038c976536a..d434f576e6b2 100644
> > --- a/drivers/gpu/drm/i2c/tda998x_drv.c
> > +++ b/drivers/gpu/drm/i2c/tda998x_drv.c
> > @@ -1243,7 +1243,7 @@ static int tda998x_connector_get_modes(struct drm_connector *connector)
> > return 0;
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > n = drm_add_edid_modes(connector, edid);
> >
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> > index 5be07e1d816d..2f3e92167c5f 100644
> > --- a/drivers/gpu/drm/i915/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/intel_dp.c
> > @@ -6212,7 +6212,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
> > edid = drm_get_edid(connector, &intel_dp->aux.ddc);
> > if (edid) {
> > if (drm_add_edid_modes(connector, edid)) {
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > edid);
> > } else {
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> > index bb06744d28a4..ca55b0a82ba6 100644
> > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > +++ b/drivers/gpu/drm/i915/intel_lvds.c
> > @@ -1131,7 +1131,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
> > intel_gmbus_get_adapter(dev_priv, pin));
> > if (edid) {
> > if (drm_add_edid_modes(connector, edid)) {
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > edid);
> > } else {
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c
> > index b39846613e3c..ca44bf368e24 100644
> > --- a/drivers/gpu/drm/i915/intel_modes.c
> > +++ b/drivers/gpu/drm/i915/intel_modes.c
> > @@ -40,7 +40,7 @@ int intel_connector_update_modes(struct drm_connector *connector,
> > {
> > int ret;
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> >
> > return ret;
> > diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> > index 396cb59ca4b8..812fe7b06f87 100644
> > --- a/drivers/gpu/drm/i915/intel_sdvo.c
> > +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> > @@ -1911,7 +1911,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
> > if (edid != NULL) {
> > if (intel_sdvo_connector_matches_edid(to_intel_sdvo_connector(connector),
> > edid)) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > drm_add_edid_modes(connector, edid);
> > }
> >
> > diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c
> > index 56dd7a9a8e25..ae81cbb75f51 100644
> > --- a/drivers/gpu/drm/imx/imx-ldb.c
> > +++ b/drivers/gpu/drm/imx/imx-ldb.c
> > @@ -143,7 +143,7 @@ static int imx_ldb_connector_get_modes(struct drm_connector *connector)
> > imx_ldb_ch->edid = drm_get_edid(connector, imx_ldb_ch->ddc);
> >
> > if (imx_ldb_ch->edid) {
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > imx_ldb_ch->edid);
> > num_modes = drm_add_edid_modes(connector, imx_ldb_ch->edid);
> > }
> > diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c
> > index bc27c2699464..1a4ced5c09b5 100644
> > --- a/drivers/gpu/drm/imx/imx-tve.c
> > +++ b/drivers/gpu/drm/imx/imx-tve.c
> > @@ -235,7 +235,7 @@ static int imx_tve_connector_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, tve->ddc);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c
> > index aedecda9728a..4fc1cf583435 100644
> > --- a/drivers/gpu/drm/imx/parallel-display.c
> > +++ b/drivers/gpu/drm/imx/parallel-display.c
> > @@ -63,7 +63,7 @@ static int imx_pd_connector_get_modes(struct drm_connector *connector)
> > }
> >
> > if (imxpd->edid) {
> > - drm_mode_connector_update_edid_property(connector, imxpd->edid);
> > + drm_connector_update_edid_property(connector, imxpd->edid);
> > num_modes = drm_add_edid_modes(connector, imxpd->edid);
> > }
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> > index 59a11026dceb..835313940395 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
> > @@ -1220,7 +1220,7 @@ static int mtk_hdmi_conn_get_modes(struct drm_connector *conn)
> >
> > hdmi->dvi_mode = !drm_detect_monitor_audio(edid);
> >
> > - drm_mode_connector_update_edid_property(conn, edid);
> > + drm_connector_update_edid_property(conn, edid);
> >
> > ret = drm_add_edid_modes(conn, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c
> > index 8918539a19aa..5f104f139197 100644
> > --- a/drivers/gpu/drm/mgag200/mgag200_mode.c
> > +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c
> > @@ -1553,7 +1553,7 @@ static int mga_vga_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, &mga_connector->i2c->adapter);
> > if (edid) {
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/msm/edp/edp_connector.c b/drivers/gpu/drm/msm/edp/edp_connector.c
> > index 6f3fc6b0f0a3..0b5eac054195 100644
> > --- a/drivers/gpu/drm/msm/edp/edp_connector.c
> > +++ b/drivers/gpu/drm/msm/edp/edp_connector.c
> > @@ -56,7 +56,7 @@ static int edp_connector_get_modes(struct drm_connector *connector)
> > if (ret)
> > return ret;
> >
> > - drm_mode_connector_update_edid_property(connector, drm_edid);
> > + drm_connector_update_edid_property(connector, drm_edid);
> > if (drm_edid)
> > ret = drm_add_edid_modes(connector, drm_edid);
> >
> > diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> > index c0848dfedd50..07feacc5a441 100644
> > --- a/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> > +++ b/drivers/gpu/drm/msm/hdmi/hdmi_connector.c
> > @@ -392,7 +392,7 @@ static int msm_hdmi_connector_get_modes(struct drm_connector *connector)
> > hdmi_write(hdmi, REG_HDMI_CTRL, hdmi_ctrl);
> >
> > hdmi->hdmi_mode = drm_detect_hdmi_monitor(edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > if (edid) {
> > ret = drm_add_edid_modes(connector, edid);
> > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > index b83465ae7c1b..2fabb69e452b 100644
> > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
> > @@ -850,7 +850,7 @@ nv50_mstc_get_modes(struct drm_connector *connector)
> > int ret = 0;
> >
> > mstc->edid = drm_dp_mst_get_edid(&mstc->connector, mstc->port->mgr, mstc->port);
> > - drm_mode_connector_update_edid_property(&mstc->connector, mstc->edid);
> > + drm_connector_update_edid_property(&mstc->connector, mstc->edid);
> > if (mstc->edid)
> > ret = drm_add_edid_modes(&mstc->connector, mstc->edid);
> >
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
> > index bb46c1d489cf..22a15478d23d 100644
> > --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> > +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> > @@ -550,7 +550,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
> >
> > /* Cleanup the previous EDID block. */
> > if (nv_connector->edid) {
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > kfree(nv_connector->edid);
> > nv_connector->edid = NULL;
> > }
> > @@ -575,7 +575,7 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
> > else
> > nv_connector->edid = drm_get_edid(connector, i2c);
> >
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > nv_connector->edid);
> > if (!nv_connector->edid) {
> > NV_ERROR(drm, "DDC responded, but no EDID for %s\n",
> > @@ -657,7 +657,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
> >
> > /* Cleanup the previous EDID block. */
> > if (nv_connector->edid) {
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > kfree(nv_connector->edid);
> > nv_connector->edid = NULL;
> > }
> > @@ -721,7 +721,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
> > status = connector_status_unknown;
> > #endif
> >
> > - drm_mode_connector_update_edid_property(connector, nv_connector->edid);
> > + drm_connector_update_edid_property(connector, nv_connector->edid);
> > nouveau_connector_set_encoder(connector, nv_encoder);
> > return status;
> > }
> > diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
> > index 5cde26ac937b..2ddb856666c4 100644
> > --- a/drivers/gpu/drm/omapdrm/omap_connector.c
> > +++ b/drivers/gpu/drm/omapdrm/omap_connector.c
> > @@ -126,14 +126,14 @@ static int omap_connector_get_modes(struct drm_connector *connector)
> >
> > if ((dssdrv->read_edid(dssdev, edid, MAX_EDID) > 0) &&
> > drm_edid_is_valid(edid)) {
> > - drm_mode_connector_update_edid_property(
> > + drm_connector_update_edid_property(
> > connector, edid);
> > n = drm_add_edid_modes(connector, edid);
> >
> > omap_connector->hdmi_mode =
> > drm_detect_hdmi_monitor(edid);
> > } else {
> > - drm_mode_connector_update_edid_property(
> > + drm_connector_update_edid_property(
> > connector, NULL);
> > }
> >
> > diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c
> > index ac6aaa174c0b..3c229d134359 100644
> > --- a/drivers/gpu/drm/panel/panel-simple.c
> > +++ b/drivers/gpu/drm/panel/panel-simple.c
> > @@ -252,7 +252,7 @@ static int panel_simple_get_modes(struct drm_panel *panel)
> > /* probe EDID if a DDC bus is available */
> > if (p->ddc) {
> > struct edid *edid = drm_get_edid(panel->connector, p->ddc);
> > - drm_mode_connector_update_edid_property(panel->connector, edid);
> > + drm_connector_update_edid_property(panel->connector, edid);
> > if (edid) {
> > num += drm_add_edid_modes(panel->connector, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
> > index 0655698f2956..414642e5b7a3 100644
> > --- a/drivers/gpu/drm/radeon/radeon_connectors.c
> > +++ b/drivers/gpu/drm/radeon/radeon_connectors.c
> > @@ -368,11 +368,11 @@ static int radeon_ddc_get_modes(struct drm_connector *connector)
> > int ret;
> >
> > if (radeon_connector->edid) {
> > - drm_mode_connector_update_edid_property(connector, radeon_connector->edid);
> > + drm_connector_update_edid_property(connector, radeon_connector->edid);
> > ret = drm_add_edid_modes(connector, radeon_connector->edid);
> > return ret;
> > }
> > - drm_mode_connector_update_edid_property(connector, NULL);
> > + drm_connector_update_edid_property(connector, NULL);
> > return 0;
> > }
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> > index cd8a3ee16649..37956cfc0b6d 100644
> > --- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
> > +++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
> > @@ -195,11 +195,11 @@ static int radeon_dp_mst_get_ddc_modes(struct drm_connector *connector)
> > radeon_connector->edid = edid;
> > DRM_DEBUG_KMS("edid retrieved %p\n", edid);
> > if (radeon_connector->edid) {
> > - drm_mode_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
> > + drm_connector_update_edid_property(&radeon_connector->base, radeon_connector->edid);
> > ret = drm_add_edid_modes(&radeon_connector->base, radeon_connector->edid);
> > return ret;
> > }
> > - drm_mode_connector_update_edid_property(&radeon_connector->base, NULL);
> > + drm_connector_update_edid_property(&radeon_connector->base, NULL);
> >
> > return ret;
> > }
> > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > index c6fbdcd87c16..a40cb2be50e1 100644
> > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
> > @@ -275,7 +275,7 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector)
> > dp->sink_has_audio = drm_detect_monitor_audio(edid);
> > ret = drm_add_edid_modes(connector, edid);
> > if (ret)
> > - drm_mode_connector_update_edid_property(connector,
> > + drm_connector_update_edid_property(connector,
> > edid);
> > }
> > mutex_unlock(&dp->lock);
> > diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
> > index 88d0774c97bd..510fcb33e31d 100644
> > --- a/drivers/gpu/drm/rockchip/inno_hdmi.c
> > +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
> > @@ -565,7 +565,7 @@ static int inno_hdmi_connector_get_modes(struct drm_connector *connector)
> > if (edid) {
> > hdmi->hdmi_data.sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> > hdmi->hdmi_data.sink_has_audio = drm_detect_monitor_audio(edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > }
> > diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c
> > index 58f431102512..0c3008356ab8 100644
> > --- a/drivers/gpu/drm/sti/sti_hdmi.c
> > +++ b/drivers/gpu/drm/sti/sti_hdmi.c
> > @@ -977,7 +977,7 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector)
> > cec_notifier_set_phys_addr_from_edid(hdmi->notifier, edid);
> >
> > count = drm_add_edid_modes(connector, edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > kfree(edid);
> > return count;
> > diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> > index fa4bcd092eaf..9b4b1d015423 100644
> > --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> > +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c
> > @@ -220,7 +220,7 @@ static int sun4i_hdmi_get_modes(struct drm_connector *connector)
> > DRM_DEBUG_DRIVER("Monitor is %s monitor\n",
> > hdmi->hdmi_monitor ? "an HDMI" : "a DVI");
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > cec_s_phys_addr_from_edid(hdmi->cec_adap, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> > diff --git a/drivers/gpu/drm/tegra/output.c b/drivers/gpu/drm/tegra/output.c
> > index ffe34bd0bb9d..983657c47067 100644
> > --- a/drivers/gpu/drm/tegra/output.c
> > +++ b/drivers/gpu/drm/tegra/output.c
> > @@ -37,7 +37,7 @@ int tegra_output_connector_get_modes(struct drm_connector *connector)
> > edid = drm_get_edid(connector, output->ddc);
> >
> > cec_notifier_set_phys_addr_from_edid(output->notifier, edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > if (edid) {
> > err = drm_add_edid_modes(connector, edid);
> > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> > index c45cabb38db0..46dacca3cce8 100644
> > --- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> > +++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
> > @@ -173,7 +173,7 @@ static int tfp410_connector_get_modes(struct drm_connector *connector)
> >
> > edid = drm_get_edid(connector, tfp410_connector->mod->i2c);
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> >
> > if (edid) {
> > ret = drm_add_edid_modes(connector, edid);
> > diff --git a/drivers/gpu/drm/udl/udl_connector.c b/drivers/gpu/drm/udl/udl_connector.c
> > index 09dc585aa46f..8fac12e1a1a4 100644
> > --- a/drivers/gpu/drm/udl/udl_connector.c
> > +++ b/drivers/gpu/drm/udl/udl_connector.c
> > @@ -99,7 +99,7 @@ static int udl_get_modes(struct drm_connector *connector)
> > struct udl_drm_connector,
> > connector);
> >
> > - drm_mode_connector_update_edid_property(connector, udl_connector->edid);
> > + drm_connector_update_edid_property(connector, udl_connector->edid);
> > if (udl_connector->edid)
> > return drm_add_edid_modes(connector, udl_connector->edid);
> > return 0;
> > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
> > index b8d50533e2bb..91f284e1b908 100644
> > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> > @@ -285,7 +285,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
> > drm_rgb_quant_range_selectable(edid);
> > }
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> >
> > diff --git a/drivers/gpu/drm/zte/zx_hdmi.c b/drivers/gpu/drm/zte/zx_hdmi.c
> > index 13ea90f7a185..d073c6737500 100644
> > --- a/drivers/gpu/drm/zte/zx_hdmi.c
> > +++ b/drivers/gpu/drm/zte/zx_hdmi.c
> > @@ -272,7 +272,7 @@ static int zx_hdmi_connector_get_modes(struct drm_connector *connector)
> >
> > hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid);
> > hdmi->sink_has_audio = drm_detect_monitor_audio(edid);
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> >
> > diff --git a/drivers/gpu/drm/zte/zx_vga.c b/drivers/gpu/drm/zte/zx_vga.c
> > index 3e7e33cd3dfa..3e78ee21b8d0 100644
> > --- a/drivers/gpu/drm/zte/zx_vga.c
> > +++ b/drivers/gpu/drm/zte/zx_vga.c
> > @@ -109,7 +109,7 @@ static int zx_vga_connector_get_modes(struct drm_connector *connector)
> > */
> > zx_writel(vga->mmio + VGA_AUTO_DETECT_SEL, VGA_DETECT_SEL_HAS_DEVICE);
> >
> > - drm_mode_connector_update_edid_property(connector, edid);
> > + drm_connector_update_edid_property(connector, edid);
> > ret = drm_add_edid_modes(connector, edid);
> > kfree(edid);
> >
> > diff --git a/drivers/staging/vboxvideo/vbox_mode.c b/drivers/staging/vboxvideo/vbox_mode.c
> > index 5c7ea237893e..a943d2f683ed 100644
> > --- a/drivers/staging/vboxvideo/vbox_mode.c
> > +++ b/drivers/staging/vboxvideo/vbox_mode.c
> > @@ -504,7 +504,7 @@ static void vbox_set_edid(struct drm_connector *connector, int width,
> > for (i = 0; i < EDID_SIZE - 1; ++i)
> > sum += edid[i];
> > edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
> > - drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
> > + drm_connector_update_edid_property(connector, (struct edid *)edid);
> > }
> >
> > static int vbox_get_modes(struct drm_connector *connector)
> > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
> > index a0300e3468cb..9841d2b6d3eb 100644
> > --- a/include/drm/drm_connector.h
> > +++ b/include/drm/drm_connector.h
> > @@ -892,7 +892,7 @@ struct drm_connector {
> > /**
> > * @edid_blob_ptr: DRM property containing EDID if present. Protected by
> > * &drm_mode_config.mutex. This should be updated only by calling
> > - * drm_mode_connector_update_edid_property().
> > + * drm_connector_update_edid_property().
> > */
> > struct drm_property_blob *edid_blob_ptr;
> >
> > @@ -1190,8 +1190,8 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev);
> > int drm_mode_connector_set_path_property(struct drm_connector *connector,
> > const char *path);
> > int drm_mode_connector_set_tile_property(struct drm_connector *connector);
> > -int drm_mode_connector_update_edid_property(struct drm_connector *connector,
> > - const struct edid *edid);
> > +int drm_connector_update_edid_property(struct drm_connector *connector,
> > + const struct edid *edid);
> > void drm_mode_connector_set_link_status_property(struct drm_connector *connector,
> > uint64_t link_status);
> > int drm_connector_init_panel_orientation_property(
> > diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h
> > index 3b289773297c..5873d15821cf 100644
> > --- a/include/drm/drm_modeset_helper_vtables.h
> > +++ b/include/drm/drm_modeset_helper_vtables.h
> > @@ -785,7 +785,7 @@ struct drm_connector_helper_funcs {
> > *
> > * This function should fill in all modes currently valid for the sink
> > * into the &drm_connector.probed_modes list. It should also update the
> > - * EDID property by calling drm_mode_connector_update_edid_property().
> > + * EDID property by calling drm_connector_update_edid_property().
> > *
> > * The usual way to implement this is to cache the EDID retrieved in the
> > * probe callback somewhere in the driver-private connector structure.
> > --
> > 2.18.0
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Sean Paul, Software Engineer, Google / Chromium OS
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 15/15] drm: drop drmP.h include from drm_crtc.c
2018-07-12 13:51 ` Sean Paul
@ 2018-07-13 16:41 ` Daniel Vetter
0 siblings, 0 replies; 33+ messages in thread
From: Daniel Vetter @ 2018-07-13 16:41 UTC (permalink / raw)
To: Sean Paul; +Cc: Daniel Vetter, DRI Development, Daniel Vetter
On Thu, Jul 12, 2018 at 09:51:33AM -0400, Sean Paul wrote:
> On Mon, Jul 09, 2018 at 10:40:16AM +0200, Daniel Vetter wrote:
> > This is starting to become easy!
> >
> > Note: This needs the patch to move for_each_if from drmP.h to kernel.h
> > or it won't compile.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>
> Once for_each_if gets sorted out (however it goes).
Yeah I've left those out for now, will deal with that bikeshed when I'm
back from vacations.
>
> Reviewed-by: Sean Paul <seanpaul@chromium.org>
Thanks a lot for your review, everything except the drmP.h shuffling
patches merged.
Cheers, Daniel
>
> > ---
> > drivers/gpu/drm/drm_crtc.c | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> > index a6906c4ab880..30f93e460f4e 100644
> > --- a/drivers/gpu/drm/drm_crtc.c
> > +++ b/drivers/gpu/drm/drm_crtc.c
> > @@ -34,7 +34,7 @@
> > #include <linux/slab.h>
> > #include <linux/export.h>
> > #include <linux/dma-fence.h>
> > -#include <drm/drmP.h>
> > +#include <linux/uaccess.h>
> > #include <drm/drm_crtc.h>
> > #include <drm/drm_edid.h>
> > #include <drm/drm_fourcc.h>
> > @@ -42,6 +42,9 @@
> > #include <drm/drm_atomic.h>
> > #include <drm/drm_auth.h>
> > #include <drm/drm_debugfs_crc.h>
> > +#include <drm/drm_drv.h>
> > +#include <drm/drm_print.h>
> > +#include <drm/drm_file.h>
> >
> > #include "drm_crtc_internal.h"
> > #include "drm_internal.h"
> > --
> > 2.18.0
> >
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Sean Paul, Software Engineer, Google / Chromium OS
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2018-07-13 16:41 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-09 8:40 [PATCH 00/15] bunch of kerneldocs polish and related cleanup Daniel Vetter
2018-07-09 8:40 ` [PATCH 01/15] drm: move drv test macros out of drmP.h Daniel Vetter
2018-07-12 13:52 ` Sean Paul
2018-07-09 8:40 ` [PATCH 02/15] drm: Drop drmP.h from drm_connector.c Daniel Vetter
2018-07-12 13:53 ` Sean Paul
2018-07-09 8:40 ` [PATCH 03/15] drm/doc: switch drm_connector_state to inline comments Daniel Vetter
2018-07-12 13:54 ` Sean Paul
2018-07-09 8:40 ` [PATCH 04/15] drm/doc: polish for sturct drm_connector Daniel Vetter
2018-07-12 14:01 ` Sean Paul
2018-07-09 8:40 ` [PATCH 05/15] drm: drop _mode_ from update_edit_property() Daniel Vetter
2018-07-13 14:59 ` Sean Paul
2018-07-13 16:05 ` Daniel Vetter
2018-07-09 8:40 ` [PATCH 06/15] drm: drop _mode_ from drm_mode_connector_attach_encoder Daniel Vetter
2018-07-13 15:01 ` Sean Paul
2018-07-09 8:40 ` [PATCH 07/15] drm: drop _mode_ from remaining connector functions Daniel Vetter
2018-07-13 15:05 ` Sean Paul
2018-07-09 8:40 ` [PATCH 08/15] drm: Switch drm_plane_state to inline kerneldoc style Daniel Vetter
2018-07-13 15:08 ` Sean Paul
2018-07-09 8:40 ` [PATCH 09/15] drm: switch drm_plane to inline comments Daniel Vetter
2018-07-13 15:20 ` Sean Paul
2018-07-09 8:40 ` [PATCH 10/15] drm: drop drmP.h include from drm_plane.c Daniel Vetter
2018-07-13 15:22 ` Sean Paul
2018-07-09 8:40 ` [PATCH 11/15] drm/doc: move struct drm_crtc to in-line comments Daniel Vetter
2018-07-13 15:27 ` Sean Paul
2018-07-09 8:40 ` [PATCH 12/15] drm/doc: Group the fb gem helpers better Daniel Vetter
2018-07-12 12:18 ` Noralf Trønnes
2018-07-09 8:40 ` [PATCH 13/15] drm/doc: Includ drm_of.c helpers Daniel Vetter
2018-07-13 15:28 ` Sean Paul
2018-07-09 8:40 ` [PATCH 14/15] drm/doc: use inline kerneldoc style for drm_crtc_state Daniel Vetter
2018-07-13 15:33 ` Sean Paul
2018-07-09 8:40 ` [PATCH 15/15] drm: drop drmP.h include from drm_crtc.c Daniel Vetter
2018-07-12 13:51 ` Sean Paul
2018-07-13 16:41 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.