From patchwork Tue Nov 3 21:54:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 11879101 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=-12.3 required=3.0 tests=BAYES_00, 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,URIBL_BLOCKED,USER_AGENT_GIT 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 1CC44C388F9 for ; Tue, 3 Nov 2020 21:55:02 +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 A62B320780 for ; Tue, 3 Nov 2020 21:55:01 +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="oB2hszEd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A62B320780 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 C73626E901; Tue, 3 Nov 2020 21:55:00 +0000 (UTC) Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by gabe.freedesktop.org (Postfix) with ESMTPS id 818146E900; Tue, 3 Nov 2020 21:54:59 +0000 (UTC) Received: by mail-qk1-x743.google.com with SMTP id r7so16807617qkf.3; Tue, 03 Nov 2020 13:54:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FOknlbnKpCVAtGSWxlqPW1DtkJzZpjPZuumMdi6S168=; b=oB2hszEdB0Fi8YkuL1JObVz7xviMJZP73w+zBWXll4hEboZ0EIVE67BrJPbRuoV1id jrFPOeLZSnrxF+asrEKHjTHkE1JZQKP2PwICUqFZdXd8FVuYKin8kdw1vhgRADxaDr/g y5dCc8owptOVpHFa3/o+pK5QJ2KyJofUz6UBjdm0FG6zuJggMpfwcIcrjC4EMvo7uz8S vjp5ujH5RSRE+fbPfD3glgdpTvbrrnlGXLjDnEYCMlrhRSDmvi/mATD2FZvQ1uivbpyi /P+sBy2PdulTN1vtu3qWPHnMxXkX3EfjjBx38HTL1apn/ALcNDplF8kQwlsrYffqj4ZV N9KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=FOknlbnKpCVAtGSWxlqPW1DtkJzZpjPZuumMdi6S168=; b=N5nnRpZTxconGKyGoB4G91O5aLkOK7fJwE9JNo9d45v/w00yw00eSpzQ3nzwSEYXb1 7Qp+ykDXplOvQ7rgUs3YPM2cQD/hU0j026BeIrPtqmsy5f3GeFwSlGk8NNrMcERBPaQl iJBYzXK8IxD/Pss1RcUThUDIDnMgIqU+FvK/gnbx9vmVhYIlIQS9BDRaKSva8VGEeaoQ 2VsGxrxak2w1gnRH+lxf2qGbVKJ8kDJ6GpkzZve9bzIJ8vSYJC1gQMPz5142yBNhQm1w CgbCNFMLG3DbYIP+Bg+/zOYf6gfO24yF3zyT/NdHb+57+8Wt2denkPV5FhY67IH76LLk cyHQ== X-Gm-Message-State: AOAM533ZDLX8vd8B1YvWOK6nOOtFXskTaLM/R4PHIUnGCzFO5kiNqCz8 UzexQVVi7D87cdqm9oYhkKwDVnHMVio= X-Google-Smtp-Source: ABdhPJw04lczAquEKXi2vrXX4KWwW/s5tV1D/U3W+IC1TWFRlQXAJWuj44hOue/IvuOrUXhik9Ga6w== X-Received: by 2002:a37:9bc6:: with SMTP id d189mr11472504qke.117.1604440498534; Tue, 03 Nov 2020 13:54:58 -0800 (PST) Received: from tr4.amd.com (atlvpn.amd.com. [165.204.84.11]) by smtp.gmail.com with ESMTPSA id x22sm48890qki.104.2020.11.03.13.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 13:54:57 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/amdgpu/virt: fix handling of the atomic flag Date: Tue, 3 Nov 2020 16:54:50 -0500 Message-Id: <20201103215450.815572-1-alexander.deucher@amd.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 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: Alex Deucher , daniel.vetter@ffwll.ch Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Use the per device drm driver feature flags rather than the global one. This way we can make the drm driver struct const. Signed-off-by: Alex Deucher Reviewed-by: Luben Tuikov Reviewed-by: Daniel Vetter --- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c index d0aea5e39531..8aff6ef50f91 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c @@ -47,11 +47,13 @@ bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev) void amdgpu_virt_init_setting(struct amdgpu_device *adev) { + struct drm_device *ddev = adev_to_drm(adev); + /* enable virtual display */ if (adev->mode_info.num_crtc == 0) adev->mode_info.num_crtc = 1; adev->enable_virtual_display = true; - adev_to_drm(adev)->driver->driver_features &= ~DRIVER_ATOMIC; + ddev->driver_features &= ~DRIVER_ATOMIC; adev->cg_flags = 0; adev->pg_flags = 0; }