drm/i915/ehl: All EHL ports are combo phys (v2)
diff mbox series

Message ID 20190320211547.519266-1-bob.j.paauwe@intel.com
State New
Headers show
Series
  • drm/i915/ehl: All EHL ports are combo phys (v2)
Related show

Commit Message

Paauwe, Bob J March 20, 2019, 9:15 p.m. UTC
Unlike ICL, all of the output ports are combo phys so just return
true in intel_port_is_combophy for all EHL ports to indicate that.

v2: Return false in intel_port_is_tc since no EHL ports are TC. (Jose)

Cc: Jose Souza <jose.souza@intel.com>
Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Souza, Jose March 20, 2019, 9:20 p.m. UTC | #1
On Wed, 2019-03-20 at 14:15 -0700, Bob Paauwe wrote:
> Unlike ICL, all of the output ports are combo phys so just return
> true in intel_port_is_combophy for all EHL ports to indicate that.
> 
> v2: Return false in intel_port_is_tc since no EHL ports are TC.
> (Jose)

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

> 
> Cc: Jose Souza <jose.souza@intel.com>
> Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 2b25098d47a9..094456843c4a 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6170,6 +6170,9 @@ bool intel_port_is_combophy(struct
> drm_i915_private *dev_priv, enum port port)
>  	if (port == PORT_NONE)
>  		return false;
>  
> +	if (IS_ELKHARTLAKE(dev_priv))
> +		return port <= PORT_C;
> +
>  	if (INTEL_GEN(dev_priv) >= 11)
>  		return port <= PORT_B;
>  
> @@ -6178,7 +6181,7 @@ bool intel_port_is_combophy(struct
> drm_i915_private *dev_priv, enum port port)
>  
>  bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port
> port)
>  {
> -	if (INTEL_GEN(dev_priv) >= 11)
> +	if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
>  		return port >= PORT_C && port <= PORT_F;
>  
>  	return false;
kbuild test robot March 21, 2019, 8:09 a.m. UTC | #2
Hi Bob,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on drm-intel/for-linux-next]
[also build test ERROR on next-20190320]
[cannot apply to v5.1-rc1]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Bob-Paauwe/drm-i915-ehl-All-EHL-ports-are-combo-phys-v2/20190321-145619
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-randconfig-x000-201911 (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   drivers/gpu//drm/i915/intel_display.c: In function 'intel_port_is_combophy':
>> drivers/gpu//drm/i915/intel_display.c:6183:6: error: implicit declaration of function 'IS_ELKHARTLAKE'; did you mean 'IS_KABYLAKE'? [-Werror=implicit-function-declaration]
     if (IS_ELKHARTLAKE(dev_priv))
         ^~~~~~~~~~~~~~
         IS_KABYLAKE
   cc1: some warnings being treated as errors

vim +6183 drivers/gpu//drm/i915/intel_display.c

  6177	
  6178	bool intel_port_is_combophy(struct drm_i915_private *dev_priv, enum port port)
  6179	{
  6180		if (port == PORT_NONE)
  6181			return false;
  6182	
> 6183		if (IS_ELKHARTLAKE(dev_priv))
  6184			return port <= PORT_C;
  6185	
  6186		if (INTEL_GEN(dev_priv) >= 11)
  6187			return port <= PORT_B;
  6188	
  6189		return false;
  6190	}
  6191	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
kbuild test robot March 21, 2019, 8:37 a.m. UTC | #3
Hi Bob,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on next-20190320]
[cannot apply to v5.1-rc1]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Bob-Paauwe/drm-i915-ehl-All-EHL-ports-are-combo-phys-v2/20190321-145619
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
config: i386-randconfig-x073-201911 (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All warnings (new ones prefixed by >>):

   In file included from include/linux/string.h:6:0,
                    from include/linux/uuid.h:20,
                    from include/linux/mod_devicetable.h:13,
                    from include/linux/i2c.h:29,
                    from drivers/gpu/drm/i915/intel_display.c:27:
   drivers/gpu/drm/i915/intel_display.c: In function 'intel_port_is_combophy':
   drivers/gpu/drm/i915/intel_display.c:6183:6: error: implicit declaration of function 'IS_ELKHARTLAKE'; did you mean 'IS_KABYLAKE'? [-Werror=implicit-function-declaration]
     if (IS_ELKHARTLAKE(dev_priv))
         ^
   include/linux/compiler.h:58:30: note: in definition of macro '__trace_if'
     if (__builtin_constant_p(!!(cond)) ? !!(cond) :   \
                                 ^~~~
>> drivers/gpu/drm/i915/intel_display.c:6183:2: note: in expansion of macro 'if'
     if (IS_ELKHARTLAKE(dev_priv))
     ^~
   cc1: some warnings being treated as errors

vim +/if +6183 drivers/gpu/drm/i915/intel_display.c

  6177	
  6178	bool intel_port_is_combophy(struct drm_i915_private *dev_priv, enum port port)
  6179	{
  6180		if (port == PORT_NONE)
  6181			return false;
  6182	
> 6183		if (IS_ELKHARTLAKE(dev_priv))
  6184			return port <= PORT_C;
  6185	
  6186		if (INTEL_GEN(dev_priv) >= 11)
  6187			return port <= PORT_B;
  6188	
  6189		return false;
  6190	}
  6191	

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Lucas De Marchi April 2, 2019, 10:17 p.m. UTC | #4
On Wed, Mar 20, 2019 at 2:20 PM Souza, Jose <jose.souza@intel.com> wrote:
>
> On Wed, 2019-03-20 at 14:15 -0700, Bob Paauwe wrote:
> > Unlike ICL, all of the output ports are combo phys so just return
> > true in intel_port_is_combophy for all EHL ports to indicate that.
> >
> > v2: Return false in intel_port_is_tc since no EHL ports are TC.
> > (Jose)
>
> Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

I removed the (v2) from the first line of the commit message since we
don't add that normally and pushed.

Thanks.
Lucas De Marchi


>
> >
> > Cc: Jose Souza <jose.souza@intel.com>
> > Signed-off-by: Bob Paauwe <bob.j.paauwe@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_display.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_display.c
> > b/drivers/gpu/drm/i915/intel_display.c
> > index 2b25098d47a9..094456843c4a 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -6170,6 +6170,9 @@ bool intel_port_is_combophy(struct
> > drm_i915_private *dev_priv, enum port port)
> >       if (port == PORT_NONE)
> >               return false;
> >
> > +     if (IS_ELKHARTLAKE(dev_priv))
> > +             return port <= PORT_C;
> > +
> >       if (INTEL_GEN(dev_priv) >= 11)
> >               return port <= PORT_B;
> >
> > @@ -6178,7 +6181,7 @@ bool intel_port_is_combophy(struct
> > drm_i915_private *dev_priv, enum port port)
> >
> >  bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port
> > port)
> >  {
> > -     if (INTEL_GEN(dev_priv) >= 11)
> > +     if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
> >               return port >= PORT_C && port <= PORT_F;
> >
> >       return false;
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



--
Lucas De Marchi

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2b25098d47a9..094456843c4a 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6170,6 +6170,9 @@  bool intel_port_is_combophy(struct drm_i915_private *dev_priv, enum port port)
 	if (port == PORT_NONE)
 		return false;
 
+	if (IS_ELKHARTLAKE(dev_priv))
+		return port <= PORT_C;
+
 	if (INTEL_GEN(dev_priv) >= 11)
 		return port <= PORT_B;
 
@@ -6178,7 +6181,7 @@  bool intel_port_is_combophy(struct drm_i915_private *dev_priv, enum port port)
 
 bool intel_port_is_tc(struct drm_i915_private *dev_priv, enum port port)
 {
-	if (INTEL_GEN(dev_priv) >= 11)
+	if (INTEL_GEN(dev_priv) >= 11 && !IS_ELKHARTLAKE(dev_priv))
 		return port >= PORT_C && port <= PORT_F;
 
 	return false;