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

Commit fb439640 authored by Adam Jackson's avatar Adam Jackson Committed by Dave Airlie
Browse files

drm: Remove unused fields from drm_display_info 



Signed-off-by: default avatarAdam Jackson <ajax@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent bf79cb91

drivers/gpu/drm/drm_edid.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -1655,23 +1655,8 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid) 
	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))

	if (quirks & (EDID_QUIRK_PREFER_LARGE_60 | EDID_QUIRK_PREFER_LARGE_75))

		edid_fixup_preferred(connector, quirks);

		edid_fixup_preferred(connector, quirks);





	connector->display_info.serration_vsync = (edid->input & DRM_EDID_INPUT_SERRATION_VSYNC) ? 1 : 0;

	connector->display_info.sync_on_green = (edid->input & DRM_EDID_INPUT_SYNC_ON_GREEN) ? 1 : 0;

	connector->display_info.composite_sync = (edid->input & DRM_EDID_INPUT_COMPOSITE_SYNC) ? 1 : 0;

	connector->display_info.separate_syncs = (edid->input & DRM_EDID_INPUT_SEPARATE_SYNCS) ? 1 : 0;

	connector->display_info.blank_to_black = (edid->input & DRM_EDID_INPUT_BLANK_TO_BLACK) ? 1 : 0;

	connector->display_info.video_level = (edid->input & DRM_EDID_INPUT_VIDEO_LEVEL) >> 5;

	connector->display_info.digital = (edid->input & DRM_EDID_INPUT_DIGITAL) ? 1 : 0;

	connector->display_info.width_mm = edid->width_cm * 10;

	connector->display_info.width_mm = edid->width_cm * 10;

	connector->display_info.height_mm = edid->height_cm * 10;

	connector->display_info.height_mm = edid->height_cm * 10;

	connector->display_info.gamma = edid->gamma;

	connector->display_info.gtf_supported = (edid->features & DRM_EDID_FEATURE_DEFAULT_GTF) ? 1 : 0;

	connector->display_info.standard_color = (edid->features & DRM_EDID_FEATURE_STANDARD_COLOR) ? 1 : 0;

	connector->display_info.display_type = (edid->features & DRM_EDID_FEATURE_DISPLAY_TYPE) >> 3;

	connector->display_info.active_off_supported = (edid->features & DRM_EDID_FEATURE_PM_ACTIVE_OFF) ? 1 : 0;

	connector->display_info.suspend_supported = (edid->features & DRM_EDID_FEATURE_PM_SUSPEND) ? 1 : 0;

	connector->display_info.standby_supported = (edid->features & DRM_EDID_FEATURE_PM_STANDBY) ? 1 : 0;

	connector->display_info.gamma = edid->gamma;





	return num_modes;

	return num_modes;

}

}

include/drm/drm_crtc.h

+1 −34
Original line number Original line Diff line number Diff line
@@ -190,49 +190,16 @@ enum subpixel_order { 
 */

 */

struct drm_display_info {

struct drm_display_info {

	char name[DRM_DISPLAY_INFO_LEN];

	char name[DRM_DISPLAY_INFO_LEN];

	/* Input info */



	bool serration_vsync;

	bool sync_on_green;

	bool composite_sync;

	bool separate_syncs;

	bool blank_to_black;

	unsigned char video_level;

	bool digital;

	/* Physical size */

	/* Physical size */

        unsigned int width_mm;

        unsigned int width_mm;

	unsigned int height_mm;

	unsigned int height_mm;





	/* Display parameters */

	unsigned char gamma; /* FIXME: storage format */

	bool gtf_supported;

	bool standard_color;

	enum {

		monochrome = 0,

		rgb,

		other,

		unknown,

	} display_type;

	bool active_off_supported;

	bool suspend_supported;

	bool standby_supported;



	/* Color info FIXME: storage format */

	unsigned short redx, redy;

	unsigned short greenx, greeny;

	unsigned short bluex, bluey;

	unsigned short whitex, whitey;



	/* Clock limits FIXME: storage format */

	/* Clock limits FIXME: storage format */

	unsigned int min_vfreq, max_vfreq;

	unsigned int min_vfreq, max_vfreq;

	unsigned int min_hfreq, max_hfreq;

	unsigned int min_hfreq, max_hfreq;

	unsigned int pixel_clock;

	unsigned int pixel_clock;





	/* White point indices FIXME: storage format */

	unsigned int wpx1, wpy1;

	unsigned int wpgamma1;

	unsigned int wpx2, wpy2;

	unsigned int wpgamma2;



	enum subpixel_order subpixel_order;

	enum subpixel_order subpixel_order;





	char *raw_edid; /* if any */

	char *raw_edid; /* if any */