From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oleksandr Andrushchenko Subject: [PATCH 3/4] drm/tve200: Do not use deprecated drm_driver.{enable|disable)_vblank Date: Mon, 12 Feb 2018 10:52:53 +0200 Message-ID: <1518425574-32671-4-git-send-email-andr2000@gmail.com> References: <1518425574-32671-1-git-send-email-andr2000@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 586CA6E0E9 for ; Mon, 12 Feb 2018 08:53:07 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id a204so19373858lfa.2 for ; Mon, 12 Feb 2018 00:53:07 -0800 (PST) In-Reply-To: <1518425574-32671-1-git-send-email-andr2000@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Oleksandr Andrushchenko , airlied@linux.ie, daniel.vetter@intel.com List-Id: dri-devel@lists.freedesktop.org RnJvbTogT2xla3NhbmRyIEFuZHJ1c2hjaGVua28gPG9sZWtzYW5kcl9hbmRydXNoY2hlbmtvQGVw YW0uY29tPgoKRG8gbm90IHVzZSBkZXByZWNhdGVkIGRybV9kcml2ZXIue2VuYWJsZXxkaXNhYmxl KV92YmxhbmsgY2FsbGJhY2tzLApidXQgdXNlIGRybV9zaW1wbGVfa21zX2hlbHBlJ3MgcGlwZSBj YWxsYmFja3MgaW5zdGVhZC4KClNpZ25lZC1vZmYtYnk6IE9sZWtzYW5kciBBbmRydXNoY2hlbmtv IDxvbGVrc2FuZHJfYW5kcnVzaGNoZW5rb0BlcGFtLmNvbT4KQ2M6IExpbnVzIFdhbGxlaWogPGxp bnVzLndhbGxlaWpAbGluYXJvLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vdHZlMjAwL3R2ZTIw MF9kaXNwbGF5LmMgfCAxMCArKysrKysrKy0tCiBkcml2ZXJzL2dwdS9kcm0vdHZlMjAwL3R2ZTIw MF9kcm0uaCAgICAgfCAgMiAtLQogZHJpdmVycy9ncHUvZHJtL3R2ZTIwMC90dmUyMDBfZHJ2LmMg ICAgIHwgIDMgLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgNyBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdHZlMjAwL3R2ZTIwMF9kaXNwbGF5 LmMgYi9kcml2ZXJzL2dwdS9kcm0vdHZlMjAwL3R2ZTIwMF9kaXNwbGF5LmMKaW5kZXggMmM2Njhi ZDZkOTk3Li5kYjM5N2ZjYjM0NWEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS90dmUyMDAv dHZlMjAwX2Rpc3BsYXkuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdHZlMjAwL3R2ZTIwMF9kaXNw bGF5LmMKQEAgLTI3MywxNiArMjczLDIwIEBAIHN0YXRpYyB2b2lkIHR2ZTIwMF9kaXNwbGF5X3Vw ZGF0ZShzdHJ1Y3QgZHJtX3NpbXBsZV9kaXNwbGF5X3BpcGUgKnBpcGUsCiAJfQogfQogCi1pbnQg dHZlMjAwX2VuYWJsZV92Ymxhbmsoc3RydWN0IGRybV9kZXZpY2UgKmRybSwgdW5zaWduZWQgaW50 IGNydGMpCitzdGF0aWMgaW50IHR2ZTIwMF9kaXNwbGF5X2VuYWJsZV92Ymxhbmsoc3RydWN0IGRy bV9zaW1wbGVfZGlzcGxheV9waXBlICpwaXBlKQogeworCXN0cnVjdCBkcm1fY3J0YyAqY3J0YyA9 ICZwaXBlLT5jcnRjOworCXN0cnVjdCBkcm1fZGV2aWNlICpkcm0gPSBjcnRjLT5kZXY7CiAJc3Ry dWN0IHR2ZTIwMF9kcm1fZGV2X3ByaXZhdGUgKnByaXYgPSBkcm0tPmRldl9wcml2YXRlOwogCiAJ d3JpdGVsKFRWRTIwMF9JTlRfVl9TVEFUVVMsIHByaXYtPnJlZ3MgKyBUVkUyMDBfSU5UX0VOKTsK IAlyZXR1cm4gMDsKIH0KIAotdm9pZCB0dmUyMDBfZGlzYWJsZV92Ymxhbmsoc3RydWN0IGRybV9k ZXZpY2UgKmRybSwgdW5zaWduZWQgaW50IGNydGMpCitzdGF0aWMgdm9pZCB0dmUyMDBfZGlzcGxh eV9kaXNhYmxlX3ZibGFuayhzdHJ1Y3QgZHJtX3NpbXBsZV9kaXNwbGF5X3BpcGUgKnBpcGUpCiB7 CisJc3RydWN0IGRybV9jcnRjICpjcnRjID0gJnBpcGUtPmNydGM7CisJc3RydWN0IGRybV9kZXZp Y2UgKmRybSA9IGNydGMtPmRldjsKIAlzdHJ1Y3QgdHZlMjAwX2RybV9kZXZfcHJpdmF0ZSAqcHJp diA9IGRybS0+ZGV2X3ByaXZhdGU7CiAKIAl3cml0ZWwoMCwgcHJpdi0+cmVncyArIFRWRTIwMF9J TlRfRU4pOwpAQCAtMzAwLDYgKzMwNCw4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX3NpbXBs ZV9kaXNwbGF5X3BpcGVfZnVuY3MgdHZlMjAwX2Rpc3BsYXlfZnVuY3MgPSB7CiAJLmRpc2FibGUg PSB0dmUyMDBfZGlzcGxheV9kaXNhYmxlLAogCS51cGRhdGUgPSB0dmUyMDBfZGlzcGxheV91cGRh dGUsCiAJLnByZXBhcmVfZmIgPSB0dmUyMDBfZGlzcGxheV9wcmVwYXJlX2ZiLAorCS5lbmFibGVf dmJsYW5rID0gdHZlMjAwX2Rpc3BsYXlfZW5hYmxlX3ZibGFuaywKKwkuZGlzYWJsZV92Ymxhbmsg PSB0dmUyMDBfZGlzcGxheV9kaXNhYmxlX3ZibGFuaywKIH07CiAKIGludCB0dmUyMDBfZGlzcGxh eV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpkcm0pCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vdHZlMjAwL3R2ZTIwMF9kcm0uaCBiL2RyaXZlcnMvZ3B1L2RybS90dmUyMDAvdHZlMjAwX2Ry bS5oCmluZGV4IDVjMjcwMDU1YmQ1OC4uMWJhNDM4MGY0ODliIDEwMDY0NAotLS0gYS9kcml2ZXJz L2dwdS9kcm0vdHZlMjAwL3R2ZTIwMF9kcm0uaAorKysgYi9kcml2ZXJzL2dwdS9kcm0vdHZlMjAw L3R2ZTIwMF9kcm0uaApAQCAtMTEzLDggKzExMyw2IEBAIHN0cnVjdCB0dmUyMDBfZHJtX2Rldl9w cml2YXRlIHsKIAljb250YWluZXJfb2YoeCwgc3RydWN0IHR2ZTIwMF9kcm1fY29ubmVjdG9yLCBj b25uZWN0b3IpCiAKIGludCB0dmUyMDBfZGlzcGxheV9pbml0KHN0cnVjdCBkcm1fZGV2aWNlICpk ZXYpOwotaW50IHR2ZTIwMF9lbmFibGVfdmJsYW5rKHN0cnVjdCBkcm1fZGV2aWNlICpkcm0sIHVu c2lnbmVkIGludCBjcnRjKTsKLXZvaWQgdHZlMjAwX2Rpc2FibGVfdmJsYW5rKHN0cnVjdCBkcm1f ZGV2aWNlICpkcm0sIHVuc2lnbmVkIGludCBjcnRjKTsKIGlycXJldHVybl90IHR2ZTIwMF9pcnEo aW50IGlycSwgdm9pZCAqZGF0YSk7CiBpbnQgdHZlMjAwX2Nvbm5lY3Rvcl9pbml0KHN0cnVjdCBk cm1fZGV2aWNlICpkZXYpOwogaW50IHR2ZTIwMF9lbmNvZGVyX2luaXQoc3RydWN0IGRybV9kZXZp Y2UgKmRldik7CmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdHZlMjAwL3R2ZTIwMF9kcnYu YyBiL2RyaXZlcnMvZ3B1L2RybS90dmUyMDAvdHZlMjAwX2Rydi5jCmluZGV4IDQ0OTExZDkyMTg2 NC4uYWMzNDRkZGIyM2JjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdHZlMjAwL3R2ZTIw MF9kcnYuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdHZlMjAwL3R2ZTIwMF9kcnYuYwpAQCAtMTYy LDkgKzE2Miw2IEBAIHN0YXRpYyBzdHJ1Y3QgZHJtX2RyaXZlciB0dmUyMDBfZHJtX2RyaXZlciA9 IHsKIAkuZ2VtX2ZyZWVfb2JqZWN0X3VubG9ja2VkID0gZHJtX2dlbV9jbWFfZnJlZV9vYmplY3Qs CiAJLmdlbV92bV9vcHMgPSAmZHJtX2dlbV9jbWFfdm1fb3BzLAogCi0JLmVuYWJsZV92Ymxhbmsg PSB0dmUyMDBfZW5hYmxlX3ZibGFuaywKLQkuZGlzYWJsZV92YmxhbmsgPSB0dmUyMDBfZGlzYWJs ZV92YmxhbmssCi0KIAkucHJpbWVfaGFuZGxlX3RvX2ZkID0gZHJtX2dlbV9wcmltZV9oYW5kbGVf dG9fZmQsCiAJLnByaW1lX2ZkX3RvX2hhbmRsZSA9IGRybV9nZW1fcHJpbWVfZmRfdG9faGFuZGxl LAogCS5nZW1fcHJpbWVfaW1wb3J0ID0gZHJtX2dlbV9wcmltZV9pbXBvcnQsCi0tIAoyLjcuNAoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933234AbeBLIyt (ORCPT ); Mon, 12 Feb 2018 03:54:49 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:33972 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933044AbeBLIxH (ORCPT ); Mon, 12 Feb 2018 03:53:07 -0500 X-Google-Smtp-Source: AH8x224JnnFgVdGG3qeom4YqUEuQUx40EI96aUhD0goYOg3umEhH4nXzz8qoDM9+z1hrFeC82r4pRg== From: Oleksandr Andrushchenko To: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: daniel.vetter@intel.com, gustavo@padovan.org, airlied@linux.ie, seanpaul@chromium.org, Oleksandr Andrushchenko , Linus Walleij Subject: [PATCH 3/4] drm/tve200: Do not use deprecated drm_driver.{enable|disable)_vblank Date: Mon, 12 Feb 2018 10:52:53 +0200 Message-Id: <1518425574-32671-4-git-send-email-andr2000@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518425574-32671-1-git-send-email-andr2000@gmail.com> References: <1518425574-32671-1-git-send-email-andr2000@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleksandr Andrushchenko Do not use deprecated drm_driver.{enable|disable)_vblank callbacks, but use drm_simple_kms_helpe's pipe callbacks instead. Signed-off-by: Oleksandr Andrushchenko Cc: Linus Walleij --- drivers/gpu/drm/tve200/tve200_display.c | 10 ++++++++-- drivers/gpu/drm/tve200/tve200_drm.h | 2 -- drivers/gpu/drm/tve200/tve200_drv.c | 3 --- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c index 2c668bd6d997..db397fcb345a 100644 --- a/drivers/gpu/drm/tve200/tve200_display.c +++ b/drivers/gpu/drm/tve200/tve200_display.c @@ -273,16 +273,20 @@ static void tve200_display_update(struct drm_simple_display_pipe *pipe, } } -int tve200_enable_vblank(struct drm_device *drm, unsigned int crtc) +static int tve200_display_enable_vblank(struct drm_simple_display_pipe *pipe) { + struct drm_crtc *crtc = &pipe->crtc; + struct drm_device *drm = crtc->dev; struct tve200_drm_dev_private *priv = drm->dev_private; writel(TVE200_INT_V_STATUS, priv->regs + TVE200_INT_EN); return 0; } -void tve200_disable_vblank(struct drm_device *drm, unsigned int crtc) +static void tve200_display_disable_vblank(struct drm_simple_display_pipe *pipe) { + struct drm_crtc *crtc = &pipe->crtc; + struct drm_device *drm = crtc->dev; struct tve200_drm_dev_private *priv = drm->dev_private; writel(0, priv->regs + TVE200_INT_EN); @@ -300,6 +304,8 @@ static const struct drm_simple_display_pipe_funcs tve200_display_funcs = { .disable = tve200_display_disable, .update = tve200_display_update, .prepare_fb = tve200_display_prepare_fb, + .enable_vblank = tve200_display_enable_vblank, + .disable_vblank = tve200_display_disable_vblank, }; int tve200_display_init(struct drm_device *drm) diff --git a/drivers/gpu/drm/tve200/tve200_drm.h b/drivers/gpu/drm/tve200/tve200_drm.h index 5c270055bd58..1ba4380f489b 100644 --- a/drivers/gpu/drm/tve200/tve200_drm.h +++ b/drivers/gpu/drm/tve200/tve200_drm.h @@ -113,8 +113,6 @@ struct tve200_drm_dev_private { container_of(x, struct tve200_drm_connector, connector) int tve200_display_init(struct drm_device *dev); -int tve200_enable_vblank(struct drm_device *drm, unsigned int crtc); -void tve200_disable_vblank(struct drm_device *drm, unsigned int crtc); irqreturn_t tve200_irq(int irq, void *data); int tve200_connector_init(struct drm_device *dev); int tve200_encoder_init(struct drm_device *dev); diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c index 44911d921864..ac344ddb23bc 100644 --- a/drivers/gpu/drm/tve200/tve200_drv.c +++ b/drivers/gpu/drm/tve200/tve200_drv.c @@ -162,9 +162,6 @@ static struct drm_driver tve200_drm_driver = { .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, - .enable_vblank = tve200_enable_vblank, - .disable_vblank = tve200_disable_vblank, - .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_import = drm_gem_prime_import, -- 2.7.4