From patchwork Fri Apr 26 14:03:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Sharma X-Patchwork-Id: 2496941 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id D670D3FC64 for ; Sat, 27 Apr 2013 09:26:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7DDFE646C for ; Sat, 27 Apr 2013 02:26:29 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by gabe.freedesktop.org (Postfix) with ESMTP id B6D3EE5F19 for ; Fri, 26 Apr 2013 06:39:27 -0700 (PDT) Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MLV00MC679JLXK0@mailout2.samsung.com> for dri-devel@lists.freedesktop.org; Fri, 26 Apr 2013 22:39:26 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.123]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 67.0D.31024.E838A715; Fri, 26 Apr 2013 22:39:26 +0900 (KST) X-AuditID: cbfee68d-b7f016d000007930-73-517a838e89e7 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 8E.EF.01422.D838A715; Fri, 26 Apr 2013 22:39:25 +0900 (KST) Received: from chromeserver-PowerEdge-T410.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 <0MLV00GGC78MOS10@mmp1.samsung.com>; Fri, 26 Apr 2013 22:39:25 +0900 (KST) From: Rahul Sharma To: dri-devel@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH v2] drm/exynos: hdmi: use drm_display_mode to check the supported modes Date: Fri, 26 Apr 2013 19:33:58 +0530 Message-id: <1366985038-2801-1-git-send-email-rahul.sharma@samsung.com> X-Mailer: git-send-email 1.7.10.4 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrELMWRmVeSWpSXmKPExsWyRsSkWrevuSrQYP9xTosrX9+zWUy6P4HF 4vuuL+wWM87vY7JY+CLeYsqiw6wWcw/mWsyY/JLNgcNj56y77B4LNpV63O8+zuTRt2UVo8fn TXIBrFFcNimpOZllqUX6dglcGbffvmIu+G9c8fraC7YGxufaXYycHBICJhIb/s9lgbDFJC7c W8/WxcjFISSwlFFi74RmVpiij9+WQyUWMUq82fyUHcKZzSSx7dcnJpAqNgFdidkHnzGC2CIC bhJNh2eyghQxC8xilLgzpQFslLBApMSkB6+ZQWwWAVWJiQ+/soPYvALuEt82TmOGWKco0f1s Atg6CYF2dolFa1ayQzQISHybfAjoWA6ghKzEpgNQ9ZISB1fcYJnAKLiAkWEVo2hqQXJBcVJ6 kaFecWJucWleul5yfu4mRmD4nv73rHcH4+0D1ocYk4HGTWSWEk3OB4Z/Xkm8obGZkYWpiamx kbmlGWnCSuK8ai3WgUIC6YklqdmpqQWpRfFFpTmpxYcYmTg4pRoYu9f5Htz64EjRFMVjq986 WeYLZ/3+uWTTIouiZNmDHcrHH5h93vkkcOrcDc9Vr3oVKhhr/dM6YRhRrbrTPfCui5r+u8pg 82r3N1w8aZvNY32mB4jtOOkr0yymybr9sz+fmJnJ0q1SXl1V7xq7nv9TEDH66JK4/f8WtVDe zqdWH7YoPzVfFv1PiaU4I9FQi7moOBEAlVVjlHUCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPIsWRmVeSWpSXmKPExsVy+t9jAd3e5qpAgyd/bCyufH3PZjHp/gQW i++7vrBbzDi/j8li4Yt4iymLDrNazD2YazFj8ks2Bw6PnbPusnss2FTqcb/7OJNH35ZVjB6f N8kFsEY1MNpkpCampBYppOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXm AF2ipFCWmFMKFApILC5W0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsYcy4/fYVc8F/44rX116w NTA+1+5i5OSQEDCR+PhtORuELSZx4d56IJuLQ0hgEaPEm81P2SGc2UwS2359YgKpYhPQlZh9 8BkjiC0i4CbRdHgmK0gRs8AsRok7UxpYQRLCApESkx68ZgaxWQRUJSY+/MoOYvMKuEt82ziN GWKdokT3swlsExi5FzAyrGIUTS1ILihOSs810itOzC0uzUvXS87P3cQIjo5n0jsYVzVYHGIU 4GBU4uF1cKgMFGJNLCuuzD3EKMHBrCTCu7CqKlCINyWxsiq1KD++qDQntfgQYzLQ9onMUqLJ +cDIzSuJNzQ2MTc1NrU0sTAxsyRNWEmc92CrdaCQQHpiSWp2ampBahHMFiYOTqkGxsosLjG1 y6rvF+6/dudSoC/TzdlvNm7covbbcUZp4zRxD2kxtbfscf3nZWz+1WUdKtsr8KTp7CLefRdS +9lu5Pxz+s4z45By+uupqvuMzXr558iskPnTFz/p86U0+a02MWxa746q6qjt+Si3kPGS47vD 579s7k+K7YkQlj73Zndz+X7JpPzSWUosxRmJhlrMRcWJADYAVk/SAgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Mailman-Approved-At: Sat, 27 Apr 2013 02:22:51 -0700 Cc: seanpaul@google.com, sw0312.kim@samsung.com, joshi@samsung.com, Rahul Sharma 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. v2: 1) Removed convert_to_video_timing(). 2) Corrected DRM_DEBUG_KMS to print the resolution properly. Signed-off-by: Rahul Sharma --- drivers/gpu/drm/exynos/exynos_drm_connector.c | 36 +------------------------ 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(+), 52 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_connector.c b/drivers/gpu/drm/exynos/exynos_drm_connector.c index 8bcc13a..7259fff 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_connector.c +++ b/drivers/gpu/drm/exynos/exynos_drm_connector.c @@ -58,37 +58,6 @@ convert_to_display_mode(struct drm_display_mode *mode, mode->flags |= DRM_MODE_FLAG_DBLSCAN; } -/* convert drm_display_mode to exynos_video_timings */ -static inline void -convert_to_video_timing(struct fb_videomode *timing, - struct drm_display_mode *mode) -{ - DRM_DEBUG_KMS("%s\n", __FILE__); - - memset(timing, 0, sizeof(*timing)); - - timing->pixclock = mode->clock * 1000; - timing->refresh = drm_mode_vrefresh(mode); - - timing->xres = mode->hdisplay; - timing->right_margin = mode->hsync_start - mode->hdisplay; - timing->hsync_len = mode->hsync_end - mode->hsync_start; - timing->left_margin = mode->htotal - mode->hsync_end; - - timing->yres = mode->vdisplay; - timing->lower_margin = mode->vsync_start - mode->vdisplay; - timing->vsync_len = mode->vsync_end - mode->vsync_start; - timing->upper_margin = mode->vtotal - mode->vsync_end; - - if (mode->flags & DRM_MODE_FLAG_INTERLACE) - timing->vmode = FB_VMODE_INTERLACED; - else - timing->vmode = FB_VMODE_NONINTERLACED; - - if (mode->flags & DRM_MODE_FLAG_DBLSCAN) - timing->vmode |= FB_VMODE_DOUBLE; -} - static int exynos_drm_connector_get_modes(struct drm_connector *connector) { struct exynos_drm_connector *exynos_connector = @@ -168,15 +137,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 6b70944..fd2ff9f 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_hdmi.h +++ b/drivers/gpu/drm/exynos/exynos_drm_hdmi.h @@ -32,11 +32,11 @@ 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_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); @@ -57,7 +57,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 93b70e9..aeca603 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -796,18 +796,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("[WxH@HzI/P at Pixel Clk]: %dx%d@%d%s at %d\n", + mode->hdisplay, mode->vdisplay, mode->vrefresh, + (mode->flags & DRM_MODE_FLAG_INTERLACE) ? "I" : "P", + 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; @@ -1643,7 +1642,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 f08e251..67c4fd8 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -818,17 +818,17 @@ static void mixer_win_disable(void *ctx, int win) mixer_ctx->win_data[win].enabled = false; } -static int mixer_check_timing(void *ctx, struct fb_videomode *timing) +static 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) || @@ -837,6 +837,7 @@ static 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;