Received: by 2002:a05:6359:6284:b0:131:369:b2a3 with SMTP id se4csp3540987rwb; Mon, 7 Aug 2023 15:38:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHktlX/T4WjSIc9q9J0SnvqGHyekzFjUDV3O6j7lebZidqBMO9YHGW26uwmAOX4dKBYz+1t X-Received: by 2002:a05:6a20:7f90:b0:137:3b34:93e5 with SMTP id d16-20020a056a207f9000b001373b3493e5mr15764313pzj.59.1691447931924; Mon, 07 Aug 2023 15:38:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691447931; cv=none; d=google.com; s=arc-20160816; b=GJODoqZi2BCjOtdNeLrmvKB0/aKMheoiYX/ggp1/F0mwec2yqbIWFS+GfV3OXae2KW NwcQIWTCvnHUs5sG/8ga50/IGMIJEUMDOjLv9cx9AnbcCWpXYqLoW5Fefu2sPUw+Ernm WWSuU5CsIELn+Cd38lvdwio/zPP7tmx+WrwR4oS6CTf9LI+mhaA/EilwT3pVyjHsYqLD vJUdWNxzTqypgZvPdgu8E7RAEJf/hkU4JUN3Ilwu2QiOSFByDH+NAS/J97xggAq++NYj Mg56rLtHCbbgNEOzvVtTaMkZgdnNuGOL9FCvyNsNnsqxqcrAAujMtfbTsMwdlDtnKL+O lrtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:user-agent :content-transfer-encoding:organization:references:in-reply-to:date :cc:to:from:subject:message-id:dkim-signature; bh=Ef2qFHsqfq9w04kkUFwpr5VGp6ZXP1q9+YtKoiAHED8=; fh=Aa2Xqs3+1+4mZAFJ4g3cWx5dPIVwyoPQdZUzVyzqp+o=; b=CiOCyAkIzl+vDnBEvBm8eqwI4C1f2DRM9HoqtaHSXj++odj/CCwhsSvS0GS1Ia7z9G clQKT8SV4Cl8j7PRvJdVId/b4W3/V9+YSEQATxvdORd3SZhCEWv38H4B0fQb41kiBNev pHwbXgw7EELFNubfUSnzqnPDdH2MEZa7njdWKnNiu0J2LxJPa8pT+9rK+n4B3QiWWn4M qBbedplA58NUcukr4tla9BRLJALjxH9KxmdGCAQok34xs5j/TenJxmaWwXI8lZ1f3FR6 iaso+Svhcw38aIkJjW2YL4nmukBwAtUJ6q11qa/VsPgUyhSHwrtSUGRC+7Zuf/EBUY3N ogSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=anh3X1KX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c29-20020a631c5d000000b00563e09f3c3esi6039015pgm.359.2023.08.07.15.38.39; Mon, 07 Aug 2023 15:38:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=anh3X1KX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229893AbjHGUdv (ORCPT + 99 others); Mon, 7 Aug 2023 16:33:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229503AbjHGUdu (ORCPT ); Mon, 7 Aug 2023 16:33:50 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1B0910D8 for ; Mon, 7 Aug 2023 13:32:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691440379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ef2qFHsqfq9w04kkUFwpr5VGp6ZXP1q9+YtKoiAHED8=; b=anh3X1KXDChmrXDskB5b+O4TKCj/wt3Q0l6wC4kUsM+6I/q/q4QH/5KpIHcukRZs7c4rXB zRbyl3P8SNp/Q+XJuhVXph6B0f4ED0bR/rUlP5qPHUpab9pmLPU40Y2a7l4dDUJ17Y093i 7Xv5peG7y6qh0jpoibP+jh13xRUd3+E= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-SVUP9cvKPJO68kX_eC-L6Q-1; Mon, 07 Aug 2023 16:32:56 -0400 X-MC-Unique: SVUP9cvKPJO68kX_eC-L6Q-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-40feb0c08c0so37243741cf.3 for ; Mon, 07 Aug 2023 13:32:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691440376; x=1692045176; h=mime-version:user-agent:content-transfer-encoding:organization :references:in-reply-to:date:cc:to:from:subject:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ef2qFHsqfq9w04kkUFwpr5VGp6ZXP1q9+YtKoiAHED8=; b=iAhx4+ocPXcbI82fRnsLhYa9ODrJkWsVCAqa7Dp2FlqWmV1lEgxE9714llb6tRSwgv JCkRJbS/PlfVJGXUgYIy24drvlqIJlUMkxLtJ/nkXuTh1djO9L6KJC2cccftEnGKrz04 beTFaqh3s1dD9jtG2olSKxqM8qsDDsr6lmT6NuCpTbo0L8a1qWazngynIovLGZCkPt7r 7DKMnXdI97cttEop1FycomsrcFqylmpK7Utsd4mwqH6gSxFezaBcioeBSFz5+BdxK56C Yaqr3c2OnTiVxQGrsmX8DP2f3UkbrFABaVY7/kX7BgQ8ZT312xPpLaS1nD1QeikpM+ys eTQQ== X-Gm-Message-State: AOJu0YzYWfRZTUxvvVmdayqJFCf4XVxGWvvszKQ6CMWIL7SFt3XTK7Wd 9pEhwyz3jv6eUrF3GgMA1s01cGAm9W0hycWcXHLl0J4N0fToJrMwPFUKzUyIr7dGNWNTGDqVqr9 ax9Fs+ADWX0lI4pYvjgEyrEWg X-Received: by 2002:a05:622a:1301:b0:410:682:972c with SMTP id v1-20020a05622a130100b004100682972cmr6058591qtk.62.1691440375833; Mon, 07 Aug 2023 13:32:55 -0700 (PDT) X-Received: by 2002:a05:622a:1301:b0:410:682:972c with SMTP id v1-20020a05622a130100b004100682972cmr6058576qtk.62.1691440375600; Mon, 07 Aug 2023 13:32:55 -0700 (PDT) Received: from ?IPv6:2600:4040:5c7d:5f00:6966:42dc:c4a4:dad3? ([2600:4040:5c7d:5f00:6966:42dc:c4a4:dad3]) by smtp.gmail.com with ESMTPSA id r17-20020ac87951000000b00401217aa51dsm2894075qtt.76.2023.08.07.13.32.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 13:32:54 -0700 (PDT) Message-ID: Subject: Re: [PATCH] drm/nouveau/disp: Revert a NULL check inside nouveau_connector_get_modes From: Lyude Paul To: Karol Herbst , linux-kernel@vger.kernel.org Cc: Ben Skeggs , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, Olaf Skibbe Date: Mon, 07 Aug 2023 16:32:53 -0400 In-Reply-To: <20230805101813.2603989-1-kherbst@redhat.com> References: <20230805101813.2603989-1-kherbst@redhat.com> Organization: Red Hat Inc. Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.3 (3.48.3-1.fc38) MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ugh, thanks for catching this! Reviewed-by: Lyude Paul On Sat, 2023-08-05 at 12:18 +0200, Karol Herbst wrote: > The original commit adding that check tried to protect the kenrel against > a potential invalid NULL pointer access. >=20 > However we call nouveau_connector_detect_depth once without a native_mode > set on purpose for non LVDS connectors and this broke DP support in a few > cases. >=20 > Cc: Olaf Skibbe > Cc: Lyude Paul > Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/238 > Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/245 > Fixes: 20a2ce87fbaf8 ("drm/nouveau/dp: check for NULL nv_connector->nativ= e_mode") > Signed-off-by: Karol Herbst > --- > drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/dr= m/nouveau/nouveau_connector.c > index f75c6f09dd2af..a2e0033e8a260 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_connector.c > +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c > @@ -967,7 +967,7 @@ nouveau_connector_get_modes(struct drm_connector *con= nector) > /* Determine display colour depth for everything except LVDS now, > * DP requires this before mode_valid() is called. > */ > - if (connector->connector_type !=3D DRM_MODE_CONNECTOR_LVDS && nv_connec= tor->native_mode) > + if (connector->connector_type !=3D DRM_MODE_CONNECTOR_LVDS) > nouveau_connector_detect_depth(connector); > =20 > /* Find the native mode if this is a digital panel, if we didn't --=20 Cheers, Lyude Paul (she/her) Software Engineer at Red Hat