Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3004db0 authored by Shayenne Moura's avatar Shayenne Moura Committed by Daniel Vetter
Browse files

drm: Complete remove drm_mode_object dependency 



This patch finalizes the KMS cleanup task dependency from
drm_display_mode. It removes the use of drm_mode_object
from drm_display_mode struct and it removes the use of
base.id and base.type from drm_display_mode struct
print string.

Signed-off-by: default avatarShayenne Moura <shayenneluzmoura@gmail.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/f40e904e665fe3e3ae3ae86e837024bee3b8ca6d.1547214023.git.shayenneluzmoura@gmail.com
parent 0e691bc7

include/drm/drm_modes.h

+3 −18
Original line number Diff line number Diff line
@@ -136,8 +136,7 @@ enum drm_mode_status { 
	.hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \

	.htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \

	.vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \

	.vscan = (vs), .flags = (f), \

	.base.type = DRM_MODE_OBJECT_MODE

	.vscan = (vs), .flags = (f)



#define CRTC_INTERLACE_HALVE_V	(1 << 0) /* halve V values for interlacing */

#define CRTC_STEREO_DOUBLE	(1 << 1) /* adjust timings for stereo modes */
@@ -213,20 +212,6 @@ struct drm_display_mode { 
	 */

	struct list_head head;



	/**

	 * @base:

	 *

	 * A display mode is a normal modeset object, possibly including public

	 * userspace id.

	 *

	 * FIXME:

	 *

	 * This can probably be removed since the entire concept of userspace

	 * managing modes explicitly has never landed in upstream kernel mode

	 * setting support.

	 */

	struct drm_mode_object base;



	/**

	 * @name:

	 *
@@ -429,14 +414,14 @@ struct drm_display_mode { 
/**

 * DRM_MODE_FMT - printf string for &struct drm_display_mode

 */

#define DRM_MODE_FMT    "%d:\"%s\" %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x"

#define DRM_MODE_FMT    "\"%s\": %d %d %d %d %d %d %d %d %d %d 0x%x 0x%x"



/**

 * DRM_MODE_ARG - printf arguments for &struct drm_display_mode

 * @m: display mode

 */

#define DRM_MODE_ARG(m) \

	(m)->base.id, (m)->name, (m)->vrefresh, (m)->clock, \

	(m)->name, (m)->vrefresh, (m)->clock, \

	(m)->hdisplay, (m)->hsync_start, (m)->hsync_end, (m)->htotal, \

	(m)->vdisplay, (m)->vsync_start, (m)->vsync_end, (m)->vtotal, \

	(m)->type, (m)->flags