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

Commit 5744bfc6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm: probe_helper: Hide ugly ifdef"

parents bef92371 7887be21

drivers/gpu/drm/drm_probe_helper.c

+0 −2
Original line number Diff line number Diff line
@@ -205,10 +205,8 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect 
		count = drm_add_edid_modes(connector, edid);

		drm_edid_to_eld(connector, edid);

	} else {

#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE

		count = drm_load_edid_firmware(connector);

		if (count == 0)

#endif

			count = (*connector_funcs->get_modes)(connector);

	}

include/drm/drm_edid.h

+8 −0
Original line number Diff line number Diff line
@@ -347,7 +347,15 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb); 
int drm_av_sync_delay(struct drm_connector *connector,

		      const struct drm_display_mode *mode);

struct drm_connector *drm_select_eld(struct drm_encoder *encoder);



#ifdef CONFIG_DRM_LOAD_EDID_FIRMWARE

int drm_load_edid_firmware(struct drm_connector *connector);

#else

static inline int drm_load_edid_firmware(struct drm_connector *connector)

{

	return 0;

}

#endif



int

drm_hdmi_avi_infoframe_from_display_mode(struct hdmi_avi_infoframe *frame,