From patchwork Tue Feb 26 12:16:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Sharma X-Patchwork-Id: 2186251 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 090F8DF215 for ; Tue, 26 Feb 2013 16:26:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D1EDBE65C7 for ; Tue, 26 Feb 2013 08:26:39 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 71EC1E6521 for ; Tue, 26 Feb 2013 03:57:41 -0800 (PST) Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MIT00DDZT7P3T00@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 26 Feb 2013 20:57:39 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.124]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id C6.87.02494.333AC215; Tue, 26 Feb 2013 20:57:39 +0900 (KST) X-AuditID: cbfee68d-b7f636d0000009be-3d-512ca33301e7 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 62.F8.03880.333AC215; Tue, 26 Feb 2013 20:57:39 +0900 (KST) Received: from chrome-ubuntu.sisodomain.com ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MIT00AIBT4I1CL0@mmp1.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 26 Feb 2013 20:57:39 +0900 (KST) From: Rahul Sharma To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH] drm/exynos: hdmi: use drm_display_mode to check the supported modes Date: Tue, 26 Feb 2013 07:16:15 -0500 Message-id: <1361880975-14189-1-git-send-email-rahul.sharma@samsung.com> X-Mailer: git-send-email 1.8.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNLMWRmVeSWpSXmKPExsWyRsSkRtd4sU6gwdqZehZXvr5nc2D0uN99 nCmAMYrLJiU1J7MstUjfLoErY9rf86wFr7UrVh/+x9bA+EWli5GTQ0LARGLz7B4WCFtM4sK9 9WwgtpDAUkaJe2+LYWr+zJwFVMMFFF/EKDHnz1t2CGcjk8SEtW9YQarYBHQlZh98xghiiwi4 STQdngkWZxaIkrhzbj4TiC0sECax5c8koBp2DhYBVYm1fiBRXgEPiQ3rHrBC7JKT+LDnEdh4 CYEdbBLHF09hBkmwCAhIfJt8COgIDqCErMSmA8wQ9ZISB1fcYJnAKLiAkWEVo2hqQXJBcVJ6 kaFecWJucWleul5yfu4mRmBAnf73rHcH4+0D1ocYk4HGTWSWEk3OBwZkXkm8obGJuamxqZmR paWlKWnCSuK8cpdkAoUE0hNLUrNTUwtSi+KLSnNSiw8xMnFwSjUwXuteNl17okm/yr45Qata vudcmG/6Ituk83P7AoGarRMdUvx6HY4m3OyK+LdVd2W4tfFzId+oQ7G86w7r7VA/GxPsY7Bn agbH6b5bDY1OtQu1uW4tntVyVPqxW8Kh/3udo9UyZt3j4v7cmW+4/Vz47136e3Kvs/Mnxykt yf2m9+xH9gxriV2blFiKMxINtZiLihMBqanYwT4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xgK7xYp1Ag2NnZC2ufH3P5sDocb/7 OFMAY1QDo01GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO 0FglhbLEnFKgUEBicbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGENY8a0v+dZC15rV6w+/I+t gfGLShcjJ4eEgInEn5mzWCBsMYkL99azdTFycQgJLGKUmPPnLTuEs5FJYsLaN6wgVWwCuhKz Dz5jBLFFBNwkmg7PBIszC0RJ3Dk3nwnEFhYIk9jyZxJQDTsHi4CqxFo/kCivgIfEhnUPWCF2 yUl82POIfQIj9wJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5uZsYwQH7THoH46oGi0OMAhyM Sjy8Gh3agUKsiWXFlbmHGCU4mJVEeEPqdAKFeFMSK6tSi/Lji0pzUosPMSYD7Z7ILCWanA+M prySeENjE3NTY1NLEwsTM0vShJXEeRlPPQkQEkhPLEnNTk0tSC2C2cLEwSnVwOj871vcNIts h/6X9e8LvV9t/uZteXqzY+6HjqQPz1ZvUBCpub7aRsLR9dwRK/lkm4iHgoLi897EHxGMmhXm tEjpVGadmOx9sY4sWe7FTYea3iooa1oqh6hHMW/4f3K66COLah+Pjp4+/UDD2IvTJzZo37n+ S0BEbKfm8ic269g+yBktXbD6lBJLcUaioRZzUXEiACOO1RmcAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Mailman-Approved-At: Tue, 26 Feb 2013 08:25:34 -0800 Cc: sw0312.kim@samsung.com, joshi@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Exynos hdmi driver is using drm_display_mode for setting timing values for a supported resolution. Conversion to fb_videomode and then comparing with the mixer/hdmi/phy limits is not required. Instead, drm_display_mode fields cane be directly compared. This patch is dependent on https://patchwork.kernel.org/patch/2176021/. Signed-off-by: Rahul Sharma --- It is based on exynos-drm-next-todo branch at git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drivers/gpu/drm/exynos/exynos_drm_connector.c | 5 +---- drivers/gpu/drm/exynos/exynos_drm_hdmi.h | 6 +++--- drivers/gpu/drm/exynos/exynos_hdmi.c | 15 +++++++-------- drivers/gpu/drm/exynos/exynos_mixer.c | 13 +++++++------ 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c index 4c5b685..ab0f67a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_connector.c +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c @@ -168,15 +168,12 @@ static int exynos_drm_connector_mode_valid(struct drm_connector *connector, to_exynos_connector(connector); struct exynos_drm_manager *manager = exynos_connector->manager; struct exynos_drm_display_ops *display_ops = manager->display_ops; - struct fb_videomode timing; int ret = MODE_BAD; DRM_DEBUG_KMS("%s\n", __FILE__); - convert_to_video_timing(&timing, mode); - if (display_ops && display_ops->check_timing) - if (!display_ops->check_timing(manager->dev, (void *)&timing)) + if (!display_ops->check_timing(manager->dev, (void *)mode)) ret = MODE_OK; return ret; diff --git a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h index b7faa36..844addb 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h @@ -32,14 +32,14 @@ struct exynos_hdmi_ops { bool (*is_connected)(void *ctx); struct edid *(*get_edid)(void *ctx, struct drm_connector *connector); - int (*check_timing)(void *ctx, struct fb_videomode *timing); + int (*check_timing)(void *ctx, struct drm_display_mode *mode); int (*power_on)(void *ctx, int mode); /* manager */ void (*mode_fixup)(void *ctx, struct drm_connector *connector, const struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode); - void (*mode_set)(void *ctx, void *mode); + void (*mode_set)(void *ctx, struct drm_display_mode *mode); void (*get_max_resol)(void *ctx, unsigned int *width, unsigned int *height); void (*commit)(void *ctx); @@ -60,7 +60,7 @@ struct exynos_mixer_ops { void (*win_disable)(void *ctx, int zpos); /* display */ - int (*check_timing)(void *ctx, struct fb_videomode *timing); + int (*check_timing)(void *ctx, struct drm_display_mode *mode); }; void exynos_hdmi_drv_attach(struct exynos_drm_hdmi_context *ctx); diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index c38d275..d8d78a6 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -798,18 +798,17 @@ static int hdmi_find_phy_conf(struct hdmi_context *hdata, u32 pixel_clock) return -EINVAL; } -static int hdmi_check_timing(void *ctx, struct fb_videomode *timing) +static int hdmi_check_timing(void *ctx, struct drm_display_mode *mode) { struct hdmi_context *hdata = ctx; int ret; - DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__); - - DRM_DEBUG_KMS("[%d]x[%d] [%d]Hz [%x]\n", timing->xres, - timing->yres, timing->refresh, - timing->vmode); + DRM_DEBUG_KMS("%s : xres=%d, yres=%d, refresh=%d, intl=%d clock=%d\n", + __func__, mode->hdisplay, mode->vdisplay, + mode->vrefresh, (mode->flags & DRM_MODE_FLAG_INTERLACE) ? true : + false, mode->clock * 1000); - ret = hdmi_find_phy_conf(hdata, timing->pixclock); + ret = hdmi_find_phy_conf(hdata, mode->clock * 1000); if (ret < 0) return ret; return 0; @@ -1691,7 +1690,7 @@ static void hdmi_v14_mode_set(struct hdmi_context *hdata, hdmi_set_reg(tg->tg_3d, 1, 0x0); } -static void hdmi_mode_set(void *ctx, void *mode) +static void hdmi_mode_set(void *ctx, struct drm_display_mode *mode) { struct hdmi_context *hdata = ctx; struct drm_display_mode *m = mode; diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index b6339f9..55cfde5 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -811,17 +811,17 @@ static void mixer_win_disable(void *ctx, int win) mixer_ctx->win_data[win].enabled = false; } -int mixer_check_timing(void *ctx, struct fb_videomode *timing) +int mixer_check_timing(void *ctx, struct drm_display_mode *mode) { u32 w, h; - w = timing->xres; - h = timing->yres; + w = mode->hdisplay; + h = mode->vdisplay; DRM_DEBUG_KMS("%s : xres=%d, yres=%d, refresh=%d, intl=%d\n", - __func__, timing->xres, timing->yres, - timing->refresh, (timing->vmode & - FB_VMODE_INTERLACED) ? true : false); + __func__, mode->hdisplay, mode->vdisplay, + mode->vrefresh, (mode->flags & + DRM_MODE_FLAG_INTERLACE) ? true : false); if ((w >= 464 && w <= 720 && h >= 261 && h <= 576) || (w >= 1024 && w <= 1280 && h >= 576 && h <= 720) || @@ -830,6 +830,7 @@ int mixer_check_timing(void *ctx, struct fb_videomode *timing) return -EINVAL; } + static void mixer_wait_for_vblank(void *ctx) { struct mixer_context *mixer_ctx = ctx;