From: Jani Nikula <jani.nikula@intel.com>
To: Imre Deak <imre.deak@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH v2 3/8] drm/i915/dp: Print only sink or branch specific OUI based on dev type
Date: Mon, 24 Oct 2016 20:12:46 +0300 [thread overview]
Message-ID: <87d1ipk6wh.fsf@intel.com> (raw)
In-Reply-To: <1477326811-30431-4-git-send-email-imre.deak@intel.com>
On Mon, 24 Oct 2016, Imre Deak <imre.deak@intel.com> wrote:
> There are two separate sets of DPCD registers for the DP OUI - as well as
> for the device ID and HW/SW revision - based on whether the given DP
> device is a branch or a sink. Currently we print both branch and sink
> OUIs, for consistency print only the one that corresponds to the
> probed device.
>
> v2:
> - Split out this change into a separate patch. (Jani)
>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/intel_dp.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 1c1a8c8..1991250 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -3624,17 +3624,17 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
> static void
> intel_dp_probe_oui(struct intel_dp *intel_dp)
> {
> + bool is_branch = drm_dp_is_branch(intel_dp->dpcd);
> u8 buf[3];
>
> if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
> return;
>
> - if (drm_dp_dpcd_read(&intel_dp->aux, DP_SINK_OUI, buf, 3) == 3)
> - DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n",
> - buf[0], buf[1], buf[2]);
> -
> - if (drm_dp_dpcd_read(&intel_dp->aux, DP_BRANCH_OUI, buf, 3) == 3)
> - DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
> + if (drm_dp_dpcd_read(&intel_dp->aux,
> + is_branch ? DP_BRANCH_OUI : DP_SINK_OUI,
> + buf, 3) == 3)
> + DRM_DEBUG_KMS("%s OUI: %02hx%02hx%02hx\n",
> + is_branch ? "Branch" : "Sink",
> buf[0], buf[1], buf[2]);
> }
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-10-24 17:12 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-24 16:33 [PATCH v2 0/8] drm/i915/lspcon: Work around resume failure Imre Deak
2016-10-24 16:33 ` [PATCH v2 1/8] drm/dp: Factor out helper to distinguish between branch and sink devices Imre Deak
2016-10-24 17:10 ` Jani Nikula
2016-10-25 6:54 ` [Intel-gfx] " Daniel Vetter
2016-10-25 7:46 ` Jani Nikula
2016-10-25 8:12 ` Daniel Vetter
2016-10-24 16:33 ` [PATCH v2 2/8] drm/i915/dp: Remove debug dependency of DPCD SW/HW revision read Imre Deak
2016-10-24 17:11 ` Jani Nikula
2016-10-24 16:33 ` [PATCH v2 3/8] drm/i915/dp: Print only sink or branch specific OUI based on dev type Imre Deak
2016-10-24 17:12 ` Jani Nikula [this message]
2016-10-24 16:33 ` [PATCH v2 4/8] drm/i915/dp: Print full branch/sink descriptor Imre Deak
2016-10-24 18:14 ` Jani Nikula
2016-10-24 18:56 ` Imre Deak
2016-10-24 19:10 ` Jani Nikula
2016-10-24 19:35 ` Imre Deak
2016-10-25 9:28 ` Jani Nikula
2016-10-25 10:38 ` Imre Deak
2016-10-25 10:55 ` Jani Nikula
2016-10-25 13:12 ` [PATCH v3 " Imre Deak
2016-10-25 15:07 ` Jani Nikula
2016-10-24 16:33 ` [PATCH v2 5/8] drm/i915/lspcon: Fail LSPCON probe if the start of DPCD can't be read Imre Deak
2016-10-24 18:48 ` Jani Nikula
2016-10-24 16:33 ` [PATCH v2 6/8] drm/i915/dp: Read DP descriptor for eDP and LSPCON too Imre Deak
2016-10-24 18:49 ` Jani Nikula
2016-10-24 16:33 ` [PATCH v2 7/8] drm/i915/lspcon: Get DDC adapter via container_of() instead of cached ptr Imre Deak
2016-10-24 18:53 ` Jani Nikula
2016-10-24 16:33 ` [PATCH v2 8/8] drm/i915/lspcon: Add workaround for resuming in PCON mode Imre Deak
2016-10-25 15:12 ` Jani Nikula
2016-10-24 17:16 ` ✗ Fi.CI.BAT: warning for drm/i915/lspcon: Work around resume failure Patchwork
2016-10-24 17:25 ` Imre Deak
2016-10-24 18:58 ` Jani Nikula
2016-10-24 19:05 ` Imre Deak
2016-10-25 5:47 ` Saarinen, Jani
2016-10-25 5:46 ` Saarinen, Jani
2016-10-25 14:46 ` ✗ Fi.CI.BAT: warning for drm/i915/lspcon: Work around resume failure (rev2) Patchwork
2016-10-26 15:53 ` Imre Deak
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=87d1ipk6wh.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.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;
as well as URLs for NNTP newsgroup(s).