drm: Remove drm_mode_object dependency from drm_display_mode
Subsystems (8)
cover drm: Remove drm_mode_object dependency from drm_display_mode
This patch serie removes drm_mode_object dependency from drm_display_mode struct. This is part of KMS cleanup.
The motivation is that a display mode is a normal modeset object, possibly including public userspace id.
This can be removed since the entire concept of userspace managing modes explicitly has never landed in upstream kernel mode setting support.
Shayenne Moura (7):
drm: msm: Cleanup drm_display_mode print string
drm: omapdrm: Cleanup drm_display_mode print str
drm: meson: Cleanup on drm_display_mode print str
drm: sti: Cleanup drm_display_mode print str
drm: i915: Cleanup drm_display_mode print str
drm: Remove use of drm_mode_object
drm: Complete remove drm_mode_object dependency
drivers/gpu/drm/drm_crtc_helper.c | 5 ++--- drivers/gpu/drm/drm_modes.c | 5 ----- drivers/gpu/drm/i915/i915_debugfs.c | 9 +------- drivers/gpu/drm/meson/meson_dw_hdmi.c | 12 +++-------- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 10 ++------- .../gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 9 +------- .../gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 9 +------- .../gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 9 +------- .../gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 9 +------- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 9 +------- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 9 +------- drivers/gpu/drm/msm/dsi/dsi_manager.c | 9 +------- drivers/gpu/drm/msm/edp/edp_bridge.c | 9 +------- drivers/gpu/drm/omapdrm/omap_connector.c | 9 ++------ drivers/gpu/drm/omapdrm/omap_crtc.c | 8 ++----- drivers/gpu/drm/sti/sti_crtc.c | 16 ++++---------- include/drm/drm_modes.h | 21 +++---------------- 17 files changed, 27 insertions(+), 140 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/7 drm: msm: Cleanup drm_display_mode print string
This patch adjust the print string of drm_display_mode object to remove drm_mode_object dependency in msm files.
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 10 ++-------- drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 9 +-------- drivers/gpu/drm/msm/dsi/dsi_manager.c | 9 +-------- drivers/gpu/drm/msm/edp/edp_bridge.c | 9 +-------- 9 files changed, 10 insertions(+), 72 deletions(-)
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +2 -8
@@ -244,14 +244,8 @@ static void mdp4_crtc_mode_set_nofb(struct drm_crtc *crtc) mode = &crtc->state->adjusted_mode; -DBG ("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mdp4_crtc->name, mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("%s: set mode: " DRM_MODE_FMT , + mdp4_crtc->name,DRM_MODE_ARG (mode)); mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_SIZE(dma), MDP4_DMA_SRC_SIZE_WIDTH(mode->hdisplay) |
drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c +1 -8
@@ -58,14 +58,7 @@ static void mdp4_dsi_encoder_mode_set(struct drm_encoder *encoder, mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); + DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG()): ctrl_pol =0 ;if (mode->flags &DRM_MODE_FLAG_NHSYNC )
drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c +1 -8
@@ -104,14 +104,7 @@ static void mdp4_dtv_encoder_mode_set(struct drm_encoder *encoder, mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode)); mdp4_dtv_encoder->pixclock = mode->clock *1000 ;
drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c +1 -8
@@ -273,14 +273,7 @@ static void mdp4_lcdc_encoder_mode_set(struct drm_encoder *encoder, mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode)); mdp4_lcdc_encoder->pixclock = mode->clock *1000 ;
drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c +1 -8
@@ -134,14 +134,7 @@ void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder, { mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode));pingpong_tearcheck_setup (encoder, mode);mdp5_crtc_set_pipeline (encoder->crtc); }
drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +1 -8
@@ -384,14 +384,7 @@ static void mdp5_crtc_mode_set_nofb(struct drm_crtc *crtc) mode = &crtc->state->adjusted_mode; -DBG ("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - crtc->name, mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("%s: set mode: " DMR_MODE_FMT , crtc->name,DRM_MODE_ARG (mode)); mixer_width = mode->hdisplay;if (r_mixer)
drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c +1 -8
@@ -118,14 +118,7 @@ static void mdp5_vid_encoder_mode_set(struct drm_encoder *encoder, mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode)); ctrl_pol =0 ;
drivers/gpu/drm/msm/dsi/dsi_manager.c +1 -8
@@ -536,14 +536,7 @@ static void dsi_mgr_bridge_mode_set(struct drm_bridge *bridge,struct mipi_dsi_host *host = msm_dsi->host;bool is_dual_dsi =IS_DUAL_DSI (); -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode));if (is_dual_dsi && !IS_MASTER_DSI_LINK (id))return ;
drivers/gpu/drm/msm/edp/edp_bridge.c +1 -8
@@ -60,14 +60,7 @@ static void edp_bridge_mode_set(struct drm_bridge *bridge,struct edp_bridge *edp_bridge =to_edp_bridge (bridge);struct msm_edp *edp = edp_bridge->edp; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode));list_for_each_entry (connector, &dev->mode_config.connector_list, head) { if ((connector->encoder != NULL) &&
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 1/7] drm: msm: Cleanup drm_display_mode print string
Quoted 4 lines · Shayenne Moura
This patch adjust the print string of
drm_display_modeobject to removedrm_mode_objectdependency in msm files.Signed-off-by Shayenne Moura <[email protected]>
Please have a per-patch changelog of what changed compared to earlier versions, e.g. here:
v2: Use DRM_MODE_FMT/ARG macros (Daniel).
Or something like that. Patch series threading looks correct now. -Daniel
Quoted 200 lines
--- drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 10 ++-------- drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 9 +-------- drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c | 9 +-------- drivers/gpu/drm/msm/dsi/dsi_manager.c | 9 +-------- drivers/gpu/drm/msm/edp/edp_bridge.c | 9 +-------- 9 files changed, 10 insertions(+), 72 deletions(-)drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +2
-8@@ -244,14 +244,8 @@ static void mdp4_crtc_mode_set_nofb(struct drm_crtc *crtc) mode = &crtc->state->adjusted_mode; -DBG ("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mdp4_crtc->name, mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("%s: set mode: " DRM_MODE_FMT , + mdp4_crtc->name,DRM_MODE_ARG (mode)); mdp4_write(mdp4_kms, REG_MDP4_DMA_SRC_SIZE(dma), MDP4_DMA_SRC_SIZE_WIDTH(mode->hdisplay) |drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c +1
-8@@ -58,14 +58,7 @@ static void mdp4_dsi_encoder_mode_set(struct drm_encoder *encoder, mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); + DBG("set mode: " DRM_MODE_FMT, DRM_MODE_ARG()): ctrl_pol =0 ;if (mode->flags &DRM_MODE_FLAG_NHSYNC )drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c +1
-8@@ -104,14 +104,7 @@ static void mdp4_dtv_encoder_mode_set(struct drm_encoder *encoder, mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode)); mdp4_dtv_encoder->pixclock = mode->clock *1000 ;drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c +1
-8@@ -273,14 +273,7 @@ static void mdp4_lcdc_encoder_mode_set(struct drm_encoder *encoder, mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode)); mdp4_lcdc_encoder->pixclock = mode->clock *1000 ;drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c +1
-8@@ -134,14 +134,7 @@ void mdp5_cmd_encoder_mode_set(struct drm_encoder *encoder, { mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode));pingpong_tearcheck_setup (encoder, mode);mdp5_crtc_set_pipeline (encoder->crtc); }drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +1
-8@@ -384,14 +384,7 @@ static void mdp5_crtc_mode_set_nofb(struct drm_crtc *crtc) mode = &crtc->state->adjusted_mode; -DBG ("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - crtc->name, mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("%s: set mode: " DMR_MODE_FMT , crtc->name,DRM_MODE_ARG (mode)); mixer_width = mode->hdisplay;if (r_mixer)drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c +1
-8@@ -118,14 +118,7 @@ static void mdp5_vid_encoder_mode_set(struct drm_encoder *encoder, mode = adjusted_mode; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode)); ctrl_pol =0 ;drivers/gpu/drm/msm/dsi/dsi_manager.c +1
-8@@ -536,14 +536,7 @@ static void dsi_mgr_bridge_mode_set(struct drm_bridge *bridge,struct mipi_dsi_host *host = msm_dsi->host;bool is_dual_dsi =IS_DUAL_DSI (); -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode));if (is_dual_dsi && !IS_MASTER_DSI_LINK (id))return ;drivers/gpu/drm/msm/edp/edp_bridge.c +1
-8@@ -60,14 +60,7 @@ static void edp_bridge_mode_set(struct drm_bridge *bridge,struct edp_bridge *edp_bridge =to_edp_bridge (bridge);struct msm_edp *edp = edp_bridge->edp; -DBG ("set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("set mode: " DRM_MODE_FMT ,DRM_MODE_ARG (mode));list_for_each_entry (connector, &dev->mode_config.connector_list, head) { if ((connector->encoder != NULL) &&Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
PATCH 2/7 drm: omapdrm: Cleanup drm_display_mode print str
In reply to Shayenne MouraThis patch adjust the print string of drm_display_mode object to remove drm_mode_object dependency in omapdrm files.
--- drivers/gpu/drm/omapdrm/omap_connector.c | 9 ++------- drivers/gpu/drm/omapdrm/omap_crtc.c | 8 ++------ 2 files changed, 4 insertions(+), 13 deletions(-)
drivers/gpu/drm/omapdrm/omap_connector.c +2 -7
@@ -305,14 +305,9 @@ static int omap_connector_mode_valid(struct drm_connector *connector,drm_mode_destroy (dev, new_mode); done: -DBG ("connector: mode %s: " -"%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , +DBG ("connector: mode %s: " DRM_MODE_FMT , (ret ==MODE_OK ) ?"valid" :"invalid" , - mode->base.id, mode->name, mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, mode->type, mode->flags); +DRM_MODE_ARG (mode));return ret; }
drivers/gpu/drm/omapdrm/omap_crtc.c +2 -6
@@ -427,12 +427,8 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)struct omap_crtc *omap_crtc =to_omap_crtc (crtc);struct drm_display_mode *mode = &crtc->state->adjusted_mode; -DBG ("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - omap_crtc->name, mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("%s: set mode: " DRM_MODE_FMT , + omap_crtc->name,DRM_MODE_ARG (mode));drm_display_mode_to_videomode (mode, &omap_crtc->vm); }
Signature · 1 line
2.17.1
Re: [PATCH 2/7] drm: omapdrm: Cleanup drm_display_mode print str
Hi,
Tomi is neither in To, nor in Cc of this patch?
Quoted 5 lines · Shayenne Moura
This patch adjust the print string of
drm_display_modeobject to removedrm_mode_objectdependency in omapdrm files.Signed-off-by Shayenne Moura <[email protected]>---
-- Sebastian
Quoted 51 lines
drivers/gpu/drm/omapdrm/omap_connector.c | 9 ++------- drivers/gpu/drm/omapdrm/omap_crtc.c | 8 ++------ 2 files changed, 4 insertions(+), 13 deletions(-)drivers/gpu/drm/omapdrm/omap_connector.c +2
-7@@ -305,14 +305,9 @@ static int omap_connector_mode_valid(struct drm_connector *connector,drm_mode_destroy (dev, new_mode); done: -DBG ("connector: mode %s: " -"%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , +DBG ("connector: mode %s: " DRM_MODE_FMT , (ret ==MODE_OK ) ?"valid" :"invalid" , - mode->base.id, mode->name, mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, mode->type, mode->flags); +DRM_MODE_ARG (mode));return ret; }drivers/gpu/drm/omapdrm/omap_crtc.c +2
-6@@ -427,12 +427,8 @@ static void omap_crtc_mode_set_nofb(struct drm_crtc *crtc)struct omap_crtc *omap_crtc =to_omap_crtc (crtc);struct drm_display_mode *mode = &crtc->state->adjusted_mode; -DBG ("%s: set mode: %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" , - omap_crtc->name, mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +DBG ("%s: set mode: " DRM_MODE_FMT , + omap_crtc->name,DRM_MODE_ARG (mode));drm_display_mode_to_videomode (mode, &omap_crtc->vm); }Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/7 drm: meson: Cleanup on drm_display_mode print str
In reply to Shayenne MouraThis patch adjust the print string of drm_display_mode object to remove drm_mode_object dependency in meson files.
--- drivers/gpu/drm/meson/meson_dw_hdmi.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/meson/meson_dw_hdmi.c +3 -9
@@ -365,7 +365,7 @@ static int dw_hdmi_phy_init(struct dw_hdmi *hdmi, void *data,unsigned int wr_clk =readl_relaxed (priv->io_base +_REG (VPU_HDMI_SETTING )); -DRM_DEBUG_DRIVER ("%d:\"%s\"\n" , mode->base.id, mode->name); +DRM_DEBUG_DRIVER ("\"%s\"\n" , mode->name);/* Enable clocks */ regmap_update_bits (priv->hhi,HHI_HDMI_CLK_CNTL ,0xffff ,0x100 );
@@ -555,12 +555,7 @@ dw_hdmi_mode_valid(struct drm_connector *connector,int vic =drm_match_cea_mode (mode);enum drm_mode_status status; -DRM_DEBUG_DRIVER ("Modeline %d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x\n" , - mode->base.id, mode->name, mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, mode->type, mode->flags); +DRM_DEBUG_DRIVER ("Modeline " DRM_MODE_FMT "\n" ,DRM_MODE_ARG (mode));/* Check against non-VIC supported modes */ if (!vic) {
@@ -650,8 +645,7 @@ static void meson_venc_hdmi_encoder_mode_set(struct drm_encoder *encoder,struct meson_drm *priv = dw_hdmi->priv;int vic =drm_match_cea_mode (mode); -DRM_DEBUG_DRIVER ("%d:\"%s\" vic %d\n" , - mode->base.id, mode->name, vic); +DRM_DEBUG_DRIVER ("\"%s\" vic %d\n" , mode->name, vic);/* VENC + VENC-DVI Mode setup */ meson_venc_hdmi_mode_set (priv, vic, mode);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/7 drm: sti: Cleanup drm_display_mode print str
In reply to Shayenne MouraThis patch adjust the print string of drm_display_mode object to remove drm_mode_object dependency in sti files.
--- drivers/gpu/drm/sti/sti_crtc.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/gpu/drm/sti/sti_crtc.c +4 -12
@@ -53,18 +53,10 @@ sti_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode)struct clk *compo_clk, *pix_clk;int rate = mode->clock *1000 ; -DRM_DEBUG_KMS ("CRTC:%d (%s) mode:%d (%s)\n" , - crtc->base.id,sti_mixer_to_str (mixer), - mode->base.id, mode->name); - -DRM_DEBUG_KMS ("%d %d %d %d %d %d %d %d %d %d 0x%x 0x%x\n" , - mode->vrefresh, mode->clock, - mode->hdisplay, - mode->hsync_start, mode->hsync_end, - mode->htotal, - mode->vdisplay, - mode->vsync_start, mode->vsync_end, - mode->vtotal, mode->type, mode->flags); +DRM_DEBUG_KMS ("CRTC:%d (%s) mode: (%s)\n" , + crtc->base.id,sti_mixer_to_str (mixer), mode->name); + +DRM_DEBUG_KMS (DRM_MODE_FMT "\n" ,DRM_MODE_ARG (mode));if (mixer->id ==STI_MIXER_MAIN ) { compo_clk = compo->clk_compo_main;
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 5/7 drm: i915: Cleanup drm_display_mode print str
In reply to Shayenne MouraThis patch adjust the print string of drm_display_mode object to remove drm_mode_object dependency in i915 files. It modifies the print style to standardize the use of DRM_MODE_FMT.
--- drivers/gpu/drm/i915/i915_debugfs.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -8
@@ -2948,14 +2948,7 @@ static void intel_seq_print_mode(struct seq_file *m, int tabs,for (i =0 ; i < tabs; i++)seq_putc (m,'\t' ); -seq_printf (m,"id %d:\"%s\" freq %d clock %d hdisp %d hss %d hse %d htot %d vdisp %d vss %d vse %d vtot %d type 0x%x flags 0x%x\n" , - mode->base.id, mode->name, - mode->vrefresh, mode->clock, - mode->hdisplay, mode->hsync_start, - mode->hsync_end, mode->htotal, - mode->vdisplay, mode->vsync_start, - mode->vsync_end, mode->vtotal, - mode->type, mode->flags); +seq_printf (m,DRM_MODE_FMT "\n" ,DRM_MODE_ARG (mode)); } static void intel_encoder_info(struct seq_file *m,
Signature · 1 line
2.17.1
PATCH 6/7 drm: Remove use of drm_mode_object
In reply to Shayenne MouraThis patch removes the drm_mode_object prints, evaluation and use from drm_display_mode objects used in drm files. It removes dependency from drm_mode_object.
--- drivers/gpu/drm/drm_crtc_helper.c | 5 ++--- drivers/gpu/drm/drm_modes.c | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-)
drivers/gpu/drm/drm_crtc_helper.c +2 -3
@@ -386,9 +386,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,if (!encoder_funcs)continue ; -DRM_DEBUG_KMS ("[ENCODER:%d:%s] set [MODE:%d:%s]\n" , - encoder->base.id, encoder->name, - mode->base.id, mode->name); +DRM_DEBUG_KMS ("[ENCODER:%d:%s] set [MODE:%s]\n" , + encoder->base.id, encoder->name, mode->name);if (encoder_funcs->mode_set) encoder_funcs->mode_set (encoder, mode, adjusted_mode);
drivers/gpu/drm/drm_modes.c +0 -5
@@ -71,11 +71,6 @@ struct drm_display_mode *drm_mode_create(struct drm_device *dev)if (!nmode)return NULL ; -if (drm_mode_object_add (dev, &nmode->base,DRM_MODE_OBJECT_MODE )) { -kfree (nmode); -return NULL ; - } -return nmode; }EXPORT_SYMBOL (drm_mode_create);
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 6/7] drm: Remove use of drm_mode_object
Quoted 31 lines · Shayenne Moura
This patch removes the
drm_mode_objectprints, evaluation and use fromdrm_display_modeobjects used in drm files. It removes dependency fromdrm_mode_object.Signed-off-by Shayenne Moura <[email protected]>--- drivers/gpu/drm/drm_crtc_helper.c | 5 ++--- drivers/gpu/drm/drm_modes.c | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-)drivers/gpu/drm/drm_crtc_helper.c +2
-3@@ -386,9 +386,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,if (!encoder_funcs)continue ; -DRM_DEBUG_KMS ("[ENCODER:%d:%s] set [MODE:%d:%s]\n" , - encoder->base.id, encoder->name, - mode->base.id, mode->name); +DRM_DEBUG_KMS ("[ENCODER:%d:%s] set [MODE:%s]\n" , + encoder->base.id, encoder->name, mode->name);if (encoder_funcs->mode_set) encoder_funcs->mode_set (encoder, mode, adjusted_mode);drivers/gpu/drm/drm_modes.c +0
-0
drivers/gpu/drm/drm_modes.c struct drm_display_mode *drm_mode_create(struct drm_device *dev) · line 77
Quoted 7 lines
drivers/gpu/drm/drm_modes.c +0
-4@@ -71,11 +71,6 @@ struct drm_display_mode *drm_mode_create(struct drm_device *dev)if (!nmode)return NULL ; -if (drm_mode_object_add (dev, &nmode->base,DRM_MODE_OBJECT_MODE )) { -kfree (nmode); -return NULL ; - }
You seem to have lost the 3rd hunk here compared to the previous version.
For reordering patches the best way is to use
$ git rebase --interactive
which fires up a text editor where you can reorder the patches as you see fit. That way you don't have to touch them and risk breaking something.
Another thing: When resending patches unchanged, and your previous version has received r-b/a-b tags, please include them. That way people know what still needs to be reviewed and what is already reviewed. I think there was also some other patches than this one that I reviewed already, can you pls redo the patch series with r-b tags included, patch commit log (where you did change something) added and then resend?
Threading looks good now.
Thanks, Daniel
Quoted 11 lines
drivers/gpu/drm/drm_modes.c +0
-1-return nmode; }EXPORT_SYMBOL (drm_mode_create);Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
PATCH 7/7 drm: Complete remove drm_mode_object dependency
In reply to Shayenne MouraThis patch finalizes the KMS cleanup task dependency from drm_display_mode. It removes the use of drm_mode_object from drm_display_mode struct and it removes the use of base.id and base.type from drm_display_mode struct print string.
--- include/drm/drm_modes.h | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-)
include/drm/drm_modes.h +3 -18
@@ -136,8 +136,7 @@ enum drm_mode_status { .hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \ .htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \ .vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \ - .vscan = (vs), .flags = (f), \ - .base.type = DRM_MODE_OBJECT_MODE + .vscan = (vs), .flags = (f)#define CRTC_INTERLACE_HALVE_V (1 << 0)/* halve V values for interlacing */ #define CRTC_STEREO_DOUBLE (1 << 1)/* adjust timings for stereo modes */
@@ -213,20 +212,6 @@ struct drm_display_mode {*/ struct list_head head; -/** -* @base: -* -* A display mode is a normal modeset object, possibly including public -* userspace id. -* -* FIXME: -* -* This can probably be removed since the entire concept of userspace -* managing modes explicitly has never landed in upstream kernel mode -* setting support. -*/ -struct drm_mode_object base; -/** * @name: *
@@ -429,14 +414,14 @@ struct drm_display_mode {/** * DRM_MODE_FMT - printf string for &struct drm_display_mode */ -#define DRM_MODE_FMT "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x" +#define DRM_MODE_FMT "\"%s\": %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x"/** * DRM_MODE_ARG - printf arguments for &struct drm_display_mode * @m: display mode */ #define DRM_MODE_ARG (m) \ - (m)->base.id, (m)->name, (m)->vrefresh, (m)->clock, \ + (m)->name, (m)->vrefresh, (m)->clock, \ (m)->hdisplay, (m)->hsync_start, (m)->hsync_end, (m)->htotal, \ (m)->vdisplay, (m)->vsync_start, (m)->vsync_end, (m)->vtotal, \ (m)->type, (m)->flags
Signature · 6 lines
2.17.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
kbuild test robot
build botRe: [PATCH 7/7] drm: Complete remove drm_mode_object dependency
Thank you for the patch! Yet something to improve:
Hi Shayenne,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on robclark/msm-next]
[also build test ERROR on v4.20-rc7 next-20181221]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Shayenne-Moura/drm-Remove-drm_mode_object-dependency-from-drm_display_mode/20181222-065838 base: git://people.freedesktop.org/~robclark/linux msm-next config: x86_64-randconfig-x008-201850 (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: # save the attached .config to linux build tree make ARCH=x86_64
All errors (new ones prefixed by >>):
drivers/gpu/drm/drm_modes.c: In function 'drm_mode_destroy':
>> drivers/gpu/drm/drm_modes.c:90:41: error: 'struct drm_display_mode' has no member named 'base'; did you mean 'name'?
drm_mode_object_unregister(dev, &mode->base);
^~~~
name
drivers/gpu/drm/drm_modes.c: In function 'drm_mode_copy':
drivers/gpu/drm/drm_modes.c:909:16: error: 'struct drm_display_mode' has no member named 'base'; did you mean 'name'?
int id = dst->base.id;
^~~~
name
drivers/gpu/drm/drm_modes.c:913:7: error: 'struct drm_display_mode' has no member named 'base'; did you mean 'name'?
dst->base.id = id;
^~~~
namevim +90 drivers/gpu/drm/drm_modes.c
8bd441b2 Daniel Vetter 2014-01-23 77
8bd441b2 Daniel Vetter 2014-01-23 78 /**
8bd441b2 Daniel Vetter 2014-01-23 79 * drm_mode_destroy - remove a mode
8bd441b2 Daniel Vetter 2014-01-23 80 * @dev: DRM device
8bd441b2 Daniel Vetter 2014-01-23 81 * @mode: mode to remove
8bd441b2 Daniel Vetter 2014-01-23 82 *
f5aabb97 Daniel Vetter 2014-01-23 83 * Release @mode's unique ID, then free it @mode structure itself using kfree.
8bd441b2 Daniel Vetter 2014-01-23 84 */
8bd441b2 Daniel Vetter 2014-01-23 85 void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode)
8bd441b2 Daniel Vetter 2014-01-23 86 {
8bd441b2 Daniel Vetter 2014-01-23 87 if (!mode)
8bd441b2 Daniel Vetter 2014-01-23 88 return;
8bd441b2 Daniel Vetter 2014-01-23 89
7c8f6d25 Dave Airlie 2016-04-15 @90 drm_mode_object_unregister(dev, &mode->base);
8bd441b2 Daniel Vetter 2014-01-23 91
8bd441b2 Daniel Vetter 2014-01-23 92 kfree(mode);
8bd441b2 Daniel Vetter 2014-01-23 93 }
8bd441b2 Daniel Vetter 2014-01-23 94 EXPORT_SYMBOL(drm_mode_destroy);
8bd441b2 Daniel Vetter 2014-01-23 95 :::::: The code at line 90 was first introduced by commit
:::::: 7c8f6d2577c7565f67ba3f6b9b76f7422710d66e drm/mode: rework drm_mode_object_put to drm_mode_object_unregister.
:::::: TO: Dave Airlie <[email protected]>
:::::: CC: Dave Airlie <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
kbuild test robot
build botRe: [PATCH 7/7] drm: Complete remove drm_mode_object dependency
In reply to Shayenne MouraThank you for the patch! Yet something to improve:
Hi Shayenne,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on robclark/msm-next]
[also build test ERROR on v4.20-rc7 next-20181221]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Shayenne-Moura/drm-Remove-drm_mode_object-dependency-from-drm_display_mode/20181222-065838 base: git://people.freedesktop.org/~robclark/linux msm-next config: i386-randconfig-a3-12211242 (attached as .config) compiler: gcc-4.9 (Debian 4.9.4-2) 4.9.4 reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
drivers/gpu/drm/drm_modes.c: In function 'drm_mode_destroy':
>> drivers/gpu/drm/drm_modes.c:90:39: error: 'struct drm_display_mode' has no member named 'base'
drm_mode_object_unregister(dev, &mode->base);
^
drivers/gpu/drm/drm_modes.c: In function 'drm_mode_copy':
drivers/gpu/drm/drm_modes.c:909:14: error: 'struct drm_display_mode' has no member named 'base'
int id = dst->base.id;
^
drivers/gpu/drm/drm_modes.c:913:5: error: 'struct drm_display_mode' has no member named 'base'
dst->base.id = id;
^vim +90 drivers/gpu/drm/drm_modes.c
8bd441b2 Daniel Vetter 2014-01-23 77
8bd441b2 Daniel Vetter 2014-01-23 78 /**
8bd441b2 Daniel Vetter 2014-01-23 79 * drm_mode_destroy - remove a mode
8bd441b2 Daniel Vetter 2014-01-23 80 * @dev: DRM device
8bd441b2 Daniel Vetter 2014-01-23 81 * @mode: mode to remove
8bd441b2 Daniel Vetter 2014-01-23 82 *
f5aabb97 Daniel Vetter 2014-01-23 83 * Release @mode's unique ID, then free it @mode structure itself using kfree.
8bd441b2 Daniel Vetter 2014-01-23 84 */
8bd441b2 Daniel Vetter 2014-01-23 85 void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode)
8bd441b2 Daniel Vetter 2014-01-23 86 {
8bd441b2 Daniel Vetter 2014-01-23 87 if (!mode)
8bd441b2 Daniel Vetter 2014-01-23 88 return;
8bd441b2 Daniel Vetter 2014-01-23 89
7c8f6d25 Dave Airlie 2016-04-15 @90 drm_mode_object_unregister(dev, &mode->base);
8bd441b2 Daniel Vetter 2014-01-23 91
8bd441b2 Daniel Vetter 2014-01-23 92 kfree(mode);
8bd441b2 Daniel Vetter 2014-01-23 93 }
8bd441b2 Daniel Vetter 2014-01-23 94 EXPORT_SYMBOL(drm_mode_destroy);
8bd441b2 Daniel Vetter 2014-01-23 95 :::::: The code at line 90 was first introduced by commit
:::::: 7c8f6d2577c7565f67ba3f6b9b76f7422710d66e drm/mode: rework drm_mode_object_put to drm_mode_object_unregister.
:::::: TO: Dave Airlie <[email protected]>
:::::: CC: Dave Airlie <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel