From patchwork Sun Feb 22 11:24:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 5861681 Return-Path: X-Original-To: patchwork-dri-devel@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 94A579F3CA for ; Sun, 22 Feb 2015 11:23:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7A71820602 for ; Sun, 22 Feb 2015 11:23:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 20739205F9 for ; Sun, 22 Feb 2015 11:23:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5EEA26E2FA; Sun, 22 Feb 2015 03:23:04 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A67A6E125 for ; Sun, 22 Feb 2015 03:23:02 -0800 (PST) Received: by mail-wi0-f182.google.com with SMTP id l15so11138684wiw.3 for ; Sun, 22 Feb 2015 03:23:01 -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:in-reply-to:references; bh=MDmeO2TfV9v1sSsLGtkqFSamnr9Prbzxddz4ymbNJS4=; b=c+LHn70VpWb0aeN83EiyqyTJf85EdUZPEAe7Ab++2rRTsnVS2ET2m472vZ87I0/54A n6F5RRwrlWL8tb3Rmci2pVSh9JbMvERG7vAk/neyH80H6n66jjmZ+p6AhA8uuVc2Da3P tZGULjF1Fwx7Zj7Jl5KcESj+IW7sBN61+sXr4= 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:in-reply-to :references; bh=MDmeO2TfV9v1sSsLGtkqFSamnr9Prbzxddz4ymbNJS4=; b=lNIEiRFJLt8V3/lZXAIHLoRamvlReAzY2UQ9NvmBWG3HWMIRp30QdDnZKtJ2Bl/Rqa ZcKdnsVwW0t/SLqqC8RK1FmpM9bbBBm0IK8ZgNt+yjUlRH6ktgUdCBF/edzTfF5oaKW3 102TBdS0cCm6ewRMnRSUSjzckHtP3/X4eskEk1zAcL8X2GNu5UDLBBEsUn8Xcwm487Dz 2616dMOmtWjikrNiNhihnoIEIxT1NKgg4CpaID2iYF1moESIj33tA5XGM0eWcy1l7LQ8 0aAD+/QOLENxIFi4l7X+zqFt7kxh3MWCxq/iCVgmKMVsArGNT+E1SVni4eO4agOhegPT qe2A== X-Gm-Message-State: ALoCoQl6qhluwh2/mNINshTi7tRyQexFJjSbfAOTS75TVDzTwPFay7uF12fX6TiPgabmiylsPfz6 X-Received: by 10.180.97.67 with SMTP id dy3mr11002324wib.65.1424604181513; Sun, 22 Feb 2015 03:23:01 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by mx.google.com with ESMTPSA id v7sm50694896wju.22.2015.02.22.03.23.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Feb 2015 03:23:00 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 2/5] drm: If available use atomic state in getcrtc ioctl Date: Sun, 22 Feb 2015 12:24:17 +0100 Message-Id: <1424604260-25134-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1424604260-25134-1-git-send-email-daniel.vetter@ffwll.ch> References: <1424604260-25134-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 This way drivers fully converted to atomic don't need to update these legacy state variables in their modeset code any more. Signed-off-by: Daniel Vetter Reviewed-by: Rob Clark --- drivers/gpu/drm/drm_crtc.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 6b6b07ff720b..0dbe417bc841 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -2009,21 +2009,32 @@ int drm_mode_getcrtc(struct drm_device *dev, return -ENOENT; drm_modeset_lock_crtc(crtc, crtc->primary); - crtc_resp->x = crtc->x; - crtc_resp->y = crtc->y; crtc_resp->gamma_size = crtc->gamma_size; if (crtc->primary->fb) crtc_resp->fb_id = crtc->primary->fb->base.id; else crtc_resp->fb_id = 0; - if (crtc->enabled) { - - drm_crtc_convert_to_umode(&crtc_resp->mode, &crtc->mode); - crtc_resp->mode_valid = 1; + if (crtc->state) { + crtc_resp->x = crtc->primary->state->src_x >> 16; + crtc_resp->y = crtc->primary->state->src_y >> 16; + if (crtc->state->enable) { + drm_crtc_convert_to_umode(&crtc_resp->mode, &crtc->state->mode); + crtc_resp->mode_valid = 1; + } else { + crtc_resp->mode_valid = 0; + } } else { - crtc_resp->mode_valid = 0; + crtc_resp->x = crtc->x; + crtc_resp->y = crtc->y; + if (crtc->enabled) { + drm_crtc_convert_to_umode(&crtc_resp->mode, &crtc->mode); + crtc_resp->mode_valid = 1; + + } else { + crtc_resp->mode_valid = 0; + } } drm_modeset_unlock_crtc(crtc);