From patchwork Fri May 22 03:46:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 6461031 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3BEB49F401 for ; Fri, 22 May 2015 03:46:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 582BD204FB for ; Fri, 22 May 2015 03:46:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B1EE204D3 for ; Fri, 22 May 2015 03:46:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755042AbbEVDqw (ORCPT ); Thu, 21 May 2015 23:46:52 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:14538 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754448AbbEVDqw (ORCPT ); Thu, 21 May 2015 23:46:52 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NOQ008DEFU2APE0@mailout1.samsung.com> for linux-samsung-soc@vger.kernel.org; Fri, 22 May 2015 12:46:50 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.112]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id E9.6D.29324.AA6AE555; Fri, 22 May 2015 12:46:50 +0900 (KST) X-AuditID: cbfee68d-f79106d00000728c-07-555ea6aa3b7c Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 0C.D1.25346.AA6AE555; Fri, 22 May 2015 12:46:50 +0900 (KST) Received: from [10.252.81.123] by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NOQ008N4FU2RWM1@mmp1.samsung.com>; Fri, 22 May 2015 12:46:50 +0900 (KST) Message-id: <555EA6AB.6070701@samsung.com> Date: Fri, 22 May 2015 12:46:51 +0900 From: Joonyoung Shim User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-version: 1.0 To: Gustavo Padovan , linux-samsung-soc@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, inki.dae@samsung.com, tjakobi@math.uni-bielefeld.de, Gustavo Padovan Subject: Re: [PATCH v6 03/12] drm/exynos: atomic phase 1: add .mode_set_nofb() callback References: <1432238571-31621-1-git-send-email-gustavo@padovan.org> <1432238571-31621-4-git-send-email-gustavo@padovan.org> In-reply-to: <1432238571-31621-4-git-send-email-gustavo@padovan.org> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsWyRsSkQHfVsrhQg81HlSyufH3PZvFpdSu7 xc4Hu9gtJt2fwGIx4/w+Jou21R9YHdg8/j6/zuJxv/s4k8e/Y+weOyftZfLo27KK0ePzJrkA tigum5TUnMyy1CJ9uwSujMvf/rEULFGs+DX7E1sD43rpLkZODgkBE4lfB7axQ9hiEhfurWfr YuTiEBJYyiixfvY1Jpiie/NWsUAkFjFKvD5+gxnCecAosefKG7B2XgEtiabdj1hAbBYBVYkH i6+C2WwCehJ3th0HmyQqECZxZkYHC0S9oMSPyffAbBEBH4mte9aygdjMAv2MEuuaVEFsYYFI iXtfH7CC2EICtRIbFq1iBrE5BVwkzv89BTSTA6heT+L+RS2IVnmJzWvegt0mIXCOXeLg7F/M EPcISHybfIgFpF5CQFZi0wFmiMckJQ6uuMEygVFsFpKLZiFMnYVk6gJG5lWMoqkFyQXFSelF hnrFibnFpXnpesn5uZsYgTF3+t+z3h2Mtw9YH2IU4GBU4uHlVI8NFWJNLCuuzD3EaAp0xERm KdHkfGBk55XEGxqbGVmYmpgaG5lbmimJ8ypK/QwWEkhPLEnNTk0tSC2KLyrNSS0+xMjEwSnV wCgp/fcEU7JIwcXYiXtetZk8e74k69J3y3tpfYb27NsmTbxzYmH7dhO7O0dZY8o2xtQz892c yOCe8S915e3V+0vWlm5SjJT6pqZw49YUha9/l9f73ZudL7l04cKp+ZukZq89Knmmyf+9tsTC Lusn19VmZKu//ae2ZYJEjERS6mLNVXqfroQ7yJ1XYinOSDTUYi4qTgQAjvnyTrQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsVy+t9jAd1Vy+JCDXavkrW48vU9m8Wn1a3s Fjsf7GK3mHR/AovFjPP7mCzaVn9gdWDz+Pv8OovH/e7jTB7/jrF77Jy0l8mjb8sqRo/Pm+QC 2KIaGG0yUhNTUosUUvOS81My89JtlbyD453jTc0MDHUNLS3MlRTyEnNTbZVcfAJ03TJzgM5Q UihLzCkFCgUkFhcr6dthmhAa4qZrAdMYoesbEgTXY2SABhLWMGZc/vaPpWCJYsWv2Z/YGhjX S3cxcnJICJhI3Ju3igXCFpO4cG89WxcjF4eQwCJGidfHbzBDOA8YJfZcecMOUsUroCXRtPsR WAeLgKrEg8VXwWw2AT2JO9uOM4HYogJhEmdmdLBA1AtK/Jh8D8wWEfCR2LpnLRuIzSzQzyix rkkVxBYWiJS49/UBK4gtJFArsWHRKmYQm1PAReL831NAMzmA6vUk7l/UgmiVl9i85i3zBEaB WUg2zEKomoWkagEj8ypG0dSC5ILipPRcQ73ixNzi0rx0veT83E2M4Ih+JrWDcWWDxSFGAQ5G JR5eDvXYUCHWxLLiytxDjBIczEoivKoL4kKFeFMSK6tSi/Lji0pzUosPMZoC/T+RWUo0OR+Y bPJK4g2NTcyMLI3MDS2MjM2VxHlP5vuECgmkJ5akZqemFqQWwfQxcXBKNTCGF7A8dxG/e8Cj Zy+rp6pTyoZdCdGctRVHHW7ND/SX0l7d+HH6GQ6Z0H1b+lIighNfP/rx32OVf15p7PzV0+dN NfHuKT72flrQ6fhMARMzcccFDZcTdh4V+ef5y30e30TNn6uYZljncxj86l8ZNv9D6L4Tzj8i xPvvd4tr7j5oee/rm9IFy9SUWIozEg21mIuKEwHfOt+Z/gIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 05/22/2015 05:02 AM, Gustavo Padovan wrote: > From: Gustavo Padovan > > The new atomic infrastructure needs the .mode_set_nofb() callback to > update CRTC timings before setting any plane. > > Signed-off-by: Gustavo Padovan > --- > drivers/gpu/drm/exynos/exynos_drm_crtc.c | 60 +++++--------------------------- > 1 file changed, 9 insertions(+), 51 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c > index 61b8cfe..54b74e1 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c > @@ -81,59 +81,16 @@ exynos_drm_crtc_mode_fixup(struct drm_crtc *crtc, > return true; > } > > -static int > -exynos_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, > - struct drm_display_mode *adjusted_mode, int x, int y, > - struct drm_framebuffer *old_fb) > -{ > - struct drm_framebuffer *fb = crtc->primary->fb; > - unsigned int crtc_w; > - unsigned int crtc_h; > - int ret; > - > - /* > - * copy the mode data adjusted by mode_fixup() into crtc->mode > - * so that hardware can be seet to proper mode. > - */ > - memcpy(&crtc->mode, adjusted_mode, sizeof(*adjusted_mode)); This can cause any problem because exynos drm drivers use crtc->mode directly as adjusted_mode. It's necessary to consider using crtc_state->adjusted_mode in exynos drm drivers. Please refer a patch of Daniel Stone using hwmode instead of mode but it cannot use for atomic. http://lists.freedesktop.org/archives/dri-devel/2015-March/079546.html > - > - ret = exynos_check_plane(crtc->primary, fb); > - if (ret < 0) > - return ret; > - > - crtc_w = fb->width - x; > - crtc_h = fb->height - y; > - exynos_plane_mode_set(crtc->primary, crtc, fb, 0, 0, > - crtc_w, crtc_h, x, y, crtc_w, crtc_h); > - > - return 0; > -} > - > -static int exynos_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, > - struct drm_framebuffer *old_fb) > +static void > +exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) > { > struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); > - struct drm_framebuffer *fb = crtc->primary->fb; > - unsigned int crtc_w; > - unsigned int crtc_h; > - int ret; > > - /* when framebuffer changing is requested, crtc's dpms should be on */ > - if (exynos_crtc->dpms > DRM_MODE_DPMS_ON) { > - DRM_ERROR("failed framebuffer changing request.\n"); > - return -EPERM; > - } > - > - ret = exynos_check_plane(crtc->primary, fb); > - if (ret) > - return ret; > - > - crtc_w = fb->width - x; > - crtc_h = fb->height - y; > - exynos_update_plane(crtc->primary, crtc, fb, 0, 0, > - crtc_w, crtc_h, x, y, crtc_w, crtc_h); > + if (WARN_ON(!crtc->state)) > + return; > > - return 0; > + if (exynos_crtc->ops->commit) > + exynos_crtc->ops->commit(exynos_crtc); This will be called again by crtc_funcs->commit from drm_crtc_helper_set_mode. It seems to need to remove the call from exynos_drm_crtc_commit like below. > } > > static void exynos_drm_crtc_disable(struct drm_crtc *crtc) > @@ -158,8 +115,9 @@ static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = { > .prepare = exynos_drm_crtc_prepare, > .commit = exynos_drm_crtc_commit, > .mode_fixup = exynos_drm_crtc_mode_fixup, > - .mode_set = exynos_drm_crtc_mode_set, > - .mode_set_base = exynos_drm_crtc_mode_set_base, > + .mode_set = drm_helper_crtc_mode_set, > + .mode_set_nofb = exynos_drm_crtc_mode_set_nofb, > + .mode_set_base = drm_helper_crtc_mode_set_base, > .disable = exynos_drm_crtc_disable, > }; > > Thanks. --- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index 48ccab7..aa981c2 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -63,9 +63,6 @@ static void exynos_drm_crtc_commit(struct drm_crtc *crtc) if (exynos_crtc->ops->win_commit) exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos); - - if (exynos_crtc->ops->commit) - exynos_crtc->ops->commit(exynos_crtc); } static bool