From patchwork Mon Nov 14 09:02:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9426887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AA3AF6047D for ; Mon, 14 Nov 2016 09:03:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8BA3A286DE for ; Mon, 14 Nov 2016 09:03:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D68828772; Mon, 14 Nov 2016 09:03:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 06C9B286DE for ; Mon, 14 Nov 2016 09:03:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A47156E005; Mon, 14 Nov 2016 09:03:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 261B96E005 for ; Mon, 14 Nov 2016 09:03:05 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id g23so13391918wme.1 for ; Mon, 14 Nov 2016 01:03:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pSJb9O56r5s3UiMtR8L9ZxDFBObq63PxYoTkoXagjmQ=; b=Il6EOmqCy4m5MYZ/YQ0kssBMOCFJCOKDVe0HcqPsnlXifkJ/GzaPhOiP/Ml8E2gU2E lN0GJ5pN2jJXIm+vvYqj/l7L3478N+yEHVv4+SuOlZPIUC+7W4TEQDsixTFiuDeIAxc2 SeSEAZ6nD7bmdmUoudLwQMcTOpL8usRk5f4ng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pSJb9O56r5s3UiMtR8L9ZxDFBObq63PxYoTkoXagjmQ=; b=Uj3oxOVYNPgGXulmC94WriUJ4pJATS+tWdROOuPFF+acZexEpbEObLNMRav61Cct4b P5NEmkXAU//N33237QlsbTMYmD8mNgUc/zasH+BtwM+0vxfsbFIDhYZxg0Ce5eykFNgN OTPssDic1uY51RFbDZO1ZQ8wEfcKn6c+Ai9rHfQJ5PzmXRHE0aMHs4m5QOk5Uwff2pFn j+oV5a2fAEUdDIu60olWijdFG8xx4bVXjq0+CR4y7D63FZ4WRXQMPaA9L5Ja8apwj6Gb Qs4YPP5EhCOy6xxmJ0lEbw9T85CJ1CtAgs45we0FS1dIsO3OzyduOnqn2fl/H8az84g4 juxw== X-Gm-Message-State: ABUngvcflJOp5qXkXnZMZPoXM/OmCXOAczvSM8RSnCwn7s6JW8P6Wvg6IG0BrJTSWv893Q== X-Received: by 10.194.95.35 with SMTP id dh3mr21215429wjb.141.1479114183733; Mon, 14 Nov 2016 01:03:03 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id hy10sm27393012wjb.10.2016.11.14.01.03.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2016 01:03:02 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/6] drm/amdgpu: Use drm_crtc_vblank_on/off for dce6 Date: Mon, 14 Nov 2016 10:02:50 +0100 Message-Id: <20161114090255.31595-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.10.2 MIME-Version: 1.0 Cc: Alex Deucher , Daniel Vetter , =?UTF-8?q?Christian=20K=C3=B6nig?= , Daniel Vetter , Ken Wang X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This old code pattern was reintroduced in Author: Ken Wang Date: Tue Jan 19 14:03:24 2016 +0800 drm/amdgpu: add display controller implementation for si v10 Realign it with later display code. Tsk, tsk for massive copypasting ;-) Cc: Christian König Cc: Ken Wang Cc: Alex Deucher Signed-off-by: Daniel Vetter Acked-by: Christian König for the whole series. --- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c index c1bd1beab655..bc9f2f423270 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c @@ -2040,13 +2040,13 @@ static void dce_v6_0_crtc_dpms(struct drm_crtc *crtc, int mode) type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id); amdgpu_irq_update(adev, &adev->crtc_irq, type); amdgpu_irq_update(adev, &adev->pageflip_irq, type); - drm_vblank_post_modeset(dev, amdgpu_crtc->crtc_id); + drm_crtc_vblank_on(crtc); dce_v6_0_crtc_load_lut(crtc); break; case DRM_MODE_DPMS_STANDBY: case DRM_MODE_DPMS_SUSPEND: case DRM_MODE_DPMS_OFF: - drm_vblank_pre_modeset(dev, amdgpu_crtc->crtc_id); + drm_crtc_vblank_off(crtc); if (amdgpu_crtc->enabled) amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE); amdgpu_atombios_crtc_enable(crtc, ATOM_DISABLE);