From: "Lowry Li (Arm Technology China)" Subject: [PATCH] drm/komeda: Adds more check in mode_valid Date: Fri, 26 Jul 2019 08:06:16 +0000 Message-ID: <1564128364-23055-1-git-send-email-lowry.li@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Liviu Dudau , "james qian wang (Arm Technology China)" , "maarten.lankhorst@linux.intel.com" , "seanpaul@chromium.org" , "airlied@linux.ie" , Brian Starkey Cc: "Julien Yin (Arm Technology China)" , "Jonathan Chai (Arm Technology China)" , Ayan Halder , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , nd List-Id: dri-devel@lists.freedesktop.org This patch adds the checks for vrefresh, crtc_hdisplay and crtc_vdisplay. Signed-off-by: Lowry Li (Arm Technology China) --- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 28 ++++++++++++++++++++= +++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu= /drm/arm/display/komeda/komeda_crtc.c index 2fed1f6..017f6b6 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -403,11 +403,37 @@ unsigned long komeda_crtc_get_aclk(struct komeda_crtc= _state *kcrtc_st) struct komeda_dev *mdev =3D crtc->dev->dev_private; struct komeda_crtc *kcrtc =3D to_kcrtc(crtc); struct komeda_pipeline *master =3D kcrtc->master; - unsigned long min_pxlclk, min_aclk; + struct komeda_compiz *compiz =3D master->compiz; + unsigned long min_pxlclk, min_aclk, delta, full_frame; + int hdisplay =3D m->hdisplay; =20 if (m->flags & DRM_MODE_FLAG_INTERLACE) return MODE_NO_INTERLACE; =20 + full_frame =3D m->htotal * m->vtotal; + delta =3D abs(m->clock * 1000 - m->vrefresh * full_frame); + if (m->vrefresh && (delta > full_frame)) { + DRM_DEBUG_ATOMIC("mode clock check error!\n"); + return MODE_CLOCK_RANGE; + } + + if (kcrtc->side_by_side) + hdisplay /=3D 2; + + if (!in_range(&compiz->hsize, hdisplay)) { + DRM_DEBUG_ATOMIC("hdisplay[%u] is out of range[%u, %u]!\n", + hdisplay, compiz->hsize.start, + compiz->hsize.end); + return MODE_BAD_HVALUE; + } + + if (!in_range(&compiz->vsize, m->vdisplay)) { + DRM_DEBUG_ATOMIC("vdisplay[%u] is out of range[%u, %u]!\n", + m->vdisplay, compiz->vsize.start, + compiz->vsize.end); + return MODE_BAD_VVALUE; + } + min_pxlclk =3D m->clock * 1000; if (master->dual_link) min_pxlclk /=3D 2; --=20 1.9.1