diff mbox

drm/i915/cnl: Symmetric scalers for each pipe

Message ID 1507551967-8584-1-git-send-email-mika.kahola@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Mika Kahola Oct. 9, 2017, 12:26 p.m. UTC
For Cannonlake the number of scalers for each pipe is 2. Let's increase
the number of scalers for pipe C.

Signed-off-by: Mika Kahola <mika.kahola@intel.com>
---
 drivers/gpu/drm/i915/intel_device_info.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Ville Syrjälä Oct. 11, 2017, 12:43 p.m. UTC | #1
On Mon, Oct 09, 2017 at 03:26:07PM +0300, Mika Kahola wrote:
> For Cannonlake the number of scalers for each pipe is 2. Let's increase
> the number of scalers for pipe C.
> 
> Signed-off-by: Mika Kahola <mika.kahola@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_device_info.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 875d428..b2ab6cb 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -347,7 +347,10 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
>  	struct intel_device_info *info = mkwrite_device_info(dev_priv);
>  	enum pipe pipe;
>  
> -	if (INTEL_GEN(dev_priv) >= 9) {
> +	if (IS_CANNONLAKE(dev_priv)) {

GEN >= 10 would be a bit more future proof.

> +		for_each_pipe(dev_priv, pipe)
> +			info->num_scalers[pipe] = 2;
> +	} else if (INTEL_GEN(dev_priv) >= 9) {
>  		info->num_scalers[PIPE_A] = 2;
>  		info->num_scalers[PIPE_B] = 2;
>  		info->num_scalers[PIPE_C] = 1;
> -- 
> 2.7.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Mika Kahola Oct. 11, 2017, 1:08 p.m. UTC | #2
On Wed, 2017-10-11 at 15:43 +0300, Ville Syrjälä wrote:
> On Mon, Oct 09, 2017 at 03:26:07PM +0300, Mika Kahola wrote:
> > 
> > For Cannonlake the number of scalers for each pipe is 2. Let's
> > increase
> > the number of scalers for pipe C.
> > 
> > Signed-off-by: Mika Kahola <mika.kahola@intel.com>
> > ---
> >  drivers/gpu/drm/i915/intel_device_info.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/intel_device_info.c
> > b/drivers/gpu/drm/i915/intel_device_info.c
> > index 875d428..b2ab6cb 100644
> > --- a/drivers/gpu/drm/i915/intel_device_info.c
> > +++ b/drivers/gpu/drm/i915/intel_device_info.c
> > @@ -347,7 +347,10 @@ void intel_device_info_runtime_init(struct
> > drm_i915_private *dev_priv)
> >  	struct intel_device_info *info =
> > mkwrite_device_info(dev_priv);
> >  	enum pipe pipe;
> >  
> > -	if (INTEL_GEN(dev_priv) >= 9) {
> > +	if (IS_CANNONLAKE(dev_priv)) {
> GEN >= 10 would be a bit more future proof.
That's true. I actually tried this on trybot but the outcome wasn't
clean. Maybe I just switch back and give CI another go.

> 
> > 
> > +		for_each_pipe(dev_priv, pipe)
> > +			info->num_scalers[pipe] = 2;
> > +	} else if (INTEL_GEN(dev_priv) >= 9) {
> >  		info->num_scalers[PIPE_A] = 2;
> >  		info->num_scalers[PIPE_B] = 2;
> >  		info->num_scalers[PIPE_C] = 1;
> > -- 
> > 2.7.4
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Nabendu Maiti Oct. 24, 2017, 10:05 a.m. UTC | #3
On 10/11/2017 6:38 PM, Mika Kahola wrote:
> On Wed, 2017-10-11 at 15:43 +0300, Ville Syrjälä wrote:
>> On Mon, Oct 09, 2017 at 03:26:07PM +0300, Mika Kahola wrote:
>>> For Cannonlake the number of scalers for each pipe is 2. Let's
>>> increase
>>> the number of scalers for pipe C.
>>>
>>> Signed-off-by: Mika Kahola <mika.kahola@intel.com>
>>> ---
>>>   drivers/gpu/drm/i915/intel_device_info.c | 5 ++++-
>>>   1 file changed, 4 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/intel_device_info.c
>>> b/drivers/gpu/drm/i915/intel_device_info.c
>>> index 875d428..b2ab6cb 100644
>>> --- a/drivers/gpu/drm/i915/intel_device_info.c
>>> +++ b/drivers/gpu/drm/i915/intel_device_info.c
>>> @@ -347,7 +347,10 @@ void intel_device_info_runtime_init(struct
>>> drm_i915_private *dev_priv)
>>>   	struct intel_device_info *info =
>>> mkwrite_device_info(dev_priv);
>>>   	enum pipe pipe;
>>>   
>>> -	if (INTEL_GEN(dev_priv) >= 9) {
>>> +	if (IS_CANNONLAKE(dev_priv)) {
>> GEN >= 10 would be a bit more future proof.
> That's true. I actually tried this on trybot but the outcome wasn't
> clean. Maybe I just switch back and give CI another go.
Similar patch I submitted in internal (merged).
>
>>> +		for_each_pipe(dev_priv, pipe)
>>> +			info->num_scalers[pipe] = 2;
>>> +	} else if (INTEL_GEN(dev_priv) >= 9) {
>>>   		info->num_scalers[PIPE_A] = 2;
>>>   		info->num_scalers[PIPE_B] = 2;
>>>   		info->num_scalers[PIPE_C] = 1;
>>> -- 
>>> 2.7.4
>>>
>>> _______________________________________________
>>> Intel-gfx mailing list
>>> Intel-gfx@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Regards,
Nabendu
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 875d428..b2ab6cb 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -347,7 +347,10 @@  void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
 	struct intel_device_info *info = mkwrite_device_info(dev_priv);
 	enum pipe pipe;
 
-	if (INTEL_GEN(dev_priv) >= 9) {
+	if (IS_CANNONLAKE(dev_priv)) {
+		for_each_pipe(dev_priv, pipe)
+			info->num_scalers[pipe] = 2;
+	} else if (INTEL_GEN(dev_priv) >= 9) {
 		info->num_scalers[PIPE_A] = 2;
 		info->num_scalers[PIPE_B] = 2;
 		info->num_scalers[PIPE_C] = 1;