Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2975853imu; Sun, 9 Dec 2018 14:05:57 -0800 (PST) X-Google-Smtp-Source: AFSGD/UCFOT0ub71APK5FDPk1TeUEaCgIqX6NlvXLv13pWk/z8mQ8eKRnDvFE2Xu3GBFeB9Wiyco X-Received: by 2002:a63:5a08:: with SMTP id o8mr8736696pgb.185.1544393157906; Sun, 09 Dec 2018 14:05:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544393157; cv=none; d=google.com; s=arc-20160816; b=N4D/Hg2hBlPP3nSKPXMtTxvcQ3EP6fdY4pphlMDrCP6Lf0rb/hNzw2Vyq7t/lKL38x Wl6YPVWgGzDStl3TFh3uVH+f+wCm9w3qbCGQv1hAdcWpIbkhPUdRKTlWT6P4LBnvJ7CZ 33sLKIA55j+Qzdx6y4zM7N2BjW6MnfkJYKDWpCzOdKKMsW90zs+o//xeE5FCkOo3ct0I sMyCQbgiWPxXbZcU1tZsB3FFzqG2xljPMEuLz1BwuQeDp9p6xOUeSllxChQJLp02bPZG XbQa8HFkfktbQS7YlPgmNk/iY9dm4JpVn62mu0KYCouioWsPCFwLKCSUPY9udUtr2e8S mQLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=Jm2j+7oYiwuofXLS5I8cwE6CdmvumrPwu1rqRFRAjyk=; b=UlDtsUu8BTcI0XxzcP0TPyOg7jOOkPOeyDunazFTHmBaLnWgU2qPMXJQvPhCE3j/rM 4YaoLTcumc6u1TWtjOcOqShRmJpLjUwiAzbgcnVvZsye3StOaHPw4gOgHluFh0amivXN /DwOgjAoOTXyDm0G11cpkWJApZVUSaskO+o51amV23cD9spJpHHgJM7iicHRSOkLPk/K PDHRSHtsDv+XzEQQaWtxYHceslXAvG2Xw1IMgy577JNf9sfoiR0DaWkGlv3XOIkaTUe4 wCnuebWmKocjL//9jKppRLwsakt38iqDVuAEk3TjFrSZWfSKRXqCkP9JMHSaQvJ/Iwg/ qToA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v30si7841434pga.45.2018.12.09.14.05.42; Sun, 09 Dec 2018 14:05:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727512AbeLIWEV (ORCPT + 99 others); Sun, 9 Dec 2018 17:04:21 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:36768 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726697AbeLIWEN (ORCPT ); Sun, 9 Dec 2018 17:04:13 -0500 Received: from pub.yeoldevic.com ([81.174.156.145] helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gW73M-0002pr-S3; Sun, 09 Dec 2018 21:55:56 +0000 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1gW72a-0003H0-8e; Sun, 09 Dec 2018 21:55:08 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Mikulas Patocka" , "Bartlomiej Zolnierkiewicz" Date: Sun, 09 Dec 2018 21:50:33 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) X-Patchwork-Hint: ignore Subject: [PATCH 3.16 061/328] udlfb: make a local copy of fb_ops In-Reply-To: X-SA-Exim-Connect-IP: 81.174.156.145 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.62-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Mikulas Patocka commit 2c29cfc3eaf11779176bf41475cfca49bccba11c upstream. The defio subsystem overwrites the method fb_osp->mmap. That method is stored in module's static data - and that means that if we have multiple diplaylink adapters, they will over write each other's method. In order to avoid interference between multiple adapters, we copy the fb_ops structure to a device-local memory. Signed-off-by: Mikulas Patocka Signed-off-by: Bartlomiej Zolnierkiewicz [bwh: Backported to 3.16: Pointer to struct dlfb_data is named "dev" rather than "dlfb"] Signed-off-by: Ben Hutchings --- drivers/video/fbdev/udlfb.c | 3 ++- include/video/udlfb.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) --- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -1680,7 +1680,8 @@ static void dlfb_init_framebuffer_work(s dev->info = info; info->par = dev; info->pseudo_palette = dev->pseudo_palette; - info->fbops = &dlfb_ops; + dev->ops = dlfb_ops; + info->fbops = &dev->ops; retval = fb_alloc_cmap(&info->cmap, 256, 0); if (retval < 0) { --- a/include/video/udlfb.h +++ b/include/video/udlfb.h @@ -51,6 +51,7 @@ struct dlfb_data { int base8; u32 pseudo_palette[256]; int blank_mode; /*one of FB_BLANK_ */ + struct fb_ops ops; /* blit-only rendering path metrics, exposed through sysfs */ atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */ atomic_t bytes_identical; /* saved effort with backbuffer comparison */