From: Samuel Li <Samuel.Li-5C7GfCeVMHo@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Cc: Samuel Li <Samuel.Li-5C7GfCeVMHo@public.gmane.org>
Subject: [PATCH 05/13] drm/amdgpu: rename amdgpu_ddc_probe
Date: Mon, 22 Jan 2018 14:38:06 -0500 [thread overview]
Message-ID: <1516649894-4518-5-git-send-email-Samuel.Li@amd.com> (raw)
In-Reply-To: <1516649894-4518-1-git-send-email-Samuel.Li-5C7GfCeVMHo@public.gmane.org>
Add display to the name for consistency.
Signed-off-by: Samuel Li <Samuel.Li@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 10 ++++++----
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +++---
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 ++-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index 8ca3783..ffc1f6f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -877,7 +877,7 @@ amdgpu_connector_vga_detect(struct drm_connector *connector, bool force)
ret = connector_status_disconnected;
if (amdgpu_connector->ddc_bus)
- dret = amdgpu_ddc_probe(amdgpu_connector, false);
+ dret = amdgpu_display_ddc_probe(amdgpu_connector, false);
if (dret) {
amdgpu_connector->detected_by_load = false;
amdgpu_connector_free_edid(connector);
@@ -998,7 +998,7 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force)
}
if (amdgpu_connector->ddc_bus)
- dret = amdgpu_ddc_probe(amdgpu_connector, false);
+ dret = amdgpu_display_ddc_probe(amdgpu_connector, false);
if (dret) {
amdgpu_connector->detected_by_load = false;
amdgpu_connector_free_edid(connector);
@@ -1401,7 +1401,8 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
/* setup ddc on the bridge */
amdgpu_atombios_encoder_setup_ext_encoder_ddc(encoder);
/* bridge chips are always aux */
- if (amdgpu_ddc_probe(amdgpu_connector, true)) /* try DDC */
+ /* try DDC */
+ if (amdgpu_display_ddc_probe(amdgpu_connector, true))
ret = connector_status_connected;
else if (amdgpu_connector->dac_load_detect) { /* try load detection */
const struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
@@ -1421,7 +1422,8 @@ amdgpu_connector_dp_detect(struct drm_connector *connector, bool force)
ret = connector_status_connected;
} else {
/* try non-aux ddc (DP to DVI/HDMI/etc. adapter) */
- if (amdgpu_ddc_probe(amdgpu_connector, false))
+ if (amdgpu_display_ddc_probe(amdgpu_connector,
+ false))
ret = connector_status_connected;
}
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index cb01c5c..ebf4145 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -432,11 +432,11 @@ void amdgpu_display_print_display_setup(struct drm_device *dev)
}
/**
- * amdgpu_ddc_probe
+ * amdgpu_display_ddc_probe
*
*/
-bool amdgpu_ddc_probe(struct amdgpu_connector *amdgpu_connector,
- bool use_aux)
+bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector,
+ bool use_aux)
{
u8 out = 0x0;
u8 buf[8];
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
index fa5dda0..00f8ef3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
@@ -631,7 +631,8 @@ bool amdgpu_dig_monitor_is_duallink(struct drm_encoder *encoder,
u16 amdgpu_encoder_get_dp_bridge_encoder_id(struct drm_encoder *encoder);
struct drm_encoder *amdgpu_get_external_encoder(struct drm_encoder *encoder);
-bool amdgpu_ddc_probe(struct amdgpu_connector *amdgpu_connector, bool use_aux);
+bool amdgpu_display_ddc_probe(struct amdgpu_connector *amdgpu_connector,
+ bool use_aux);
void amdgpu_encoder_set_active_device(struct drm_encoder *encoder);
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2018-01-22 19:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 19:38 [PATCH 01/13] drm/amdgpu: rename static functions in amdgpu_display.c Samuel Li
[not found] ` <1516649894-4518-1-git-send-email-Samuel.Li-5C7GfCeVMHo@public.gmane.org>
2018-01-22 19:38 ` [PATCH 02/13] drm/amdgpu: rename amdgpu_crtc_page_flip_target Samuel Li
2018-01-22 19:38 ` [PATCH 03/13] drm/amdgpu: rename amdgpu_crtc_set_config Samuel Li
2018-01-22 19:38 ` [PATCH 04/13] drm/amdgpu: rename amdgpu_print_display_setup Samuel Li
2018-01-22 19:38 ` Samuel Li [this message]
2018-01-22 19:38 ` [PATCH 06/13] drm/amdgpu: rename amdgpu_framebuffer_init Samuel Li
2018-01-22 19:38 ` [PATCH 07/13] drm/amdgpu: rename amdgpu_user_framebuffer_create Samuel Li
2018-01-22 19:38 ` [PATCH 08/13] drm/amdgpu: rename amdgpu_modeset_create_props Samuel Li
2018-01-22 19:38 ` [PATCH 09/13] drm/amdgpu: rename amdgpu_update_display_priority Samuel Li
2018-01-22 19:38 ` [PATCH 10/13] drm/amdgpu: rename amdgpu_crtc_scaling_mode_fixup Samuel Li
2018-01-22 19:38 ` [PATCH 11/13] drm/amdgpu: rename amdgpu_get_crtc_scanoutpos Samuel Li
2018-01-22 19:38 ` [PATCH 12/13] drm/amdgpu: rename amdgpu_crtc_idx_to_irq_type Samuel Li
2018-01-22 19:38 ` [PATCH 13/13] drm/amdgpu: rename amdgpu_freesync_ioctl Samuel Li
2018-01-22 19:42 ` [PATCH 01/13] drm/amdgpu: rename static functions in amdgpu_display.c Christian König
[not found] ` <0ce90ad9-7453-9a02-0c75-27b1bc7539d8-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-22 20:56 ` Alex Deucher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1516649894-4518-5-git-send-email-Samuel.Li@amd.com \
--to=samuel.li-5c7gfcevmho@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox