From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933222AbcDNRtK (ORCPT ); Thu, 14 Apr 2016 13:49:10 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:36615 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422739AbcDNRtF (ORCPT ); Thu, 14 Apr 2016 13:49:05 -0400 From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Cc: Gustavo Padovan , David Airlie , linux-kernel@vger.kernel.org (open list) Subject: [PATCH 14/14] drm: remove legacy drm_send_vblank_event() Date: Thu, 14 Apr 2016 10:48:25 -0700 Message-Id: <1460656118-16766-14-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1460656118-16766-1-git-send-email-gustavo@padovan.org> References: <1460656118-16766-1-git-send-email-gustavo@padovan.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Gustavo Padovan We don't have any user of this function anymore, let's remove it. Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/drm_irq.c | 31 ++++++------------------------- include/drm/drmP.h | 2 -- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 3c1a6f1..c0205ed 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1100,21 +1100,19 @@ void drm_crtc_arm_vblank_event(struct drm_crtc *crtc, EXPORT_SYMBOL(drm_crtc_arm_vblank_event); /** - * drm_send_vblank_event - helper to send vblank event after pageflip - * @dev: DRM device - * @pipe: CRTC index + * drm_crtc_send_vblank_event - helper to send vblank event after pageflip + * @crtc: the source CRTC of the vblank event * @e: the event to send * * Updates sequence # and timestamp on event, and sends it to userspace. * Caller must hold event lock. - * - * This is the legacy version of drm_crtc_send_vblank_event(). */ -void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe, - struct drm_pending_vblank_event *e) +void drm_crtc_send_vblank_event(struct drm_crtc *crtc, + struct drm_pending_vblank_event *e) { + struct drm_device *dev = crtc->dev; + unsigned int seq, pipe = drm_crtc_index(crtc); struct timeval now; - unsigned int seq; if (dev->num_crtcs > 0) { seq = drm_vblank_count_and_time(dev, pipe, &now); @@ -1126,23 +1124,6 @@ void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe, e->pipe = pipe; send_vblank_event(dev, e, seq, &now); } -EXPORT_SYMBOL(drm_send_vblank_event); - -/** - * drm_crtc_send_vblank_event - helper to send vblank event after pageflip - * @crtc: the source CRTC of the vblank event - * @e: the event to send - * - * Updates sequence # and timestamp on event, and sends it to userspace. - * Caller must hold event lock. - * - * This is the native KMS version of drm_send_vblank_event(). - */ -void drm_crtc_send_vblank_event(struct drm_crtc *crtc, - struct drm_pending_vblank_event *e) -{ - drm_send_vblank_event(crtc->dev, drm_crtc_index(crtc), e); -} EXPORT_SYMBOL(drm_crtc_send_vblank_event); /** diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 3c8422c..d0e1332 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -970,8 +970,6 @@ extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe, struct timeval *vblanktime); extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc, struct timeval *vblanktime); -extern void drm_send_vblank_event(struct drm_device *dev, unsigned int pipe, - struct drm_pending_vblank_event *e); extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc, struct drm_pending_vblank_event *e); extern void drm_arm_vblank_event(struct drm_device *dev, unsigned int pipe, -- 2.5.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gustavo Padovan Subject: [PATCH 14/14] drm: remove legacy drm_send_vblank_event() Date: Thu, 14 Apr 2016 10:48:25 -0700 Message-ID: <1460656118-16766-14-git-send-email-gustavo@padovan.org> References: <1460656118-16766-1-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pf0-f170.google.com (mail-pf0-f170.google.com [209.85.192.170]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B8436EAC6 for ; Thu, 14 Apr 2016 17:49:05 +0000 (UTC) Received: by mail-pf0-f170.google.com with SMTP id c20so48093360pfc.1 for ; Thu, 14 Apr 2016 10:49:05 -0700 (PDT) In-Reply-To: <1460656118-16766-1-git-send-email-gustavo@padovan.org> 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 Cc: Gustavo Padovan , open list List-Id: dri-devel@lists.freedesktop.org RnJvbTogR3VzdGF2byBQYWRvdmFuIDxndXN0YXZvLnBhZG92YW5AY29sbGFib3JhLmNvLnVrPgoK V2UgZG9uJ3QgaGF2ZSBhbnkgdXNlciBvZiB0aGlzIGZ1bmN0aW9uIGFueW1vcmUsIGxldCdzIHJl bW92ZSBpdC4KClNpZ25lZC1vZmYtYnk6IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFu QGNvbGxhYm9yYS5jby51az4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX2lycS5jIHwgMzEgKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogaW5jbHVkZS9kcm0vZHJtUC5oICAgICAgICB8 ICAyIC0tCiAyIGZpbGVzIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9pcnEuYyBiL2RyaXZlcnMvZ3B1L2Ry bS9kcm1faXJxLmMKaW5kZXggM2MxYTZmMS4uYzAyMDVlZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9n cHUvZHJtL2RybV9pcnEuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2lycS5jCkBAIC0xMTAw LDIxICsxMTAwLDE5IEBAIHZvaWQgZHJtX2NydGNfYXJtX3ZibGFua19ldmVudChzdHJ1Y3QgZHJt X2NydGMgKmNydGMsCiBFWFBPUlRfU1lNQk9MKGRybV9jcnRjX2FybV92YmxhbmtfZXZlbnQpOwog CiAvKioKLSAqIGRybV9zZW5kX3ZibGFua19ldmVudCAtIGhlbHBlciB0byBzZW5kIHZibGFuayBl dmVudCBhZnRlciBwYWdlZmxpcAotICogQGRldjogRFJNIGRldmljZQotICogQHBpcGU6IENSVEMg aW5kZXgKKyAqIGRybV9jcnRjX3NlbmRfdmJsYW5rX2V2ZW50IC0gaGVscGVyIHRvIHNlbmQgdmJs YW5rIGV2ZW50IGFmdGVyIHBhZ2VmbGlwCisgKiBAY3J0YzogdGhlIHNvdXJjZSBDUlRDIG9mIHRo ZSB2YmxhbmsgZXZlbnQKICAqIEBlOiB0aGUgZXZlbnQgdG8gc2VuZAogICoKICAqIFVwZGF0ZXMg c2VxdWVuY2UgIyBhbmQgdGltZXN0YW1wIG9uIGV2ZW50LCBhbmQgc2VuZHMgaXQgdG8gdXNlcnNw YWNlLgogICogQ2FsbGVyIG11c3QgaG9sZCBldmVudCBsb2NrLgotICoKLSAqIFRoaXMgaXMgdGhl IGxlZ2FjeSB2ZXJzaW9uIG9mIGRybV9jcnRjX3NlbmRfdmJsYW5rX2V2ZW50KCkuCiAgKi8KLXZv aWQgZHJtX3NlbmRfdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHVuc2lnbmVk IGludCBwaXBlLAotCQkJICAgc3RydWN0IGRybV9wZW5kaW5nX3ZibGFua19ldmVudCAqZSkKK3Zv aWQgZHJtX2NydGNfc2VuZF92YmxhbmtfZXZlbnQoc3RydWN0IGRybV9jcnRjICpjcnRjLAorCQkJ CXN0cnVjdCBkcm1fcGVuZGluZ192YmxhbmtfZXZlbnQgKmUpCiB7CisJc3RydWN0IGRybV9kZXZp Y2UgKmRldiA9IGNydGMtPmRldjsKKwl1bnNpZ25lZCBpbnQgc2VxLCBwaXBlID0gZHJtX2NydGNf aW5kZXgoY3J0Yyk7CiAJc3RydWN0IHRpbWV2YWwgbm93OwotCXVuc2lnbmVkIGludCBzZXE7CiAK IAlpZiAoZGV2LT5udW1fY3J0Y3MgPiAwKSB7CiAJCXNlcSA9IGRybV92YmxhbmtfY291bnRfYW5k X3RpbWUoZGV2LCBwaXBlLCAmbm93KTsKQEAgLTExMjYsMjMgKzExMjQsNiBAQCB2b2lkIGRybV9z ZW5kX3ZibGFua19ldmVudChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlw ZSwKIAllLT5waXBlID0gcGlwZTsKIAlzZW5kX3ZibGFua19ldmVudChkZXYsIGUsIHNlcSwgJm5v dyk7CiB9Ci1FWFBPUlRfU1lNQk9MKGRybV9zZW5kX3ZibGFua19ldmVudCk7Ci0KLS8qKgotICog ZHJtX2NydGNfc2VuZF92YmxhbmtfZXZlbnQgLSBoZWxwZXIgdG8gc2VuZCB2YmxhbmsgZXZlbnQg YWZ0ZXIgcGFnZWZsaXAKLSAqIEBjcnRjOiB0aGUgc291cmNlIENSVEMgb2YgdGhlIHZibGFuayBl dmVudAotICogQGU6IHRoZSBldmVudCB0byBzZW5kCi0gKgotICogVXBkYXRlcyBzZXF1ZW5jZSAj IGFuZCB0aW1lc3RhbXAgb24gZXZlbnQsIGFuZCBzZW5kcyBpdCB0byB1c2Vyc3BhY2UuCi0gKiBD YWxsZXIgbXVzdCBob2xkIGV2ZW50IGxvY2suCi0gKgotICogVGhpcyBpcyB0aGUgbmF0aXZlIEtN UyB2ZXJzaW9uIG9mIGRybV9zZW5kX3ZibGFua19ldmVudCgpLgotICovCi12b2lkIGRybV9jcnRj X3NlbmRfdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1fY3J0YyAqY3J0YywKLQkJCQlzdHJ1Y3QgZHJt X3BlbmRpbmdfdmJsYW5rX2V2ZW50ICplKQotewotCWRybV9zZW5kX3ZibGFua19ldmVudChjcnRj LT5kZXYsIGRybV9jcnRjX2luZGV4KGNydGMpLCBlKTsKLX0KIEVYUE9SVF9TWU1CT0woZHJtX2Ny dGNfc2VuZF92YmxhbmtfZXZlbnQpOwogCiAvKioKZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2Ry bVAuaCBiL2luY2x1ZGUvZHJtL2RybVAuaAppbmRleCAzYzg0MjJjLi5kMGUxMzMyIDEwMDY0NAot LS0gYS9pbmNsdWRlL2RybS9kcm1QLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtUC5oCkBAIC05NzAs OCArOTcwLDYgQEAgZXh0ZXJuIHUzMiBkcm1fdmJsYW5rX2NvdW50X2FuZF90aW1lKHN0cnVjdCBk cm1fZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAogCQkJCSAgICAgc3RydWN0IHRpbWV2 YWwgKnZibGFua3RpbWUpOwogZXh0ZXJuIHUzMiBkcm1fY3J0Y192YmxhbmtfY291bnRfYW5kX3Rp bWUoc3RydWN0IGRybV9jcnRjICpjcnRjLAogCQkJCQkgIHN0cnVjdCB0aW1ldmFsICp2Ymxhbmt0 aW1lKTsKLWV4dGVybiB2b2lkIGRybV9zZW5kX3ZibGFua19ldmVudChzdHJ1Y3QgZHJtX2Rldmlj ZSAqZGV2LCB1bnNpZ25lZCBpbnQgcGlwZSwKLQkJCQkgIHN0cnVjdCBkcm1fcGVuZGluZ192Ymxh bmtfZXZlbnQgKmUpOwogZXh0ZXJuIHZvaWQgZHJtX2NydGNfc2VuZF92YmxhbmtfZXZlbnQoc3Ry dWN0IGRybV9jcnRjICpjcnRjLAogCQkJCSAgICAgICBzdHJ1Y3QgZHJtX3BlbmRpbmdfdmJsYW5r X2V2ZW50ICplKTsKIGV4dGVybiB2b2lkIGRybV9hcm1fdmJsYW5rX2V2ZW50KHN0cnVjdCBkcm1f ZGV2aWNlICpkZXYsIHVuc2lnbmVkIGludCBwaXBlLAotLSAKMi41LjUKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QK ZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9w Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=