diff mbox

drm/i915: Fixed compilation error

Message ID 1462869279-11428-1-git-send-email-gabriel.feceoru@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Feceoru, Gabriel May 10, 2016, 8:34 a.m. UTC 
Signed-off-by: Gabriel Feceoru <gabriel.feceoru@intel.com>
---
 drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ville Syrjälä May 10, 2016, 9:01 a.m. UTC | #1 
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.

>  
>  		intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
>  	}
> -- 
> 1.9.1
Jani Nikula May 10, 2016, 9:23 a.m. UTC | #2 
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
diff mbox

Patch

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);
 
 		intel_display_power_put(dev_priv, POWER_DOMAIN_GMBUS);
 	}