Re: [Intel-gfx] [PATCH 1/4] drm/i915: Move drm_vblank_init() to i915_load_modeset_init()

2018-11-08 Thread Souza, Jose 
On Thu, 2018-11-08 at 17:33 +0200, Ville Syrjälä wrote:
> On Wed, Nov 07, 2018 at 04:16:44PM -0800, José Roberto de Souza
> wrote:
> > i915_load_modeset_init() is a more suitable place than
> > i915_driver_load() as vblank is part of modeset.
> > 
> > Cc: Jani Nikula 
> > Cc: Ville Syrjälä 
> > Signed-off-by: José Roberto de Souza 
> 
> Reviewed-by: Ville Syrjälä 

Thanks for the reviews, patches pushed to drm-intel-next-queued

> 
> > ---
> >  drivers/gpu/drm/i915/i915_drv.c | 19 +++
> >  1 file changed, 7 insertions(+), 12 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/i915_drv.c
> > b/drivers/gpu/drm/i915/i915_drv.c
> > index acb516308262..b9108a5821a5 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.c
> > +++ b/drivers/gpu/drm/i915/i915_drv.c
> > @@ -645,6 +645,13 @@ static int i915_load_modeset_init(struct
> > drm_device *dev)
> > if (i915_inject_load_failure())
> > return -ENODEV;
> >  
> > +   if (INTEL_INFO(dev_priv)->num_pipes) {
> > +   ret = drm_vblank_init(_priv->drm,
> > + INTEL_INFO(dev_priv)->num_pipes);
> > +   if (ret)
> > +   goto out;
> > +   }
> > +
> > intel_bios_init(dev_priv);
> >  
> > /* If we have > 1 VGA cards, then we need to arbitrate access
> > @@ -1712,18 +1719,6 @@ int i915_driver_load(struct pci_dev *pdev,
> > const struct pci_device_id *ent)
> > if (ret < 0)
> > goto out_cleanup_mmio;
> >  
> > -   /*
> > -* TODO: move the vblank init and parts of modeset init steps
> > into one
> > -* of the i915_driver_init_/i915_driver_register functions
> > according
> > -* to the role/effect of the given init step.
> > -*/
> > -   if (INTEL_INFO(dev_priv)->num_pipes) {
> > -   ret = drm_vblank_init(_priv->drm,
> > - INTEL_INFO(dev_priv)->num_pipes);
> > -   if (ret)
> > -   goto out_cleanup_hw;
> > -   }
> > -
> > ret = i915_load_modeset_init(_priv->drm);
> > if (ret < 0)
> > goto out_cleanup_hw;
> > -- 
> > 2.19.1


signature.asc
Description: This is a digitally signed message part
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 1/4] drm/i915: Move drm_vblank_init() to i915_load_modeset_init()

2018-11-08 Thread Ville Syrjälä 
On Wed, Nov 07, 2018 at 04:16:44PM -0800, José Roberto de Souza wrote:
> i915_load_modeset_init() is a more suitable place than
> i915_driver_load() as vblank is part of modeset.
> 
> Cc: Jani Nikula 
> Cc: Ville Syrjälä 
> Signed-off-by: José Roberto de Souza 

Reviewed-by: Ville Syrjälä 

> ---
>  drivers/gpu/drm/i915/i915_drv.c | 19 +++
>  1 file changed, 7 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index acb516308262..b9108a5821a5 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -645,6 +645,13 @@ static int i915_load_modeset_init(struct drm_device *dev)
>   if (i915_inject_load_failure())
>   return -ENODEV;
>  
> + if (INTEL_INFO(dev_priv)->num_pipes) {
> + ret = drm_vblank_init(_priv->drm,
> +   INTEL_INFO(dev_priv)->num_pipes);
> + if (ret)
> + goto out;
> + }
> +
>   intel_bios_init(dev_priv);
>  
>   /* If we have > 1 VGA cards, then we need to arbitrate access
> @@ -1712,18 +1719,6 @@ int i915_driver_load(struct pci_dev *pdev, const 
> struct pci_device_id *ent)
>   if (ret < 0)
>   goto out_cleanup_mmio;
>  
> - /*
> -  * TODO: move the vblank init and parts of modeset init steps into one
> -  * of the i915_driver_init_/i915_driver_register functions according
> -  * to the role/effect of the given init step.
> -  */
> - if (INTEL_INFO(dev_priv)->num_pipes) {
> - ret = drm_vblank_init(_priv->drm,
> -   INTEL_INFO(dev_priv)->num_pipes);
> - if (ret)
> - goto out_cleanup_hw;
> - }
> -
>   ret = i915_load_modeset_init(_priv->drm);
>   if (ret < 0)
>   goto out_cleanup_hw;
> -- 
> 2.19.1

-- 
Ville Syrjälä
Intel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 1/4] drm/i915: Move drm_vblank_init() to i915_load_modeset_init()

2018-11-07 Thread José Roberto de Souza 
i915_load_modeset_init() is a more suitable place than
i915_driver_load() as vblank is part of modeset.

Cc: Jani Nikula 
Cc: Ville Syrjälä 
Signed-off-by: José Roberto de Souza 
---
 drivers/gpu/drm/i915/i915_drv.c | 19 +++
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index acb516308262..b9108a5821a5 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -645,6 +645,13 @@ static int i915_load_modeset_init(struct drm_device *dev)
if (i915_inject_load_failure())
return -ENODEV;
 
+   if (INTEL_INFO(dev_priv)->num_pipes) {
+   ret = drm_vblank_init(_priv->drm,
+ INTEL_INFO(dev_priv)->num_pipes);
+   if (ret)
+   goto out;
+   }
+
intel_bios_init(dev_priv);
 
/* If we have > 1 VGA cards, then we need to arbitrate access
@@ -1712,18 +1719,6 @@ int i915_driver_load(struct pci_dev *pdev, const struct 
pci_device_id *ent)
if (ret < 0)
goto out_cleanup_mmio;
 
-   /*
-* TODO: move the vblank init and parts of modeset init steps into one
-* of the i915_driver_init_/i915_driver_register functions according
-* to the role/effect of the given init step.
-*/
-   if (INTEL_INFO(dev_priv)->num_pipes) {
-   ret = drm_vblank_init(_priv->drm,
- INTEL_INFO(dev_priv)->num_pipes);
-   if (ret)
-   goto out_cleanup_hw;
-   }
-
ret = i915_load_modeset_init(_priv->drm);
if (ret < 0)
goto out_cleanup_hw;
-- 
2.19.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx