From: Jani Nikula <jani.nikula@intel.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>, intel-gfx@lists.freedesktop.org
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: Re: [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled
Date: Thu, 30 Apr 2015 11:34:02 +0300 [thread overview]
Message-ID: <87wq0u9fr9.fsf@intel.com> (raw)
In-Reply-To: <5541027C.306@virtuousgeek.org>
On Wed, 29 Apr 2015, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> On 04/29/2015 05:30 AM, Jani Nikula wrote:
>> Add port check for ibx similar to vlv in
>>
>> commit 535afa2e9e3c1867460d6981d879b04d8b2b9ab3
>> Author: Jesse Barnes <jbarnes@virtuousgeek.org>
>> Date: Wed Apr 15 16:52:29 2015 -0700
>>
>> drm/i915/vlv: check port in infoframe_enabled v2
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/i915/intel_hdmi.c | 6 +++++-
>> 1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>> index 7774ca2b9bdf..65bc3867dda2 100644
>> --- a/drivers/gpu/drm/i915/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
>> @@ -223,10 +223,14 @@ static bool ibx_infoframe_enabled(struct drm_encoder *encoder)
>> struct drm_device *dev = encoder->dev;
>> struct drm_i915_private *dev_priv = dev->dev_private;
>> struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
>> + struct intel_digital_port *intel_dig_port = enc_to_dig_port(encoder);
>> int reg = TVIDEO_DIP_CTL(intel_crtc->pipe);
>> u32 val = I915_READ(reg);
>>
>> - return val & VIDEO_DIP_ENABLE;
>> + if (VIDEO_DIP_PORT(intel_dig_port->port) == (val & VIDEO_DIP_PORT_MASK))
>> + return val & VIDEO_DIP_ENABLE;
>> +
>> + return false;
>> }
>>
>> static void cpt_write_infoframe(struct drm_encoder *encoder,
>>
>
> Ah great, thanks Jani. R-b for both.
Both pushed to drm-intel-next-queued, thanks for the review.
BR,
Jani.
>
> Jesse
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-04-30 8:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-29 11:29 [PATCH] drm/i915/hdmi: fix vlv infoframe port check Jani Nikula
2015-04-29 12:30 ` [PATCH] drm/i915/hdmi: check port in ibx_infoframe_enabled Jani Nikula
2015-04-29 16:10 ` Jesse Barnes
2015-04-30 8:34 ` Jani Nikula [this message]
2015-05-01 2:10 ` shuang.he
2015-04-30 22:20 ` [PATCH] drm/i915/hdmi: fix vlv infoframe port check 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=87wq0u9fr9.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jbarnes@virtuousgeek.org \
--cc=rodrigo.vivi@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