Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@linux.intel.com>
To: "Ville Syrjälä" <ville.syrjala@linux.intel.com>,
	"Gabriel Feceoru" <gabriel.feceoru@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Fixed compilation error
Date: Tue, 10 May 2016 12:23:11 +0300	[thread overview]
Message-ID: <87twi69shs.fsf@intel.com> (raw)
In-Reply-To: <20160510090102.GQ4329@intel.com>

On Tue, 10 May 2016, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Tue, May 10, 2016 at 11:34:39AM +0300, Gabriel Feceoru wrote:
>> Signed-off-by: Gabriel Feceoru <gabriel.feceoru@intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
>> index 4d65f69..bedb9ef 100644
>> --- a/drivers/gpu/drm/i915/intel_hdmi.c
>> +++ b/drivers/gpu/drm/i915/intel_hdmi.c
>> @@ -1454,7 +1454,7 @@ intel_hdmi_set_edid(struct drm_connector *connector, bool force)
>>  				    intel_gmbus_get_adapter(dev_priv,
>>  				    intel_hdmi->ddc_bus));
>>  
>> -		intel_hdmi_dp_dual_mode_detect(connector);
>> +		intel_hdmi_dp_dual_mode_detect(connector, true);
>
> Presumably a merge fumble somewhere. Looks to be fine now.

Mea culpa. Already fixed.

BR,
Jani.

>
>>  
>>  		intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
>>  	}
>> -- 
>> 1.9.1

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

      reply	other threads:[~2016-05-10  9:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-10  8:34 [PATCH] drm/i915: Fixed compilation error Gabriel Feceoru
2016-05-10  9:01 ` Ville Syrjälä
2016-05-10  9:23   ` Jani Nikula [this message]

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=87twi69shs.fsf@intel.com \
    --to=jani.nikula@linux.intel.com \
    --cc=gabriel.feceoru@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=ville.syrjala@linux.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