From: Damien Lespiau <damien.lespiau@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: add HAS_DP_MST feature test macro
Date: Mon, 18 May 2015 15:26:54 +0100 [thread overview]
Message-ID: <20150518142653.GA7160@strange.ger.corp.intel.com> (raw)
In-Reply-To: <1431958201-15601-1-git-send-email-jani.nikula@intel.com>
On Mon, May 18, 2015 at 05:10:01PM +0300, Jani Nikula wrote:
> Be in line with other features that we have.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Looks good to me.
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
--
Damien
> ---
> drivers/gpu/drm/i915/i915_drv.h | 3 +++
> drivers/gpu/drm/i915/intel_dp.c | 10 ++++------
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 6a66d6b7d33b..11e0059abd2c 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2448,6 +2448,9 @@ struct drm_i915_cmd_table {
>
> #define HAS_IPS(dev) (IS_HSW_ULT(dev) || IS_BROADWELL(dev))
>
> +#define HAS_DP_MST(dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \
> + INTEL_INFO(dev)->gen >= 9)
> +
> #define HAS_DDI(dev) (INTEL_INFO(dev)->has_ddi)
> #define HAS_FPGA_DBG_UNCLAIMED(dev) (INTEL_INFO(dev)->has_fpga_dbg)
> #define HAS_PSR(dev) (IS_HASWELL(dev) || IS_BROADWELL(dev) || \
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 6e9f14ef2d2d..0edc30516497 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -5817,12 +5817,10 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
> intel_dp_aux_init(intel_dp, intel_connector);
>
> /* init MST on ports that can support it */
> - if (IS_HASWELL(dev) || IS_BROADWELL(dev) || INTEL_INFO(dev)->gen >= 9) {
> - if (port == PORT_B || port == PORT_C || port == PORT_D) {
> - intel_dp_mst_encoder_init(intel_dig_port,
> - intel_connector->base.base.id);
> - }
> - }
> + if (HAS_DP_MST(dev) &&
> + (port == PORT_B || port == PORT_C || port == PORT_D))
> + intel_dp_mst_encoder_init(intel_dig_port,
> + intel_connector->base.base.id);
>
> if (!intel_edp_init_connector(intel_dp, intel_connector)) {
> drm_dp_aux_unregister(&intel_dp->aux);
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-05-18 14:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-18 14:10 [PATCH] drm/i915: add HAS_DP_MST feature test macro Jani Nikula
2015-05-18 14:26 ` Damien Lespiau [this message]
2015-05-18 15:17 ` Daniel Vetter
2015-05-19 17:35 ` shuang.he
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=20150518142653.GA7160@strange.ger.corp.intel.com \
--to=damien.lespiau@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/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