Commit 8ffb78f3 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'exynos-drm-next-for-v6.1' of... 

Merge tag 'exynos-drm-next-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

Cleanup
- Use drm_display_info.is_hdmi instead of drm_detect_hdmi_monitor()
  for efficiency.
Fixup
- Correct return type of mixer_mode_valid and hdmi_mode_valid functions.
  This was reported by Dan Carpenter, https://github.com/ClangBuiltLinux/linux/issues/1703



Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220926020723.270065-1-inki.dae@samsung.com
parents 32030592 12612555

drivers/gpu/drm/exynos/exynos_hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ static int hdmi_get_modes(struct drm_connector *connector) 
	if (!edid)

		return -ENODEV;



	hdata->dvi_mode = !drm_detect_hdmi_monitor(edid);

	hdata->dvi_mode = !connector->display_info.is_hdmi;

	DRM_DEV_DEBUG_KMS(hdata->dev, "%s : width[%d] x height[%d]\n",

			  (hdata->dvi_mode ? "dvi monitor" : "hdmi monitor"),

			  edid->width_cm, edid->height_cm);
@@ -922,7 +922,7 @@ static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock) 
	return -EINVAL;

}



static int hdmi_mode_valid(struct drm_connector *connector,

static enum drm_mode_status hdmi_mode_valid(struct drm_connector *connector,

					    struct drm_display_mode *mode)

{

	struct hdmi_context *hdata = connector_to_hdmi(connector);

drivers/gpu/drm/exynos/exynos_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ static void mixer_atomic_disable(struct exynos_drm_crtc *crtc) 
	clear_bit(MXR_BIT_POWERED, &ctx->flags);

}



static int mixer_mode_valid(struct exynos_drm_crtc *crtc,

static enum drm_mode_status mixer_mode_valid(struct exynos_drm_crtc *crtc,

		const struct drm_display_mode *mode)

{

	struct mixer_context *ctx = crtc->ctx;