aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Abriou <vincent.abriou@st.com>2017-01-06 11:44:43 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-01-09 05:18:41 -0500
commita09759e82f2d60823027e9d3391bbea40f919604 (patch)
tree2df93d2e2a5feb73b356aa554b10f4d0d88c1e25
parent9f547425fd9fbcb42b177ec7eec46bd4d7d4ae45 (diff)
drm: remove useless parameters from drm_pick_cmdline_mode function
drm_pick_cmdline_mode width and height parameters are useless. Just remove them. Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1483721084-20278-2-git-send-email-vincent.abriou@st.com
-rw-r--r--drivers/gpu/drm/drm_fb_helper.c7
-rw-r--r--drivers/gpu/drm/i915/intel_fbdev.c2
-rw-r--r--include/drm/drm_fb_helper.h3
3 files changed, 5 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 730342cbe899..0ab6aaacb7d6 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1752,8 +1752,7 @@ static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)
1752 return fb_connector->connector->cmdline_mode.specified; 1752 return fb_connector->connector->cmdline_mode.specified;
1753} 1753}
1754 1754
1755struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn, 1755struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn)
1756 int width, int height)
1757{ 1756{
1758 struct drm_cmdline_mode *cmdline_mode; 1757 struct drm_cmdline_mode *cmdline_mode;
1759 struct drm_display_mode *mode; 1758 struct drm_display_mode *mode;
@@ -1871,7 +1870,7 @@ static bool drm_target_cloned(struct drm_fb_helper *fb_helper,
1871 if (!enabled[i]) 1870 if (!enabled[i])
1872 continue; 1871 continue;
1873 fb_helper_conn = fb_helper->connector_info[i]; 1872 fb_helper_conn = fb_helper->connector_info[i];
1874 modes[i] = drm_pick_cmdline_mode(fb_helper_conn, width, height); 1873 modes[i] = drm_pick_cmdline_mode(fb_helper_conn);
1875 if (!modes[i]) { 1874 if (!modes[i]) {
1876 can_clone = false; 1875 can_clone = false;
1877 break; 1876 break;
@@ -1993,7 +1992,7 @@ retry:
1993 fb_helper_conn->connector->base.id); 1992 fb_helper_conn->connector->base.id);
1994 1993
1995 /* got for command line mode first */ 1994 /* got for command line mode first */
1996 modes[i] = drm_pick_cmdline_mode(fb_helper_conn, width, height); 1995 modes[i] = drm_pick_cmdline_mode(fb_helper_conn);
1997 if (!modes[i]) { 1996 if (!modes[i]) {
1998 DRM_DEBUG_KMS("looking for preferred mode on connector %d %d\n", 1997 DRM_DEBUG_KMS("looking for preferred mode on connector %d %d\n",
1999 fb_helper_conn->connector->base.id, fb_helper_conn->connector->tile_group ? fb_helper_conn->connector->tile_group->id : 0); 1998 fb_helper_conn->connector->base.id, fb_helper_conn->connector->tile_group ? fb_helper_conn->connector->tile_group->id : 0);
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index 570c07d59d1a..a46b19d9de0e 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -447,7 +447,7 @@ retry:
447 connector->name); 447 connector->name);
448 448
449 /* go for command line mode first */ 449 /* go for command line mode first */
450 modes[i] = drm_pick_cmdline_mode(fb_conn, width, height); 450 modes[i] = drm_pick_cmdline_mode(fb_conn);
451 451
452 /* try for preferred next */ 452 /* try for preferred next */
453 if (!modes[i]) { 453 if (!modes[i]) {
diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 53687c5664b8..e62e1cf22678 100644
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
@@ -295,8 +295,7 @@ struct drm_display_mode *
295drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector, 295drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector,
296 int width, int height); 296 int width, int height);
297struct drm_display_mode * 297struct drm_display_mode *
298drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn, 298drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn);
299 int width, int height);
300 299
301int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector); 300int drm_fb_helper_add_one_connector(struct drm_fb_helper *fb_helper, struct drm_connector *connector);
302int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper, 301int drm_fb_helper_remove_one_connector(struct drm_fb_helper *fb_helper,