On Tue, Nov 14, 2017 at 1:32 PM, Ville Syrjala
<ville.syrjala@xxxxxxxxxxxxxxx> wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> BUILTIN, CRTC_C, CLOCK_C, and DEFULT mode types are unused. Let's
> refuse to generate them or accept them from userspace either. A
> cursory check didn't reveal any userspace code that would depend
> on these.
>
> Cc: Jose Abreu <Jose.Abreu@xxxxxxxxxxxx>
> Cc: Adam Jackson <ajax@xxxxxxxxxx>
> Cc: Keith Packard <keithp@xxxxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> include/drm/drm_modes.h | 7 ++++---
> include/uapi/drm/drm_mode.h | 14 +++++---------
> 2 files changed, 9 insertions(+), 12 deletions(-)
>
> diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h
> index 99dd815269e9..7ac61858b54e 100644
> --- a/include/drm/drm_modes.h
> +++ b/include/drm/drm_modes.h
> @@ -242,8 +242,6 @@ struct drm_display_mode {
> * A bitmask of flags, mostly about the source of a mode. Possible flags
> * are:
> *
> - * - DRM_MODE_TYPE_BUILTIN: Meant for hard-coded modes, effectively
> - * unused.
> * - DRM_MODE_TYPE_PREFERRED: Preferred mode, usually the native
> * resolution of an LCD panel. There should only be one preferred
> * mode per connector at any given time.
> @@ -253,8 +251,11 @@ struct drm_display_mode {
> * - DRM_MODE_TYPE_USERDEF: Mode defined via kernel command line
> *
> * Plus a big list of flags which shouldn't be used at all, but are
> - * still around since these flags are also used in the userspace ABI:
> + * still around since these flags are also used in the userspace ABI.
> + * We no longer accept modes with these types though:
> *
> + * - DRM_MODE_TYPE_BUILTIN: Meant for hard-coded modes, effectively
> + * unused.
> * - DRM_MODE_TYPE_DEFAULT: Again a leftover, use
> * DRM_MODE_TYPE_PREFERRED instead.
> * - DRM_MODE_TYPE_CLOCK_C and DRM_MODE_TYPE_CRTC_C: Define leftovers
> diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h
> index a7cded1c43e8..eb9b68c7c218 100644
> --- a/include/uapi/drm/drm_mode.h
> +++ b/include/uapi/drm/drm_mode.h
> @@ -38,19 +38,15 @@ extern "C" {
> #define DRM_DISPLAY_MODE_LEN 32
> #define DRM_PROP_NAME_LEN 32
>
> -#define DRM_MODE_TYPE_BUILTIN (1<<0)
> -#define DRM_MODE_TYPE_CLOCK_C ((1<<1) | DRM_MODE_TYPE_BUILTIN)
> -#define DRM_MODE_TYPE_CRTC_C ((1<<2) | DRM_MODE_TYPE_BUILTIN)
> +#define DRM_MODE_TYPE_BUILTIN (1<<0) /* deprecated */
> +#define DRM_MODE_TYPE_CLOCK_C ((1<<1) | DRM_MODE_TYPE_BUILTIN) /* deprecated */
> +#define DRM_MODE_TYPE_CRTC_C ((1<<2) | DRM_MODE_TYPE_BUILTIN) /* deprecated */
> #define DRM_MODE_TYPE_PREFERRED (1<<3)
> -#define DRM_MODE_TYPE_DEFAULT (1<<4)
> +#define DRM_MODE_TYPE_DEFAULT (1<<4) /* deprecated */
> #define DRM_MODE_TYPE_USERDEF (1<<5)
> #define DRM_MODE_TYPE_DRIVER (1<<6)
>
> -#define DRM_MODE_TYPE_ALL (DRM_MODE_TYPE_BUILTIN | \
> - DRM_MODE_TYPE_CLOCK_C | \
> - DRM_MODE_TYPE_CRTC_C | \
> - DRM_MODE_TYPE_PREFERRED | \
> - DRM_MODE_TYPE_DEFAULT | \
> +#define DRM_MODE_TYPE_ALL (DRM_MODE_TYPE_PREFERRED | \
> DRM_MODE_TYPE_USERDEF | \
> DRM_MODE_TYPE_DRIVER)
>
> --
> 2.13.6
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
