From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E41BEC33CB0 for ; Mon, 13 Jan 2020 18:53:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF2A421569 for ; Mon, 13 Jan 2020 18:53:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KryaEP5E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727726AbgAMSxu (ORCPT ); Mon, 13 Jan 2020 13:53:50 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40162 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726435AbgAMSxu (ORCPT ); Mon, 13 Jan 2020 13:53:50 -0500 Received: by mail-wm1-f65.google.com with SMTP id t14so10888199wmi.5 for ; Mon, 13 Jan 2020 10:53:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=SF/Wi85S5n1xdzO1hvPlQhKHblcAljCOJxr1B1/T1YA=; b=KryaEP5El2yN/C3mRCOXFYLzIzRtKtUEc486wD8o0szSXiawXpQuA7RHqsUDD1eqjm Z1s2WpAw3Xz3H6MFxnennH0KAVKciL2/ihQcu3C8/tckdd9O4PozRQNUugrmYIIYRZCr Aang5d30YTGaZx+io8Yrm+YO1bkPtsZcIhqTsetIk0ViQTidlRN1nXkfqIPnJVTXQKv4 5z2SwgzpqiIUMyIf2ZT2Wk9ATTx9ja3bhem6kfLmSfKtHu5TTV5gTD0rVmpwKfZ5OUVH PeGJW2osDgr7THwAnp0gwEy9iUXw4CCxLKMpbOlTXggqK/1h6/GF9Tm0r0bg3ynaxlhn 2sdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SF/Wi85S5n1xdzO1hvPlQhKHblcAljCOJxr1B1/T1YA=; b=fitSt9hHtG+DxhiBEsiYMivpfGmIleblRfsYaMSynnmE4665/rDY6Bgf11Fw4uOQkr rAVGpoNWe4YA7eCwf1g0yp3giZ7OKzT6FFLYc2ovbui+72e77FfdXUp+wNK0IvqTKq3V rr1Ki6zKBkzhp3aHsjZWjv87MgVKpLVICGuNK3hw+AdTNi4dN5MB4KAF72N+ruQXSQQu JpjPhYJD9+y3OrbmOjAzOI8LGZ0qcBaSlQ13kqqyz9wfNyNfFfpH46yOnLFxjxxYMbUf 8ENYFgeWX5wMQvFW9gKajivhLN8c827kcs+88tOQjOXITKq1w1Ftt8bqioLTtB3tnAav eDTw== X-Gm-Message-State: APjAAAWr+kSLeIXXliQu1CdFpsKJ6+wPoReiEjDxdpIl+p5IZTgDesh0 WlrDdoaXBKMHnE811xulIMGpx+/xYr4s3nfpRD4= X-Google-Smtp-Source: APXvYqx1XH8YMhTCUnSr3geQn5IAdILwqDMFJDTIJxRsowMopv7y+dLJJYNqZhoNSkDuYuz6w3vNKIFhNgGkEITVdc4= X-Received: by 2002:a1c:6404:: with SMTP id y4mr22030245wmb.143.1578941627774; Mon, 13 Jan 2020 10:53:47 -0800 (PST) MIME-Version: 1.0 References: <20200110092127.27847-1-tzimmermann@suse.de> <20200110092127.27847-6-tzimmermann@suse.de> In-Reply-To: <20200110092127.27847-6-tzimmermann@suse.de> From: Alex Deucher Date: Mon, 13 Jan 2020 13:53:36 -0500 Message-ID: Subject: Re: [PATCH 05/23] drm/radeon: Convert to struct drm_crtc_helper_funcs.get_scanout_position() To: Thomas Zimmermann Cc: Dave Airlie , Daniel Vetter , "Deucher, Alexander" , Christian Koenig , Chunming Zhou , Maarten Lankhorst , Patrik Jakobsson , Rob Clark , Sean Paul , Benjamin Gaignard , Vincent Abriou , yannick.fertre@st.com, philippe.cornu@st.com, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, Eric Anholt , rodrigosiqueiramelo@gmail.com, hamohammed.sa@gmail.com, VMware Graphics , Thomas Hellstrom , Ben Skeggs , "Wentland, Harry" , "Leo (Sunpeng) Li" , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , linux-arm-msm , Intel Graphics Development , amd-gfx list , Maling list - DRI developers , nouveau , freedreno Content-Type: text/plain; charset="UTF-8" Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Fri, Jan 10, 2020 at 4:22 AM Thomas Zimmermann wrote: > > The callback struct drm_driver.get_scanout_position() is deprecated in > favor of struct drm_crtc_helper_funcs.get_scanout_position(). Convert > radeon over. > I'd prefer to just change the signature of radeon_get_crtc_scanoutpos() to match the new API. Alex > Signed-off-by: Thomas Zimmermann > --- > drivers/gpu/drm/radeon/atombios_crtc.c | 1 + > drivers/gpu/drm/radeon/radeon_display.c | 13 +++++++++++++ > drivers/gpu/drm/radeon/radeon_drv.c | 11 ----------- > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 3 ++- > drivers/gpu/drm/radeon/radeon_mode.h | 6 ++++++ > 5 files changed, 22 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c > index da2c9e295408..447d74b78f19 100644 > --- a/drivers/gpu/drm/radeon/atombios_crtc.c > +++ b/drivers/gpu/drm/radeon/atombios_crtc.c > @@ -2232,6 +2232,7 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = { > .prepare = atombios_crtc_prepare, > .commit = atombios_crtc_commit, > .disable = atombios_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > void radeon_atombios_init_crtc(struct drm_device *dev, > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 962575e27cde..7187158b9963 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1978,3 +1978,16 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > > return ret; > } > + > +bool > +radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, int *hpos, > + ktime_t *stime, ktime_t *etime, > + const struct drm_display_mode *mode) > +{ > + struct drm_device *dev = crtc->dev; > + unsigned int pipe = crtc->index; > + > + return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > + stime, etime, mode); > +} > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index fd74e2611185..1f597f166bff 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -563,16 +563,6 @@ static const struct file_operations radeon_driver_kms_fops = { > #endif > }; > > -static bool > -radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, > - bool in_vblank_irq, int *vpos, int *hpos, > - ktime_t *stime, ktime_t *etime, > - const struct drm_display_mode *mode) > -{ > - return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > - stime, etime, mode); > -} > - > static struct drm_driver kms_driver = { > .driver_features = > DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER, > @@ -585,7 +575,6 @@ static struct drm_driver kms_driver = { > .enable_vblank = radeon_enable_vblank_kms, > .disable_vblank = radeon_disable_vblank_kms, > .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos, > - .get_scanout_position = radeon_get_crtc_scanout_position, > .irq_preinstall = radeon_driver_irq_preinstall_kms, > .irq_postinstall = radeon_driver_irq_postinstall_kms, > .irq_uninstall = radeon_driver_irq_uninstall_kms, > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > index a1985a552794..8817fd033cd0 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > @@ -1111,7 +1111,8 @@ static const struct drm_crtc_helper_funcs legacy_helper_funcs = { > .mode_set_base_atomic = radeon_crtc_set_base_atomic, > .prepare = radeon_crtc_prepare, > .commit = radeon_crtc_commit, > - .disable = radeon_crtc_disable > + .disable = radeon_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > > diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h > index fd470d6bf3f4..06c4c527d376 100644 > --- a/drivers/gpu/drm/radeon/radeon_mode.h > +++ b/drivers/gpu/drm/radeon/radeon_mode.h > @@ -881,6 +881,12 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > ktime_t *stime, ktime_t *etime, > const struct drm_display_mode *mode); > > +extern bool radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, > + int *hpos, ktime_t *stime, > + ktime_t *etime, > + const struct drm_display_mode *mode); > + > extern bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev); > extern struct edid * > radeon_bios_get_hardcoded_edid(struct radeon_device *rdev); > -- > 2.24.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Deucher Subject: Re: [PATCH 05/23] drm/radeon: Convert to struct drm_crtc_helper_funcs.get_scanout_position() Date: Mon, 13 Jan 2020 13:53:36 -0500 Message-ID: References: <20200110092127.27847-1-tzimmermann@suse.de> <20200110092127.27847-6-tzimmermann@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20200110092127.27847-6-tzimmermann-l3A5Bk7waGM@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: Thomas Zimmermann Cc: hamohammed.sa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, Dave Airlie , nouveau , Joonas Lahtinen , Maling list - DRI developers , Eric Anholt , amd-gfx list , Benjamin Gaignard , alexandre.torgue-qxv4g6HH51o@public.gmane.org, Chunming Zhou , Thomas Hellstrom , Sean Paul , Patrik Jakobsson , VMware Graphics , Ben Skeggs , "Wentland, Harry" , mcoquelin.stm32-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, "Leo (Sunpeng) Li" , linux-arm-msm , Intel Graphics Development , Maarten Lankhorst List-Id: nouveau.vger.kernel.org On Fri, Jan 10, 2020 at 4:22 AM Thomas Zimmermann wrote: > > The callback struct drm_driver.get_scanout_position() is deprecated in > favor of struct drm_crtc_helper_funcs.get_scanout_position(). Convert > radeon over. > I'd prefer to just change the signature of radeon_get_crtc_scanoutpos() to match the new API. Alex > Signed-off-by: Thomas Zimmermann > --- > drivers/gpu/drm/radeon/atombios_crtc.c | 1 + > drivers/gpu/drm/radeon/radeon_display.c | 13 +++++++++++++ > drivers/gpu/drm/radeon/radeon_drv.c | 11 ----------- > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 3 ++- > drivers/gpu/drm/radeon/radeon_mode.h | 6 ++++++ > 5 files changed, 22 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c > index da2c9e295408..447d74b78f19 100644 > --- a/drivers/gpu/drm/radeon/atombios_crtc.c > +++ b/drivers/gpu/drm/radeon/atombios_crtc.c > @@ -2232,6 +2232,7 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = { > .prepare = atombios_crtc_prepare, > .commit = atombios_crtc_commit, > .disable = atombios_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > void radeon_atombios_init_crtc(struct drm_device *dev, > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 962575e27cde..7187158b9963 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1978,3 +1978,16 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > > return ret; > } > + > +bool > +radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, int *hpos, > + ktime_t *stime, ktime_t *etime, > + const struct drm_display_mode *mode) > +{ > + struct drm_device *dev = crtc->dev; > + unsigned int pipe = crtc->index; > + > + return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > + stime, etime, mode); > +} > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index fd74e2611185..1f597f166bff 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -563,16 +563,6 @@ static const struct file_operations radeon_driver_kms_fops = { > #endif > }; > > -static bool > -radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, > - bool in_vblank_irq, int *vpos, int *hpos, > - ktime_t *stime, ktime_t *etime, > - const struct drm_display_mode *mode) > -{ > - return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > - stime, etime, mode); > -} > - > static struct drm_driver kms_driver = { > .driver_features = > DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER, > @@ -585,7 +575,6 @@ static struct drm_driver kms_driver = { > .enable_vblank = radeon_enable_vblank_kms, > .disable_vblank = radeon_disable_vblank_kms, > .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos, > - .get_scanout_position = radeon_get_crtc_scanout_position, > .irq_preinstall = radeon_driver_irq_preinstall_kms, > .irq_postinstall = radeon_driver_irq_postinstall_kms, > .irq_uninstall = radeon_driver_irq_uninstall_kms, > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > index a1985a552794..8817fd033cd0 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > @@ -1111,7 +1111,8 @@ static const struct drm_crtc_helper_funcs legacy_helper_funcs = { > .mode_set_base_atomic = radeon_crtc_set_base_atomic, > .prepare = radeon_crtc_prepare, > .commit = radeon_crtc_commit, > - .disable = radeon_crtc_disable > + .disable = radeon_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > > diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h > index fd470d6bf3f4..06c4c527d376 100644 > --- a/drivers/gpu/drm/radeon/radeon_mode.h > +++ b/drivers/gpu/drm/radeon/radeon_mode.h > @@ -881,6 +881,12 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > ktime_t *stime, ktime_t *etime, > const struct drm_display_mode *mode); > > +extern bool radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, > + int *hpos, ktime_t *stime, > + ktime_t *etime, > + const struct drm_display_mode *mode); > + > extern bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev); > extern struct edid * > radeon_bios_get_hardcoded_edid(struct radeon_device *rdev); > -- > 2.24.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B144FC33CAE for ; Mon, 13 Jan 2020 18:53:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 86753207E0 for ; Mon, 13 Jan 2020 18:53:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KryaEP5E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86753207E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DB9296E140; Mon, 13 Jan 2020 18:53:49 +0000 (UTC) Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2545B6E13F; Mon, 13 Jan 2020 18:53:49 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id f129so10902453wmf.2; Mon, 13 Jan 2020 10:53:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=SF/Wi85S5n1xdzO1hvPlQhKHblcAljCOJxr1B1/T1YA=; b=KryaEP5El2yN/C3mRCOXFYLzIzRtKtUEc486wD8o0szSXiawXpQuA7RHqsUDD1eqjm Z1s2WpAw3Xz3H6MFxnennH0KAVKciL2/ihQcu3C8/tckdd9O4PozRQNUugrmYIIYRZCr Aang5d30YTGaZx+io8Yrm+YO1bkPtsZcIhqTsetIk0ViQTidlRN1nXkfqIPnJVTXQKv4 5z2SwgzpqiIUMyIf2ZT2Wk9ATTx9ja3bhem6kfLmSfKtHu5TTV5gTD0rVmpwKfZ5OUVH PeGJW2osDgr7THwAnp0gwEy9iUXw4CCxLKMpbOlTXggqK/1h6/GF9Tm0r0bg3ynaxlhn 2sdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SF/Wi85S5n1xdzO1hvPlQhKHblcAljCOJxr1B1/T1YA=; b=toE5YajCFT0ge+pzh3c7qk1GWvyK0h2iq7SKoA+KN32a61pV2HKiTekNRwrOUAL0XJ FP3QtBqQWNDUKC7G1xPRZ9d/DjZj4Gqon0edITrYT8NpWHLFbHX08iR4tnpHJFa/RzDQ haMhJJRQMOc4H4OTcsugXRC3XTdeW2/Gd+GMDuiqgh1TVtKxxL5D1YfWUupjkGwVWPyw 4nKI9W/IF++TRBIYoIuK0mtZFSNyqtihqRb59Br0WY2huEGmZu1Uycwof2sdWDgSHoqN nTHQk2oEOZfQnV+V2bZTxrnwzJfX7oDtQEefizl1Q7HR6qY7TaSuEVsWN5UMYcqPJ7qW 2Kew== X-Gm-Message-State: APjAAAWgpzS1r7z5BouYKy+JJc3tdfKklqBozGa49kktPs0iq4O7DWhB a/94ILAFTuLzlj5tQlJF2A3gvzZb+w0I8DRhIXc= X-Google-Smtp-Source: APXvYqx1XH8YMhTCUnSr3geQn5IAdILwqDMFJDTIJxRsowMopv7y+dLJJYNqZhoNSkDuYuz6w3vNKIFhNgGkEITVdc4= X-Received: by 2002:a1c:6404:: with SMTP id y4mr22030245wmb.143.1578941627774; Mon, 13 Jan 2020 10:53:47 -0800 (PST) MIME-Version: 1.0 References: <20200110092127.27847-1-tzimmermann@suse.de> <20200110092127.27847-6-tzimmermann@suse.de> In-Reply-To: <20200110092127.27847-6-tzimmermann@suse.de> From: Alex Deucher Date: Mon, 13 Jan 2020 13:53:36 -0500 Message-ID: Subject: Re: [PATCH 05/23] drm/radeon: Convert to struct drm_crtc_helper_funcs.get_scanout_position() To: Thomas Zimmermann X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hamohammed.sa@gmail.com, Dave Airlie , nouveau , Maling list - DRI developers , amd-gfx list , alexandre.torgue@st.com, Thomas Hellstrom , Sean Paul , VMware Graphics , Ben Skeggs , mcoquelin.stm32@gmail.com, "Leo \(Sunpeng\) Li" , linux-arm-msm , Intel Graphics Development , Rodrigo Vivi , Vincent Abriou , rodrigosiqueiramelo@gmail.com, philippe.cornu@st.com, yannick.fertre@st.com, "Deucher, Alexander" , freedreno , Christian Koenig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, Jan 10, 2020 at 4:22 AM Thomas Zimmermann wrote: > > The callback struct drm_driver.get_scanout_position() is deprecated in > favor of struct drm_crtc_helper_funcs.get_scanout_position(). Convert > radeon over. > I'd prefer to just change the signature of radeon_get_crtc_scanoutpos() to match the new API. Alex > Signed-off-by: Thomas Zimmermann > --- > drivers/gpu/drm/radeon/atombios_crtc.c | 1 + > drivers/gpu/drm/radeon/radeon_display.c | 13 +++++++++++++ > drivers/gpu/drm/radeon/radeon_drv.c | 11 ----------- > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 3 ++- > drivers/gpu/drm/radeon/radeon_mode.h | 6 ++++++ > 5 files changed, 22 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c > index da2c9e295408..447d74b78f19 100644 > --- a/drivers/gpu/drm/radeon/atombios_crtc.c > +++ b/drivers/gpu/drm/radeon/atombios_crtc.c > @@ -2232,6 +2232,7 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = { > .prepare = atombios_crtc_prepare, > .commit = atombios_crtc_commit, > .disable = atombios_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > void radeon_atombios_init_crtc(struct drm_device *dev, > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 962575e27cde..7187158b9963 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1978,3 +1978,16 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > > return ret; > } > + > +bool > +radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, int *hpos, > + ktime_t *stime, ktime_t *etime, > + const struct drm_display_mode *mode) > +{ > + struct drm_device *dev = crtc->dev; > + unsigned int pipe = crtc->index; > + > + return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > + stime, etime, mode); > +} > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index fd74e2611185..1f597f166bff 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -563,16 +563,6 @@ static const struct file_operations radeon_driver_kms_fops = { > #endif > }; > > -static bool > -radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, > - bool in_vblank_irq, int *vpos, int *hpos, > - ktime_t *stime, ktime_t *etime, > - const struct drm_display_mode *mode) > -{ > - return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > - stime, etime, mode); > -} > - > static struct drm_driver kms_driver = { > .driver_features = > DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER, > @@ -585,7 +575,6 @@ static struct drm_driver kms_driver = { > .enable_vblank = radeon_enable_vblank_kms, > .disable_vblank = radeon_disable_vblank_kms, > .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos, > - .get_scanout_position = radeon_get_crtc_scanout_position, > .irq_preinstall = radeon_driver_irq_preinstall_kms, > .irq_postinstall = radeon_driver_irq_postinstall_kms, > .irq_uninstall = radeon_driver_irq_uninstall_kms, > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > index a1985a552794..8817fd033cd0 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > @@ -1111,7 +1111,8 @@ static const struct drm_crtc_helper_funcs legacy_helper_funcs = { > .mode_set_base_atomic = radeon_crtc_set_base_atomic, > .prepare = radeon_crtc_prepare, > .commit = radeon_crtc_commit, > - .disable = radeon_crtc_disable > + .disable = radeon_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > > diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h > index fd470d6bf3f4..06c4c527d376 100644 > --- a/drivers/gpu/drm/radeon/radeon_mode.h > +++ b/drivers/gpu/drm/radeon/radeon_mode.h > @@ -881,6 +881,12 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > ktime_t *stime, ktime_t *etime, > const struct drm_display_mode *mode); > > +extern bool radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, > + int *hpos, ktime_t *stime, > + ktime_t *etime, > + const struct drm_display_mode *mode); > + > extern bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev); > extern struct edid * > radeon_bios_get_hardcoded_edid(struct radeon_device *rdev); > -- > 2.24.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75B89C33CA9 for ; Mon, 13 Jan 2020 18:53:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4B04721556 for ; Mon, 13 Jan 2020 18:53:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KryaEP5E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B04721556 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A29ED6E145; Mon, 13 Jan 2020 18:53:50 +0000 (UTC) Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2545B6E13F; Mon, 13 Jan 2020 18:53:49 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id f129so10902453wmf.2; Mon, 13 Jan 2020 10:53:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=SF/Wi85S5n1xdzO1hvPlQhKHblcAljCOJxr1B1/T1YA=; b=KryaEP5El2yN/C3mRCOXFYLzIzRtKtUEc486wD8o0szSXiawXpQuA7RHqsUDD1eqjm Z1s2WpAw3Xz3H6MFxnennH0KAVKciL2/ihQcu3C8/tckdd9O4PozRQNUugrmYIIYRZCr Aang5d30YTGaZx+io8Yrm+YO1bkPtsZcIhqTsetIk0ViQTidlRN1nXkfqIPnJVTXQKv4 5z2SwgzpqiIUMyIf2ZT2Wk9ATTx9ja3bhem6kfLmSfKtHu5TTV5gTD0rVmpwKfZ5OUVH PeGJW2osDgr7THwAnp0gwEy9iUXw4CCxLKMpbOlTXggqK/1h6/GF9Tm0r0bg3ynaxlhn 2sdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SF/Wi85S5n1xdzO1hvPlQhKHblcAljCOJxr1B1/T1YA=; b=toE5YajCFT0ge+pzh3c7qk1GWvyK0h2iq7SKoA+KN32a61pV2HKiTekNRwrOUAL0XJ FP3QtBqQWNDUKC7G1xPRZ9d/DjZj4Gqon0edITrYT8NpWHLFbHX08iR4tnpHJFa/RzDQ haMhJJRQMOc4H4OTcsugXRC3XTdeW2/Gd+GMDuiqgh1TVtKxxL5D1YfWUupjkGwVWPyw 4nKI9W/IF++TRBIYoIuK0mtZFSNyqtihqRb59Br0WY2huEGmZu1Uycwof2sdWDgSHoqN nTHQk2oEOZfQnV+V2bZTxrnwzJfX7oDtQEefizl1Q7HR6qY7TaSuEVsWN5UMYcqPJ7qW 2Kew== X-Gm-Message-State: APjAAAWgpzS1r7z5BouYKy+JJc3tdfKklqBozGa49kktPs0iq4O7DWhB a/94ILAFTuLzlj5tQlJF2A3gvzZb+w0I8DRhIXc= X-Google-Smtp-Source: APXvYqx1XH8YMhTCUnSr3geQn5IAdILwqDMFJDTIJxRsowMopv7y+dLJJYNqZhoNSkDuYuz6w3vNKIFhNgGkEITVdc4= X-Received: by 2002:a1c:6404:: with SMTP id y4mr22030245wmb.143.1578941627774; Mon, 13 Jan 2020 10:53:47 -0800 (PST) MIME-Version: 1.0 References: <20200110092127.27847-1-tzimmermann@suse.de> <20200110092127.27847-6-tzimmermann@suse.de> In-Reply-To: <20200110092127.27847-6-tzimmermann@suse.de> From: Alex Deucher Date: Mon, 13 Jan 2020 13:53:36 -0500 Message-ID: To: Thomas Zimmermann Subject: Re: [Intel-gfx] [PATCH 05/23] drm/radeon: Convert to struct drm_crtc_helper_funcs.get_scanout_position() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hamohammed.sa@gmail.com, Dave Airlie , nouveau , Maling list - DRI developers , Eric Anholt , amd-gfx list , Benjamin Gaignard , alexandre.torgue@st.com, Chunming Zhou , Thomas Hellstrom , VMware Graphics , Ben Skeggs , "Wentland, Harry" , mcoquelin.stm32@gmail.com, "Leo \(Sunpeng\) Li" , linux-arm-msm , Intel Graphics Development , Vincent Abriou , rodrigosiqueiramelo@gmail.com, philippe.cornu@st.com, yannick.fertre@st.com, "Deucher, Alexander" , freedreno , Christian Koenig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Fri, Jan 10, 2020 at 4:22 AM Thomas Zimmermann wrote: > > The callback struct drm_driver.get_scanout_position() is deprecated in > favor of struct drm_crtc_helper_funcs.get_scanout_position(). Convert > radeon over. > I'd prefer to just change the signature of radeon_get_crtc_scanoutpos() to match the new API. Alex > Signed-off-by: Thomas Zimmermann > --- > drivers/gpu/drm/radeon/atombios_crtc.c | 1 + > drivers/gpu/drm/radeon/radeon_display.c | 13 +++++++++++++ > drivers/gpu/drm/radeon/radeon_drv.c | 11 ----------- > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 3 ++- > drivers/gpu/drm/radeon/radeon_mode.h | 6 ++++++ > 5 files changed, 22 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c > index da2c9e295408..447d74b78f19 100644 > --- a/drivers/gpu/drm/radeon/atombios_crtc.c > +++ b/drivers/gpu/drm/radeon/atombios_crtc.c > @@ -2232,6 +2232,7 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = { > .prepare = atombios_crtc_prepare, > .commit = atombios_crtc_commit, > .disable = atombios_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > void radeon_atombios_init_crtc(struct drm_device *dev, > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 962575e27cde..7187158b9963 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1978,3 +1978,16 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > > return ret; > } > + > +bool > +radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, int *hpos, > + ktime_t *stime, ktime_t *etime, > + const struct drm_display_mode *mode) > +{ > + struct drm_device *dev = crtc->dev; > + unsigned int pipe = crtc->index; > + > + return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > + stime, etime, mode); > +} > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index fd74e2611185..1f597f166bff 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -563,16 +563,6 @@ static const struct file_operations radeon_driver_kms_fops = { > #endif > }; > > -static bool > -radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, > - bool in_vblank_irq, int *vpos, int *hpos, > - ktime_t *stime, ktime_t *etime, > - const struct drm_display_mode *mode) > -{ > - return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > - stime, etime, mode); > -} > - > static struct drm_driver kms_driver = { > .driver_features = > DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER, > @@ -585,7 +575,6 @@ static struct drm_driver kms_driver = { > .enable_vblank = radeon_enable_vblank_kms, > .disable_vblank = radeon_disable_vblank_kms, > .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos, > - .get_scanout_position = radeon_get_crtc_scanout_position, > .irq_preinstall = radeon_driver_irq_preinstall_kms, > .irq_postinstall = radeon_driver_irq_postinstall_kms, > .irq_uninstall = radeon_driver_irq_uninstall_kms, > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > index a1985a552794..8817fd033cd0 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > @@ -1111,7 +1111,8 @@ static const struct drm_crtc_helper_funcs legacy_helper_funcs = { > .mode_set_base_atomic = radeon_crtc_set_base_atomic, > .prepare = radeon_crtc_prepare, > .commit = radeon_crtc_commit, > - .disable = radeon_crtc_disable > + .disable = radeon_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > > diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h > index fd470d6bf3f4..06c4c527d376 100644 > --- a/drivers/gpu/drm/radeon/radeon_mode.h > +++ b/drivers/gpu/drm/radeon/radeon_mode.h > @@ -881,6 +881,12 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > ktime_t *stime, ktime_t *etime, > const struct drm_display_mode *mode); > > +extern bool radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, > + int *hpos, ktime_t *stime, > + ktime_t *etime, > + const struct drm_display_mode *mode); > + > extern bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev); > extern struct edid * > radeon_bios_get_hardcoded_edid(struct radeon_device *rdev); > -- > 2.24.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A39AC33CA9 for ; Mon, 13 Jan 2020 18:53:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CBBD2207E0 for ; Mon, 13 Jan 2020 18:53:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KryaEP5E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBBD2207E0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E9BB6E13F; Mon, 13 Jan 2020 18:53:49 +0000 (UTC) Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2545B6E13F; Mon, 13 Jan 2020 18:53:49 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id f129so10902453wmf.2; Mon, 13 Jan 2020 10:53:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=SF/Wi85S5n1xdzO1hvPlQhKHblcAljCOJxr1B1/T1YA=; b=KryaEP5El2yN/C3mRCOXFYLzIzRtKtUEc486wD8o0szSXiawXpQuA7RHqsUDD1eqjm Z1s2WpAw3Xz3H6MFxnennH0KAVKciL2/ihQcu3C8/tckdd9O4PozRQNUugrmYIIYRZCr Aang5d30YTGaZx+io8Yrm+YO1bkPtsZcIhqTsetIk0ViQTidlRN1nXkfqIPnJVTXQKv4 5z2SwgzpqiIUMyIf2ZT2Wk9ATTx9ja3bhem6kfLmSfKtHu5TTV5gTD0rVmpwKfZ5OUVH PeGJW2osDgr7THwAnp0gwEy9iUXw4CCxLKMpbOlTXggqK/1h6/GF9Tm0r0bg3ynaxlhn 2sdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SF/Wi85S5n1xdzO1hvPlQhKHblcAljCOJxr1B1/T1YA=; b=toE5YajCFT0ge+pzh3c7qk1GWvyK0h2iq7SKoA+KN32a61pV2HKiTekNRwrOUAL0XJ FP3QtBqQWNDUKC7G1xPRZ9d/DjZj4Gqon0edITrYT8NpWHLFbHX08iR4tnpHJFa/RzDQ haMhJJRQMOc4H4OTcsugXRC3XTdeW2/Gd+GMDuiqgh1TVtKxxL5D1YfWUupjkGwVWPyw 4nKI9W/IF++TRBIYoIuK0mtZFSNyqtihqRb59Br0WY2huEGmZu1Uycwof2sdWDgSHoqN nTHQk2oEOZfQnV+V2bZTxrnwzJfX7oDtQEefizl1Q7HR6qY7TaSuEVsWN5UMYcqPJ7qW 2Kew== X-Gm-Message-State: APjAAAWgpzS1r7z5BouYKy+JJc3tdfKklqBozGa49kktPs0iq4O7DWhB a/94ILAFTuLzlj5tQlJF2A3gvzZb+w0I8DRhIXc= X-Google-Smtp-Source: APXvYqx1XH8YMhTCUnSr3geQn5IAdILwqDMFJDTIJxRsowMopv7y+dLJJYNqZhoNSkDuYuz6w3vNKIFhNgGkEITVdc4= X-Received: by 2002:a1c:6404:: with SMTP id y4mr22030245wmb.143.1578941627774; Mon, 13 Jan 2020 10:53:47 -0800 (PST) MIME-Version: 1.0 References: <20200110092127.27847-1-tzimmermann@suse.de> <20200110092127.27847-6-tzimmermann@suse.de> In-Reply-To: <20200110092127.27847-6-tzimmermann@suse.de> From: Alex Deucher Date: Mon, 13 Jan 2020 13:53:36 -0500 Message-ID: Subject: Re: [PATCH 05/23] drm/radeon: Convert to struct drm_crtc_helper_funcs.get_scanout_position() To: Thomas Zimmermann X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hamohammed.sa@gmail.com, Dave Airlie , nouveau , Joonas Lahtinen , Maling list - DRI developers , Eric Anholt , amd-gfx list , Benjamin Gaignard , alexandre.torgue@st.com, Chunming Zhou , Thomas Hellstrom , Sean Paul , Patrik Jakobsson , VMware Graphics , Ben Skeggs , "Wentland, Harry" , mcoquelin.stm32@gmail.com, "Leo \(Sunpeng\) Li" , linux-arm-msm , Intel Graphics Development , Maarten Lankhorst , Jani Nikula , Rodrigo Vivi , Vincent Abriou , rodrigosiqueiramelo@gmail.com, philippe.cornu@st.com, yannick.fertre@st.com, Rob Clark , Daniel Vetter , "Deucher, Alexander" , freedreno , Christian Koenig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" On Fri, Jan 10, 2020 at 4:22 AM Thomas Zimmermann wrote: > > The callback struct drm_driver.get_scanout_position() is deprecated in > favor of struct drm_crtc_helper_funcs.get_scanout_position(). Convert > radeon over. > I'd prefer to just change the signature of radeon_get_crtc_scanoutpos() to match the new API. Alex > Signed-off-by: Thomas Zimmermann > --- > drivers/gpu/drm/radeon/atombios_crtc.c | 1 + > drivers/gpu/drm/radeon/radeon_display.c | 13 +++++++++++++ > drivers/gpu/drm/radeon/radeon_drv.c | 11 ----------- > drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 3 ++- > drivers/gpu/drm/radeon/radeon_mode.h | 6 ++++++ > 5 files changed, 22 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c > index da2c9e295408..447d74b78f19 100644 > --- a/drivers/gpu/drm/radeon/atombios_crtc.c > +++ b/drivers/gpu/drm/radeon/atombios_crtc.c > @@ -2232,6 +2232,7 @@ static const struct drm_crtc_helper_funcs atombios_helper_funcs = { > .prepare = atombios_crtc_prepare, > .commit = atombios_crtc_commit, > .disable = atombios_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > void radeon_atombios_init_crtc(struct drm_device *dev, > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c > index 962575e27cde..7187158b9963 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -1978,3 +1978,16 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > > return ret; > } > + > +bool > +radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, int *hpos, > + ktime_t *stime, ktime_t *etime, > + const struct drm_display_mode *mode) > +{ > + struct drm_device *dev = crtc->dev; > + unsigned int pipe = crtc->index; > + > + return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > + stime, etime, mode); > +} > diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c > index fd74e2611185..1f597f166bff 100644 > --- a/drivers/gpu/drm/radeon/radeon_drv.c > +++ b/drivers/gpu/drm/radeon/radeon_drv.c > @@ -563,16 +563,6 @@ static const struct file_operations radeon_driver_kms_fops = { > #endif > }; > > -static bool > -radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, > - bool in_vblank_irq, int *vpos, int *hpos, > - ktime_t *stime, ktime_t *etime, > - const struct drm_display_mode *mode) > -{ > - return radeon_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos, > - stime, etime, mode); > -} > - > static struct drm_driver kms_driver = { > .driver_features = > DRIVER_USE_AGP | DRIVER_GEM | DRIVER_RENDER, > @@ -585,7 +575,6 @@ static struct drm_driver kms_driver = { > .enable_vblank = radeon_enable_vblank_kms, > .disable_vblank = radeon_disable_vblank_kms, > .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos, > - .get_scanout_position = radeon_get_crtc_scanout_position, > .irq_preinstall = radeon_driver_irq_preinstall_kms, > .irq_postinstall = radeon_driver_irq_postinstall_kms, > .irq_uninstall = radeon_driver_irq_uninstall_kms, > diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > index a1985a552794..8817fd033cd0 100644 > --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c > @@ -1111,7 +1111,8 @@ static const struct drm_crtc_helper_funcs legacy_helper_funcs = { > .mode_set_base_atomic = radeon_crtc_set_base_atomic, > .prepare = radeon_crtc_prepare, > .commit = radeon_crtc_commit, > - .disable = radeon_crtc_disable > + .disable = radeon_crtc_disable, > + .get_scanout_position = radeon_get_crtc_scanout_position, > }; > > > diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h > index fd470d6bf3f4..06c4c527d376 100644 > --- a/drivers/gpu/drm/radeon/radeon_mode.h > +++ b/drivers/gpu/drm/radeon/radeon_mode.h > @@ -881,6 +881,12 @@ extern int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe, > ktime_t *stime, ktime_t *etime, > const struct drm_display_mode *mode); > > +extern bool radeon_get_crtc_scanout_position(struct drm_crtc *crtc, > + bool in_vblank_irq, int *vpos, > + int *hpos, ktime_t *stime, > + ktime_t *etime, > + const struct drm_display_mode *mode); > + > extern bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev); > extern struct edid * > radeon_bios_get_hardcoded_edid(struct radeon_device *rdev); > -- > 2.24.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx