Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp299400pxj; Thu, 17 Jun 2021 03:03:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwal/mlDE8FzNTcRHzavxz+jOQQZrqTT/0bXj0jVgYcRn74ScZKzN2x4ucGKRQXAV9LWHW/ X-Received: by 2002:a6b:630c:: with SMTP id p12mr3137786iog.124.1623924219542; Thu, 17 Jun 2021 03:03:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623924219; cv=none; d=google.com; s=arc-20160816; b=PWZFRqms8LmPKBw6gZpFCSvJw4GyMNUj81R7UeUlEeSt+mAVXgTqb6yOmEzH/hBhPc 6W0WnfdfUQVtH//YPVzAxhtba/3I+7vXgc0VLq0mOR5vHCOUA1mUxIYDJCNzINHfoayV uJr38ysZ+skVT7Xs5Er8XAY8CSs0esF3yvorDg7j9GMHNL2N72CSBxXTVmQSBes5IlxJ IvsdFH+bYQIgu7iZnapfK7yozSc5vJkPe94ESlzZnfleF4BPK4JTdUrEt576lDD3EoKG 0HhVm9FbfMlFgxaH0LDhvH88cFrcX4potMvHM911SQfYUEFVfNJ4shRcxV5CcgMoBUG9 +tZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Q1LZxsytKV6RWv5u2Nt57LKRgelEVqsP1FFZ8y6g7ks=; b=AMOtPoLdvW/ZRdhqrKH83pW1TZvoPYmhZAVuNCQfyRyTTTea1i6/3WCtSgFg+uWt+J N+86KnCWd2NCVId2/Nwb1kPkM25t5xFdicN+BgN3FpHzS8zMDnZIwWExGuu2y6Ffebp1 YIGl6A/OCk6aFLvOoxIoomlfp0N/uBWL/Lz0LEYyyOZ8BgqXSs9j/0JTuTUsf1bPlCTO tUbIov5b1wB6bIa9eIN4Ijw+auKFo62Tl8dXX2z1b6djQJjCq0LbRthf/+Vo+GdfkfrW k8GBYPRNxwBQUElCG+VUS4RelqUORrFBhlKWrwNM/iRYe8L5B+RrWcKoLRwZahIy/LWg IBJA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q8si5343182ior.12.2021.06.17.03.03.27; Thu, 17 Jun 2021 03:03:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231819AbhFQJuF (ORCPT + 99 others); Thu, 17 Jun 2021 05:50:05 -0400 Received: from lucky1.263xmail.com ([211.157.147.130]:56762 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229901AbhFQJuE (ORCPT ); Thu, 17 Jun 2021 05:50:04 -0400 Received: from localhost (unknown [192.168.167.13]) by lucky1.263xmail.com (Postfix) with ESMTP id 59324D1E8B; Thu, 17 Jun 2021 17:47:41 +0800 (CST) X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ADDR-CHECKED4: 1 X-SKE-CHECKED: 1 X-ANTISPAM-LEVEL: 2 Received: from localhost.localdomain (unknown [111.207.172.18]) by smtp.263.net (postfix) whith ESMTP id P5456T140566025205504S1623923255883568_; Thu, 17 Jun 2021 17:47:42 +0800 (CST) X-IP-DOMAINF: 1 X-UNIQUE-TAG: X-RL-SENDER: maqianga@uniontech.com X-SENDER: maqianga@uniontech.com X-LOGIN-NAME: maqianga@uniontech.com X-FST-TO: maarten.lankhorst@linux.intel.com X-RCPT-COUNT: 8 X-SENDER-IP: 111.207.172.18 X-ATTACHMENT-NUM: 0 X-System-Flag: 0 From: Qiang Ma To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Qiang Ma Subject: [PATCH] drm/auth: Move master pointer from drm_device to drm_file Date: Thu, 17 Jun 2021 17:47:33 +0800 Message-Id: <20210617094733.8429-1-maqianga@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The drm_file pointer clears to zero during multi-user switching, so it needs to call drm_new_set_master for master pointer from drm_file. Signed-off-by: Qiang Ma --- drivers/gpu/drm/drm_auth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index f2d46b7ac6f9..02431af6d0c5 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c @@ -302,7 +302,7 @@ int drm_master_open(struct drm_file *file_priv) /* if there is no current master make this fd it, but do not create * any master object for render clients */ mutex_lock(&dev->master_mutex); - if (!dev->master) + if (!file_priv->master) ret = drm_new_set_master(dev, file_priv); else file_priv->master = drm_master_get(dev->master); -- 2.20.1