From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree Date: Fri, 23 Mar 2018 11:45:48 +1100 Message-ID: <20180323114548.11171d5b@canb.auug.org.au> References: <20180315141425.49479b8b@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0847580212==" Return-path: Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id A27E36E244 for ; Fri, 23 Mar 2018 00:46:30 +0000 (UTC) In-Reply-To: <20180315141425.49479b8b@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: DRI , Dave Airlie Cc: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , Hans de Goede , Linux-Next Mailing List List-Id: dri-devel@lists.freedesktop.org --===============0847580212== Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/OBMZ_RtA822_CskO9ubQ5uD"; protocol="application/pgp-signature" --Sig_/OBMZ_RtA822_CskO9ubQ5uD Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Thu, 15 Mar 2018 14:14:25 +1100 Stephen Rothwell = wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: >=20 > sound/pci/hda/hda_intel.c >=20 > between commits: >=20 > 1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist") > 40088dc4e1ea ("ALSA: hda - Revert power_save option default value") >=20 > from Linus' tree and commit: >=20 > 07f4f97d7b4b ("vga_switcheroo: Use device link for HDA controller") >=20 > from the drm-misc tree. >=20 > I fixed it up (see below) and can carry the fix as necessary. This > is now fixed as far as linux-next is concerned, but any non trivial > conflicts should be mentioned to your upstream maintainer when your tree > is submitted for merging. You may also want to consider cooperating > with the maintainer of the conflicting tree to minimise any particularly > complex conflicts. >=20 > --=20 > Cheers, > Stephen Rothwell >=20 > diff --cc sound/pci/hda/hda_intel.c > index d5017adf9feb,ec4e6b829ee2..000000000000 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@@ -2219,8 -2201,8 +2223,9 @@@ static int azx_probe_continue(struct az > struct hda_intel *hda =3D container_of(chip, struct hda_intel, chip); > struct hdac_bus *bus =3D azx_bus(chip); > struct pci_dev *pci =3D chip->pci; > + struct hda_codec *codec; > int dev =3D chip->dev_index; > + int val; > int err; > =20 > hda->probe_continued =3D 1; > @@@ -2302,21 -2284,16 +2307,30 @@@ > chip->running =3D 1; > azx_add_card_list(chip); > =20 > + val =3D power_save; > +#ifdef CONFIG_PM > + if (pm_blacklist) { > + const struct snd_pci_quirk *q; > + > + q =3D snd_pci_quirk_lookup(chip->pci, power_save_blacklist); > + if (q && val) { > + dev_info(chip->card->dev, "device %04x:%04x is on the power_save bla= cklist, forcing power_save to 0\n", > + q->subvendor, q->subdevice); > + val =3D 0; > + } > + } > +#endif /* CONFIG_PM */ > ++ > + /* > + * The discrete GPU cannot power down unless the HDA controller runtime > + * suspends, so activate runtime PM on codecs even if power_save =3D= =3D 0. > + */ > + if (use_vga_switcheroo(hda)) > + list_for_each_codec(codec, &chip->bus) > + codec->auto_runtime_pm =3D 1; > +=20 > - snd_hda_set_power_save(&chip->bus, power_save * 1000); > + snd_hda_set_power_save(&chip->bus, val * 1000); > - if (azx_has_pm_runtime(chip) || hda->use_vga_switcheroo) > + if (azx_has_pm_runtime(chip)) > pm_runtime_put_autosuspend(&pci->dev); > =20 > out_free: This is now a conflict between the drm tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/OBMZ_RtA822_CskO9ubQ5uD Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlq0TjwACgkQAVBC80lX 0Gxo1Af9E2i+YLoJIQRVuU4I+CVf5O7s1i13MsSytqyu0bU/k8zcmbc1flUZsta3 1uVWsVsq/L4bofzdskAkw8IluPEQyKlDg63VoPUPbItXwfHQw8N/Q0ZZMz7GaQE5 7ce/muy7Nb5XpJaed2pxlZYjMAn0EPwg37OnjogHsLtWk0uLa2PAmv77qJQBTmoa RFipB8UvRbeD1ddv+3HsIUe4KMcF+hAAY+c8MZViyJgedTfzrV8aUFpVPTnDAToE aKiCua89D1EXVsdHS73Lj7Wtvy/x+PfV3J/nBEEk9KimxCjPUw3FFdT9PGzRLE80 zUN+UNP+J6lRaURt5Mm2pW1THK+HFQ== =yNYw -----END PGP SIGNATURE----- --Sig_/OBMZ_RtA822_CskO9ubQ5uD-- --===============0847580212== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== --===============0847580212==--