drm: add missing flags to DRM_MODE_FLAG_ALL

Submitted by Simon Ser on Dec. 19, 2018, 1:42 p.m.

Details

Message ID JkfnSb7RDcZaOKz0nXtnmG7P1O-pKSpxs2UOikgoPjZ47GlzkKREyzwFz_6SVgqi29vKqrtFnjAWLqNVtACBTnCkuYnvBKVDVkthg9hbhsg=@emersion.fr
State New
Headers show
Series "drm: add missing flags to DRM_MODE_FLAG_ALL" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Simon Ser Dec. 19, 2018, 1:42 p.m.
I guess DRM_MODE_FLAG_PIC_AR_MASK has been overlooked.

Signed-off-by: Simon Ser <contact@emersion.fr>
---
 include/uapi/drm/drm_mode.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
index d3e0fe31efc..b8d5226c8e5 100644
--- a/include/uapi/drm/drm_mode.h
+++ b/include/uapi/drm/drm_mode.h
@@ -128,7 +128,8 @@  extern "C" {
 				 DRM_MODE_FLAG_HSKEW |		\
 				 DRM_MODE_FLAG_DBLCLK |		\
 				 DRM_MODE_FLAG_CLKDIV2 |	\
-				 DRM_MODE_FLAG_3D_MASK)
+				 DRM_MODE_FLAG_3D_MASK |	\
+				 DRM_MODE_FLAG_PIC_AR_MASK)
 
 /* DPMS flags */
 /* bit compatible with the xorg definitions. */

Comments

On Wed, Dec 19, 2018 at 01:42:41PM +0000, emersion wrote:
> I guess DRM_MODE_FLAG_PIC_AR_MASK has been overlooked.

Nope. We don't hang on to the aspect ratio flags internally
and they get wiped before we check against DRM_MODE_FLAG_ALL.
Not sure this makes any sense really, but that's how it is atm.

> 
> Signed-off-by: Simon Ser <contact@emersion.fr>
> ---
>  include/uapi/drm/drm_mode.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> index d3e0fe31efc..b8d5226c8e5 100644
> --- a/include/uapi/drm/drm_mode.h
> +++ b/include/uapi/drm/drm_mode.h
> @@ -128,7 +128,8 @@ extern "C" {
>  				 DRM_MODE_FLAG_HSKEW |		\
>  				 DRM_MODE_FLAG_DBLCLK |		\
>  				 DRM_MODE_FLAG_CLKDIV2 |	\
> -				 DRM_MODE_FLAG_3D_MASK)
> +				 DRM_MODE_FLAG_3D_MASK |	\
> +				 DRM_MODE_FLAG_PIC_AR_MASK)
>  
>  /* DPMS flags */
>  /* bit compatible with the xorg definitions. */
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Dec 19, 2018 at 04:33:01PM +0200, Ville Syrjälä wrote:
> On Wed, Dec 19, 2018 at 01:42:41PM +0000, emersion wrote:
> > I guess DRM_MODE_FLAG_PIC_AR_MASK has been overlooked.
> 
> Nope. We don't hang on to the aspect ratio flags internally
> and they get wiped before we check against DRM_MODE_FLAG_ALL.
> Not sure this makes any sense really, but that's how it is atm.

Aspect ratio is disabled because the uapi didn't work out, SNA blew up.

No one bothered to respin afaik. So yeah, nacked, needs to be fixed
properly.

A git blame should have brought that up too.
-Daniel

> 
> > 
> > Signed-off-by: Simon Ser <contact@emersion.fr>
> > ---
> >  include/uapi/drm/drm_mode.h | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> > index d3e0fe31efc..b8d5226c8e5 100644
> > --- a/include/uapi/drm/drm_mode.h
> > +++ b/include/uapi/drm/drm_mode.h
> > @@ -128,7 +128,8 @@ extern "C" {
> >  				 DRM_MODE_FLAG_HSKEW |		\
> >  				 DRM_MODE_FLAG_DBLCLK |		\
> >  				 DRM_MODE_FLAG_CLKDIV2 |	\
> > -				 DRM_MODE_FLAG_3D_MASK)
> > +				 DRM_MODE_FLAG_3D_MASK |	\
> > +				 DRM_MODE_FLAG_PIC_AR_MASK)
> >  
> >  /* DPMS flags */
> >  /* bit compatible with the xorg definitions. */
> > -- 
> > 2.20.1
> > 
> > 
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 
> -- 
> Ville Syrjälä
> Intel
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Wed, Dec 19, 2018 at 04:24:40PM +0100, Daniel Vetter wrote:
> On Wed, Dec 19, 2018 at 04:33:01PM +0200, Ville Syrjälä wrote:
> > On Wed, Dec 19, 2018 at 01:42:41PM +0000, emersion wrote:
> > > I guess DRM_MODE_FLAG_PIC_AR_MASK has been overlooked.
> > 
> > Nope. We don't hang on to the aspect ratio flags internally
> > and they get wiped before we check against DRM_MODE_FLAG_ALL.
> > Not sure this makes any sense really, but that's how it is atm.
> 
> Aspect ratio is disabled because the uapi didn't work out, SNA blew up.

It was fixed by the client cap.

> 
> No one bothered to respin afaik. So yeah, nacked, needs to be fixed
> properly.
> 
> A git blame should have brought that up too.
> -Daniel
> 
> > 
> > > 
> > > Signed-off-by: Simon Ser <contact@emersion.fr>
> > > ---
> > >  include/uapi/drm/drm_mode.h | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> > > index d3e0fe31efc..b8d5226c8e5 100644
> > > --- a/include/uapi/drm/drm_mode.h
> > > +++ b/include/uapi/drm/drm_mode.h
> > > @@ -128,7 +128,8 @@ extern "C" {
> > >  				 DRM_MODE_FLAG_HSKEW |		\
> > >  				 DRM_MODE_FLAG_DBLCLK |		\
> > >  				 DRM_MODE_FLAG_CLKDIV2 |	\
> > > -				 DRM_MODE_FLAG_3D_MASK)
> > > +				 DRM_MODE_FLAG_3D_MASK |	\
> > > +				 DRM_MODE_FLAG_PIC_AR_MASK)
> > >  
> > >  /* DPMS flags */
> > >  /* bit compatible with the xorg definitions. */
> > > -- 
> > > 2.20.1
> > > 
> > > 
> > > _______________________________________________
> > > dri-devel mailing list
> > > dri-devel@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > 
> > -- 
> > Ville Syrjälä
> > Intel
> > _______________________________________________
> > dri-devel mailing list
> > dri-devel@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
On Wed, Dec 19, 2018 at 05:42:34PM +0200, Ville Syrjälä wrote:
> On Wed, Dec 19, 2018 at 04:24:40PM +0100, Daniel Vetter wrote:
> > On Wed, Dec 19, 2018 at 04:33:01PM +0200, Ville Syrjälä wrote:
> > > On Wed, Dec 19, 2018 at 01:42:41PM +0000, emersion wrote:
> > > > I guess DRM_MODE_FLAG_PIC_AR_MASK has been overlooked.
> > > 
> > > Nope. We don't hang on to the aspect ratio flags internally
> > > and they get wiped before we check against DRM_MODE_FLAG_ALL.
> > > Not sure this makes any sense really, but that's how it is atm.
> > 
> > Aspect ratio is disabled because the uapi didn't work out, SNA blew up.
> 
> It was fixed by the client cap.

Then I'm as confused as you are ...
-Daniel

> 
> > 
> > No one bothered to respin afaik. So yeah, nacked, needs to be fixed
> > properly.
> > 
> > A git blame should have brought that up too.
> > -Daniel
> > 
> > > 
> > > > 
> > > > Signed-off-by: Simon Ser <contact@emersion.fr>
> > > > ---
> > > >  include/uapi/drm/drm_mode.h | 3 ++-
> > > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > > > 
> > > > diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> > > > index d3e0fe31efc..b8d5226c8e5 100644
> > > > --- a/include/uapi/drm/drm_mode.h
> > > > +++ b/include/uapi/drm/drm_mode.h
> > > > @@ -128,7 +128,8 @@ extern "C" {
> > > >  				 DRM_MODE_FLAG_HSKEW |		\
> > > >  				 DRM_MODE_FLAG_DBLCLK |		\
> > > >  				 DRM_MODE_FLAG_CLKDIV2 |	\
> > > > -				 DRM_MODE_FLAG_3D_MASK)
> > > > +				 DRM_MODE_FLAG_3D_MASK |	\
> > > > +				 DRM_MODE_FLAG_PIC_AR_MASK)
> > > >  
> > > >  /* DPMS flags */
> > > >  /* bit compatible with the xorg definitions. */
> > > > -- 
> > > > 2.20.1
> > > > 
> > > > 
> > > > _______________________________________________
> > > > dri-devel mailing list
> > > > dri-devel@lists.freedesktop.org
> > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > > 
> > > -- 
> > > Ville Syrjälä
> > > Intel
> > > _______________________________________________
> > > dri-devel mailing list
> > > dri-devel@lists.freedesktop.org
> > > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> > 
> > -- 
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
> 
> -- 
> Ville Syrjälä
> Intel