[RESEND PATCH] drm/doc: Document drm_add_modes_noedid() usage

2014-12-11 Thread Daniel Vetter
On Wed, Dec 10, 2014 at 04:11:46PM -0500, Alex Deucher wrote:
> On Wed, Dec 10, 2014 at 2:11 PM, Laurent Pinchart
>  wrote:
> > From: Laurent Pinchart 
> >
> > And fix a spelling mistake.
> >
> > Signed-off-by: Laurent Pinchart 
> 
> Reviewed-by: Alex Deucher 

Merged to drm-misc, thanks.
-Daniel

> 
> > ---
> >  Documentation/DocBook/drm.tmpl | 24 +++-
> >  1 file changed, 19 insertions(+), 5 deletions(-)
> >
> > I've had this patch in my tree for way too long, it's time to get it to
> > mainline or drop it. I of course vote for the former as I wouldn't submit it
> > otherwise.
> >
> > diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
> > index 60c1063d4178..a5024f6aaf53 100644
> > --- a/Documentation/DocBook/drm.tmpl
> > +++ b/Documentation/DocBook/drm.tmpl
> > @@ -1947,10 +1947,16 @@ void intel_crt_init(struct drm_device *dev)
> >  and then retrieves a list of modes by calling the connector
> >  get_modes helper operation.
> >
> > + 
> > +If the helper operation returns no mode, and if the connector 
> > status
> > +is connector_status_connected, standard VESA DMT modes up to
> > +1024x768 are automatically added to the modes list by a call to
> > +drm_add_modes_noedid.
> > +  
> >
> > -The function filters out modes larger than
> > +The function then filters out modes larger than
> >  max_width and 
> > max_height
> > -if specified. It then calls the optional connector
> > +if specified. It finally calls the optional connector
> >  mode_valid helper operation for each 
> > mode in
> >  the probed list to check whether the mode is valid for the 
> > connector.
> >
> > @@ -2090,12 +2096,20 @@ void intel_crt_init(struct drm_device *dev)
> >int (*get_modes)(struct drm_connector 
> > *connector);
> >
> >  Fill the connector's probed_modes 
> > list
> > -by parsing EDID data with 
> > drm_add_edid_modes or
> > -calling drm_mode_probed_add directly for 
> > every
> > +by parsing EDID data with 
> > drm_add_edid_modes,
> > +adding standard VESA DMT modes with 
> > drm_add_modes_noedid,
> > +or calling drm_mode_probed_add directly 
> > for every
> >  supported mode and return the number of modes it has detected. 
> > This
> >  operation is mandatory.
> >
> >
> > +Note that the caller function will automatically add standard 
> > VESA
> > +DMT modes up to 1024x768 if the 
> > get_modes
> > +helper operation returns no mode and if the connector status is
> > +connector_status_connected. There is no need to call
> > +drm_add_edid_modes manually in that case.
> > +  
> > +  
> >  When adding modes manually the driver creates each mode with a 
> > call to
> >  drm_mode_create and must fill the 
> > following fields.
> >  
> > @@ -2292,7 +2306,7 @@ void intel_crt_init(struct drm_device *dev)
> >  drm_helper_probe_single_connector_modes.
> >
> >
> > -When parsing EDID data, 
> > drm_add_edid_modes fill the
> > +When parsing EDID data, 
> > drm_add_edid_modes fills the
> >  connector display_info
> >  width_mm and
> >  height_mm fields. When creating 
> > modes
> > --
> > Regards,
> >
> > Laurent Pinchart
> >
> > ___
> > dri-devel mailing list
> > dri-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch


[RESEND PATCH] drm/doc: Document drm_add_modes_noedid() usage

2014-12-10 Thread Laurent Pinchart
From: Laurent Pinchart 

And fix a spelling mistake.

Signed-off-by: Laurent Pinchart 
---
 Documentation/DocBook/drm.tmpl | 24 +++-
 1 file changed, 19 insertions(+), 5 deletions(-)

I've had this patch in my tree for way too long, it's time to get it to
mainline or drop it. I of course vote for the former as I wouldn't submit it
otherwise.

diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 60c1063d4178..a5024f6aaf53 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -1947,10 +1947,16 @@ void intel_crt_init(struct drm_device *dev)
 and then retrieves a list of modes by calling the connector
 get_modes helper operation.
   
+ 
+If the helper operation returns no mode, and if the connector 
status
+is connector_status_connected, standard VESA DMT modes up to
+1024x768 are automatically added to the modes list by a call to
+drm_add_modes_noedid.
+  
   
-The function filters out modes larger than
+The function then filters out modes larger than
 max_width and 
max_height
-if specified. It then calls the optional connector
+if specified. It finally calls the optional connector
 mode_valid helper operation for each mode 
in
 the probed list to check whether the mode is valid for the 
connector.
   
@@ -2090,12 +2096,20 @@ void intel_crt_init(struct drm_device *dev)
   int (*get_modes)(struct drm_connector 
*connector);
   
 Fill the connector's probed_modes list
-by parsing EDID data with drm_add_edid_modes 
or
-calling drm_mode_probed_add directly for every
+by parsing EDID data with drm_add_edid_modes,
+adding standard VESA DMT modes with 
drm_add_modes_noedid,
+or calling drm_mode_probed_add directly for 
every
 supported mode and return the number of modes it has detected. This
 operation is mandatory.
   
   
+Note that the caller function will automatically add standard VESA
+DMT modes up to 1024x768 if the get_modes
+helper operation returns no mode and if the connector status is
+connector_status_connected. There is no need to call
+drm_add_edid_modes manually in that case.
+  
+  
 When adding modes manually the driver creates each mode with a 
call to
 drm_mode_create and must fill the following 
fields.
 
@@ -2292,7 +2306,7 @@ void intel_crt_init(struct drm_device *dev)
 drm_helper_probe_single_connector_modes.
   
   
-When parsing EDID data, drm_add_edid_modes 
fill the
+When parsing EDID data, drm_add_edid_modes 
fills the
 connector display_info
 width_mm and
 height_mm fields. When creating modes
-- 
Regards,

Laurent Pinchart



[RESEND PATCH] drm/doc: Document drm_add_modes_noedid() usage

2014-12-10 Thread Alex Deucher
On Wed, Dec 10, 2014 at 2:11 PM, Laurent Pinchart
 wrote:
> From: Laurent Pinchart 
>
> And fix a spelling mistake.
>
> Signed-off-by: Laurent Pinchart 

Reviewed-by: Alex Deucher 

> ---
>  Documentation/DocBook/drm.tmpl | 24 +++-
>  1 file changed, 19 insertions(+), 5 deletions(-)
>
> I've had this patch in my tree for way too long, it's time to get it to
> mainline or drop it. I of course vote for the former as I wouldn't submit it
> otherwise.
>
> diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
> index 60c1063d4178..a5024f6aaf53 100644
> --- a/Documentation/DocBook/drm.tmpl
> +++ b/Documentation/DocBook/drm.tmpl
> @@ -1947,10 +1947,16 @@ void intel_crt_init(struct drm_device *dev)
>  and then retrieves a list of modes by calling the connector
>  get_modes helper operation.
>
> + 
> +If the helper operation returns no mode, and if the connector 
> status
> +is connector_status_connected, standard VESA DMT modes up to
> +1024x768 are automatically added to the modes list by a call to
> +drm_add_modes_noedid.
> +  
>
> -The function filters out modes larger than
> +The function then filters out modes larger than
>  max_width and 
> max_height
> -if specified. It then calls the optional connector
> +if specified. It finally calls the optional connector
>  mode_valid helper operation for each 
> mode in
>  the probed list to check whether the mode is valid for the 
> connector.
>
> @@ -2090,12 +2096,20 @@ void intel_crt_init(struct drm_device *dev)
>int (*get_modes)(struct drm_connector 
> *connector);
>
>  Fill the connector's probed_modes list
> -by parsing EDID data with 
> drm_add_edid_modes or
> -calling drm_mode_probed_add directly for 
> every
> +by parsing EDID data with 
> drm_add_edid_modes,
> +adding standard VESA DMT modes with 
> drm_add_modes_noedid,
> +or calling drm_mode_probed_add directly for 
> every
>  supported mode and return the number of modes it has detected. 
> This
>  operation is mandatory.
>
>
> +Note that the caller function will automatically add standard 
> VESA
> +DMT modes up to 1024x768 if the 
> get_modes
> +helper operation returns no mode and if the connector status is
> +connector_status_connected. There is no need to call
> +drm_add_edid_modes manually in that case.
> +  
> +  
>  When adding modes manually the driver creates each mode with a 
> call to
>  drm_mode_create and must fill the following 
> fields.
>  
> @@ -2292,7 +2306,7 @@ void intel_crt_init(struct drm_device *dev)
>  drm_helper_probe_single_connector_modes.
>
>
> -When parsing EDID data, drm_add_edid_modes 
> fill the
> +When parsing EDID data, drm_add_edid_modes 
> fills the
>  connector display_info
>  width_mm and
>  height_mm fields. When creating modes
> --
> Regards,
>
> Laurent Pinchart
>
> ___
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel