From nobody Tue Apr 7 13:09:46 2026 Received: from mail-dl1-f54.google.com (mail-dl1-f54.google.com [74.125.82.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24CD1303A12 for ; Fri, 13 Mar 2026 06:32:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773383570; cv=none; b=CpWrdwctGTTjYA+YIKZMHvJfSEdfwRfaohwHmkd9S4AwDhwpN8H1Ow0S0gSQEZha3BimBgn88eQPKvZ0rjXs71ZUVWyWGaGo150V7v2mO/bKm7bqp/aHOBVNEjyl1PfBLz2Yetm13WmkYQGBoXnjlZfamQrAW9CIvsIPXsDTKkc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773383570; c=relaxed/simple; bh=YB2vCNx+iBSPg29XKQVgAHE9+4XNezc4GjZqCThijD8=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=dXjFVWeqDDIAIgqFVpyisej0k4FRwEOe9leTiQbHXJzWs/I/v+BbaVz8IWKBcfuL2etdWh/wo8Ik+b1XxznRwg/hN90X+jfyCfSHsvGTHFYJz52dUmd1WFxaLjtvCCxzxbY4Y2Igw5Kes6pI40cuOVl0rMI70qxyOWk/7NG8QAY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NLay4o8Z; arc=none smtp.client-ip=74.125.82.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NLay4o8Z" Received: by mail-dl1-f54.google.com with SMTP id a92af1059eb24-12736a0147cso54472c88.1 for ; Thu, 12 Mar 2026 23:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773383566; x=1773988366; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=fl4H23Ge0Zsyj8n566Pf+v0tahs4AEuuruZIdW3bY9s=; b=NLay4o8ZP9pvXUk1SkUfGtncVUenQN/Z37SN8/AiJkPmfJVAsdCAlEmzq3zystIhRD LFBZ0TvRf5wJu9JfcOtOljMu/T5X4q9Bl5rsUuyVxAP5idV0alKZpJGsCe0JvYFmCK4K GOpBhvp94jmSz7NKGGf4yLe4j4kx/uao3/y6gOqqwm6WSrMqXQ4xq+sIiJHyyEaEFuN2 gprJ4C6Lc6XXErWbbaWnYgGCYazhIu72Zcdh4Xo8ZuSmF7Xtn4M4thUsL47ippWZSfuO QUKjFd6ppMTtBCnDvR4uzDiMYZPCzin6rmMdH2s/ZoG3vWCtDa8PaGPmWyjFWyqfonYu jtew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773383566; x=1773988366; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=fl4H23Ge0Zsyj8n566Pf+v0tahs4AEuuruZIdW3bY9s=; b=h4hiDuEgIr1EMrxC/P/N2k7hHrv/lGAGN4ov/NIVwFWgHgZxwGis/8+TkBEo7XuZHc oh3aFAyto2crJNj/TIDb9Fyo1SKvGDw3B5msUaoOOnuSGc8eSmDHayRFNlCR/R71dMP5 0SN8Ka9nIDt1LW6EE8F3Ne9W9XVzoYfLUePd+FcMUjY38Ifeemr3k9XKLYUBUFK3gt0t hUUUnr+lGO/oF//EdwrzNNPiZEaoy66G+NGKMs0IWQbFlAOj43LNO3gD8Y1ct+pCP8fu VK7Hi+w25oBWcRmiTe8+f511omxTYkEWLQD0b4anjkWR0LTivy4SDYmfHdaLOi3IsSJ3 ZuFw== X-Gm-Message-State: AOJu0YzannQAQDCagmHdJCJMHI3kAlZycLh84ehCPEmxFEiAlCNz+Jnp SFCmb2mCgymYG8GB6XCxz2tUnzN2kYzsA05gvCEMlEgskLPAFNkTnXIV X-Gm-Gg: ATEYQzx33HLmkN2vXQonHVBJiQdqiIflRck2JoRCTDrYCVob0xrB0rdfGskZ/kzhCp3 WVtz/9bklQtb1UhgNx3MT4qQRT+NkzaiqEYrfR5E+feZ/BgPJsU+ZA0x/BR/6e/15KcOywpmfry 7eFSxzrp+Md0VZ0Vum39Y5qbj7FpsP2P4LjVvYKPQJzwGQ/IPKQUhqjgeXDi7NwWDl6pI7MF0g2 r4MVY1Xk1HKa1ntorGRbsD5G4heY/zU8LbWmbR/6173fKtDGSd2XMLURzUYq+sIQvGPXXWNVbxp n5Yf++BbcHN/vBQ3t3f8wR50Bm9oGfg+NylED5UCPnxD2uYx9K/W1EPwziYhS2cCcxi2LJCcx4w iD8BLH6RF3oOHprflFADrCwbCa+qrHDNwMiI0Etd+eVc4SX0TvGegpyow79lKWMHkS6sVId7ubh FOzWys9RJysxJX6LW6gJjF X-Received: by 2002:a05:7022:f8c:b0:128:d81e:adb7 with SMTP id a92af1059eb24-128f3c6740emr553076c88.0.1773383565553; Thu, 12 Mar 2026 23:32:45 -0700 (PDT) Received: from hobbes ([2600:70ff:f864:0:caf6:9140:4157:1e66]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-128f62b2100sm1049160c88.8.2026.03.12.23.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 23:32:44 -0700 (PDT) Date: Thu, 12 Mar 2026 20:32:40 -1000 From: Joey Pabalinas To: nouveau@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Lyude Paul , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Joey Pabalinas Subject: [PATCH] drm/nouveau: fix misleading indentation Message-ID: <6c1d96782664e4f491f23e8c73545fe4d8b9533a.1773383224.git.joeypabalinas@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="k7ogklrer7rk7odl" Content-Disposition: inline --k7ogklrer7rk7odl Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: [PATCH] drm/nouveau: fix misleading indentation MIME-Version: 1.0 Content-Type: text/plain; protected-headers="v1"; charset="utf-8" Fix misleading indentation in if/else statements. Signed-off-by: Joey Pabalinas --- drivers/gpu/drm/nouveau/nouveau_abi16.c | 49 ++++++++++++------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouv= eau/nouveau_abi16.c index f9201f2e73a339a10b..3da75aa136d04faf3b 100644 --- a/drivers/gpu/drm/nouveau/nouveau_abi16.c +++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c @@ -425,14 +425,14 @@ nouveau_abi16_ioctl_channel_alloc(ABI16_IOCTL_ARGS) =20 if (device->info.family >=3D NV_DEVICE_INFO_V0_TESLA) init->pushbuf_domains =3D NOUVEAU_GEM_DOMAIN_VRAM | NOUVEAU_GEM_DOMAIN_GART; else - if (chan->chan->push.buffer->bo.resource->mem_type =3D=3D TTM_PL_VRAM) - init->pushbuf_domains =3D NOUVEAU_GEM_DOMAIN_VRAM; - else - init->pushbuf_domains =3D NOUVEAU_GEM_DOMAIN_GART; + if (chan->chan->push.buffer->bo.resource->mem_type =3D=3D TTM_PL_VRAM) + init->pushbuf_domains =3D NOUVEAU_GEM_DOMAIN_VRAM; + else + init->pushbuf_domains =3D NOUVEAU_GEM_DOMAIN_GART; =20 if (device->info.family < NV_DEVICE_INFO_V0_CELSIUS) { init->subchan[0].handle =3D 0x00000000; init->subchan[0].grclass =3D 0x0000; init->subchan[1].handle =3D chan->chan->nvsw.handle; @@ -579,21 +579,20 @@ nouveau_abi16_ioctl_grobj_alloc(ABI16_IOCTL_ARGS) oclass =3D sclass[i].oclass; break; } } } else - if ((init->class & 0x00ff) =3D=3D 0x00b3) { /* msppp */ - /* msppp: compatibility with incorrect version exposure */ - for (i =3D 0; i < ret; i++) { - if ((sclass[i].oclass & 0x00ff) =3D=3D 0x00b3) { - oclass =3D sclass[i].oclass; - break; + if ((init->class & 0x00ff) =3D=3D 0x00b3) { /* msppp */ + /* msppp: compatibility with incorrect version exposure */ + for (i =3D 0; i < ret; i++) { + if ((sclass[i].oclass & 0x00ff) =3D=3D 0x00b3) { + oclass =3D sclass[i].oclass; + break; + } } - } - } else { - oclass =3D init->class; - } + } else + oclass =3D init->class; =20 nvif_object_sclass_put(&sclass); if (!oclass) return nouveau_abi16_put(abi16, -EINVAL); =20 @@ -652,21 +651,21 @@ nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARG= S) args.target =3D NV_DMA_V0_TARGET_VM; args.access =3D NV_DMA_V0_ACCESS_VM; args.start +=3D chan->ntfy_vma->addr; args.limit +=3D chan->ntfy_vma->addr; } else - if (drm->agp.bridge) { - args.target =3D NV_DMA_V0_TARGET_AGP; - args.access =3D NV_DMA_V0_ACCESS_RDWR; - args.start +=3D drm->agp.base + chan->ntfy->offset; - args.limit +=3D drm->agp.base + chan->ntfy->offset; - } else { - args.target =3D NV_DMA_V0_TARGET_VM; - args.access =3D NV_DMA_V0_ACCESS_RDWR; - args.start +=3D chan->ntfy->offset; - args.limit +=3D chan->ntfy->offset; - } + if (drm->agp.bridge) { + args.target =3D NV_DMA_V0_TARGET_AGP; + args.access =3D NV_DMA_V0_ACCESS_RDWR; + args.start +=3D drm->agp.base + chan->ntfy->offset; + args.limit +=3D drm->agp.base + chan->ntfy->offset; + } else { + args.target =3D NV_DMA_V0_TARGET_VM; + args.access =3D NV_DMA_V0_ACCESS_RDWR; + args.start +=3D chan->ntfy->offset; + args.limit +=3D chan->ntfy->offset; + } =20 ret =3D nvif_object_ctor(&chan->chan->user, "abi16Ntfy", info->handle, NV_DMA_IN_MEMORY, &args, sizeof(args), &ntfy->object); if (ret) --=20 Cheers, Joey Pabalinas --k7ogklrer7rk7odl Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJPBAABCAA5FiEEx6b1SGGPTKxTmPDYqoHu9CTxowIFAmmzr4gbFIAAAAAABAAO bWFudTIsMi41KzEuMTIsMiwyAAoJEKqB7vQk8aMCkVAQAJ148g2qWIqsAEqEqSkt vAyVkxh4eqEF7hSJoRAD8zp1a3mMxjmZYwDzC3fvlEeyrTjcKSGU4ec28O+Ruu0L sHng+ludg4a426Ofe4hLSeRC9HTQKpEvtC0+y3C8JIOdXfInRTZrccGU8/goyY9z zVaVBBdLnpIXNc+2FxMdj9nrujZCd1uTGL+XOL1pxC6rjVgT5W5x/MKEGaLiK98X m1CSsIH7I+g71nt/3XvFVkPwawHtlj6QFEJwSEOjTRcS1vpZcGr+nUiM1XXi0CKY oJtmeOsYX7sTgOhKDml9LHxgeRu+J8iGcHOA6poke00bSB1pdvXYzOc3x/2lLZbW tRk139aRXeNUUZznN+tCtyOScZQXPUJpis0b+0izliM5GtAPJIugnd/wjpKRg86z EYIiPfY6AoDeQKCCvuTmoZqRIGm1naT4uUEkFAZc54GOFA4utFR7WXxGZ2T0RrZq 7Z1ntYwW8VCEKmVJxmYcXz/hUiDKe4ZRBPcwUagDW3WE4zmHXaFUOf6Fv8azgyCZ INtvtUqn6N2WEc+IleKK1IzyqJjyq+OyZzSqyCofbq+WycCyLeSBaO4xWr/Fd5qu S2KZf9GaCgUTlk9QD2qamVwANkRdkxZRUnH/UKyOKNdOciPIm/BGjhVEsPtXtiU9 BbCHq7coMN8hinzZLCdoi1it =7+J+ -----END PGP SIGNATURE----- --k7ogklrer7rk7odl--