Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp941007imc; Mon, 11 Mar 2019 03:00:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqwIDzmR0KYvJystYMRmKYyGlr19CohCsO3WlBhrAkWfhGXJ39EYzG5Wuy1HgGF2YZAkeypI X-Received: by 2002:a62:4586:: with SMTP id n6mr32517989pfi.43.1552298403384; Mon, 11 Mar 2019 03:00:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552298403; cv=none; d=google.com; s=arc-20160816; b=xBaOsGfeq4xmyzUWLbpjcBqx5oSDbzc1xUbbUkz0FnOzCC9gFW3+eSyfo5wahWbH/w vKVlTaFe0IvCJG9llSkSbhXRqpwiPKsAhUnOZToEWrCHaIWSiMNp49wdJjqdEMaxGy0E hqi6q2KZJ6ewO7a+Qby1/I+TkyuDrBIwpCvM28hxTL8/g6wm3ydkn7HvgHM4wXKGdusi yiBLFvVH5PPJ7MbGxCGetcVTTU/hSZBvcPfNuB9VZW2GFS4az6wSWK+15E59Lk2p/vQo K32ZlgdLlaCvI7X77N3ota9r4aqlDbQBPz6/Do2TPoKUE/+UCtGShqHWUHTkgkpbrzn0 JKRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=J63OSK6jJV4RYXnglHExqatZ+hdW5fSRwa/MBq2INCM=; b=N2mD7pbLXWWi4X2yYfGrPVB9OMplIP9l85q8HamqYfW6D4jeFslkFILF3Wd7WbDj6w MYG5ZdTc1JfnexPO2HEMVZIRPLmmrrYbAtFyErBXw8AC+1nqh97iFlgtR0NyxuAzrjSX 49pi0renaPbplMvdNOWqtkO/xtOhRBj/cl3Q2F1WdSo26bLgNXgqOu2vOv9uzpLoRjim 9N4Mw8elN+CHDCXSG6zwo65tD3egEhQuA361RjQqvlKywo1Z0QzEtvEXNvuU3e/BCUr8 agGBmcZAfsyp86W+R83gC2fLBBPF7zBMecMGxm5qN2LYAI5MnROUW+idjx2rqRxdq0TU ohEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=OpFFhfXt; 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 u15si5139374pfc.265.2019.03.11.02.59.47; Mon, 11 Mar 2019 03:00:03 -0700 (PDT) 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; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=OpFFhfXt; 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 S1727065AbfCKJ6v (ORCPT + 99 others); Mon, 11 Mar 2019 05:58:51 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:41729 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726567AbfCKJ6v (ORCPT ); Mon, 11 Mar 2019 05:58:51 -0400 Received: by mail-wr1-f67.google.com with SMTP id n2so4316711wrw.8 for ; Mon, 11 Mar 2019 02:58:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=J63OSK6jJV4RYXnglHExqatZ+hdW5fSRwa/MBq2INCM=; b=OpFFhfXt3p+3HgVr5AUJKNNRt6mXqaAXIYk8IwXFMaVNmo3gAouXRY3qM1zn9gOH2G 8rSNlKOvjfGItABJyV3K1mDod5HePxVvk3faPZfRmG/4aCwN/KQ9ernsoCzNmRD5yP4l RCqMYt5KPcsh8J3BOpEJSsaJU62na5FR34aDp9TiF1DTiFNU7V0yWXJnBLPArc7BrlPE prjn5rTauwNPDCL5fDSgQolCWDarftydCgtLzSQgCb/+35WE53kY63dyckT/8HaxBjmS EBIXJj2c3CdOvC9ZhAVNgBAPgNAQl7ujDvgXovF0kLOJBg6aQEgrL50ML1AF8qXhvV3J TqlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=J63OSK6jJV4RYXnglHExqatZ+hdW5fSRwa/MBq2INCM=; b=Umh8hndsnx5jcmWydb22ONHelhTPjtQVcfx5/bDTIaJUClA8xQYbFOnNYA8m6u8rfA MRGpSM7t0JvzhPah3c2N+krUANVRcJtcR0WE7HrgtTBzbzNfFyR57bbZYvIsUy7qfY1z o/FXUCeZvgAZIP2L+0tZirBKOkHtzaZNwGolbT3yRa1LzsxbL43ocxTXrvyWPuLHY2rM fPdHCANsYXcUfZC3U33BXuRnC248oHMmEzKKWTSR23A0Git3qmr+owrs9eJ6DyvtbpHd JBEAE9BokO1hQqS9YoaN0KPn+N1V1TBx3AGjn8kFmurkj4T7vIoIlnt6nEEmRC0PwHdX Tvpg== X-Gm-Message-State: APjAAAU2pb7hcu1JWv5QlvJlpFGCyGyM01WIXbzcwBoSDg76hOhWMmrS zNrEZQtia9CGP4ZrLFu4/0IUDvWeLjbmlS1X3S3OcA== X-Received: by 2002:a05:6000:124d:: with SMTP id j13mr18519993wrx.102.1552298329638; Mon, 11 Mar 2019 02:58:49 -0700 (PDT) MIME-Version: 1.0 References: <20190204095532.27185-1-narmstrong@baylibre.com> In-Reply-To: <20190204095532.27185-1-narmstrong@baylibre.com> From: Maxime Jourdan Date: Mon, 11 Mar 2019 10:58:38 +0100 Message-ID: Subject: Re: [PATCH] drm/meson: handle when meson_canvas_get returns -EPROBE_DEFER To: Neil Armstrong Cc: daniel@ffwll.ch, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Neil, On Mon, Feb 4, 2019 at 10:55 AM Neil Armstrong wrote: > > When meson_canvas is not yet probed, meson_canvas_get returns -EPROBE_DEFER. > > Handle this case but deferring the probe of the drm driver aswell. > > Fixes: 66cae477c380 ("drm/meson: Use optional canvas provider") > Signed-off-by: Neil Armstrong > --- > drivers/gpu/drm/meson/meson_drv.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c > index ef4afaadaf8d..17e55d63daff 100644 > --- a/drivers/gpu/drm/meson/meson_drv.c > +++ b/drivers/gpu/drm/meson/meson_drv.c > @@ -236,6 +236,9 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) > meson_canvas_free(priv->canvas, priv->canvas_id_vd1_1); > goto free_drm; > } > + } else if (PTR_ERR(priv->canvas) == -EPROBE_DEFER) { > + ret = PTR_ERR(priv->canvas); > + goto free_drm; > } else { > priv->canvas = NULL; > > -- > 2.20.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel With the upcoming patch series that aims at removing the DMC register range from the DRM driver's control, this fix will be incorporated, although rewritten because of code modifications in this partilcular area. Maxime