From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch>, <intel-gfx@lists.freedesktop.org>, <dri-devel@lists.freedesktop.org> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Rodrigo Vivi" <rodrigo.vivi@intel.com>, "Jani Nikula" <jani.nikula@intel.com>, "Imre Deak" <imre.deak@intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com> Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Date: Thu, 19 Nov 2015 11:23:23 +1100 [thread overview] Message-ID: <20151119112323.1c4b95ef@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_runtime_pm.c between commitis: bc5f2ab11ca6 ("drm/i915/skl: Don't call intel_prepare_ddi when encoder list isn't yet initialized.") 1b0e3a049efe ("drm/i915/skl: disable display side power well support for now") from Linus' tree and commit: f0ab43e6c338 ("drm/i915: Introduce a gmbus power domain") c2b16152e0b3 ("drm/i915/skl: remove redundant DDI/IRQ reinitialization during PW1 enabling") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_runtime_pm.c index d89c1d0aa1b7,f8167753f91b..000000000000 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@@ -1808,24 -1831,9 +1831,24 @@@ static struct i915_power_well bxt_power .domains = BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS, .ops = &skl_power_well_ops, .data = SKL_DISP_PW_2, - } + }, }; +static int +sanitize_disable_power_well_option(const struct drm_i915_private *dev_priv, + int disable_power_well) +{ + if (disable_power_well >= 0) + return !!disable_power_well; + + if (IS_SKYLAKE(dev_priv)) { + DRM_DEBUG_KMS("Disabling display power well support\n"); + return 0; + } + + return 1; +} + #define set_power_wells(power_domains, __power_wells) ({ \ (power_domains)->power_wells = (__power_wells); \ (power_domains)->power_well_count = ARRAY_SIZE(__power_wells); \ @@@ -1842,9 -1850,8 +1865,11 @@@ int intel_power_domains_init(struct drm { struct i915_power_domains *power_domains = &dev_priv->power_domains; + BUILD_BUG_ON(POWER_DOMAIN_NUM > 31); + + i915.disable_power_well = sanitize_disable_power_well_option(dev_priv, + i915.disable_power_well); + mutex_init(&power_domains->lock); /*
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Daniel Vetter <daniel.vetter@ffwll.ch>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Rodrigo Vivi" <rodrigo.vivi@intel.com>, "Jani Nikula" <jani.nikula@intel.com>, "Imre Deak" <imre.deak@intel.com>, "Ville Syrjälä" <ville.syrjala@linux.intel.com> Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Date: Thu, 19 Nov 2015 11:23:23 +1100 [thread overview] Message-ID: <20151119112323.1c4b95ef@canb.auug.org.au> (raw) Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/intel_runtime_pm.c between commitis: bc5f2ab11ca6 ("drm/i915/skl: Don't call intel_prepare_ddi when encoder list isn't yet initialized.") 1b0e3a049efe ("drm/i915/skl: disable display side power well support for now") from Linus' tree and commit: f0ab43e6c338 ("drm/i915: Introduce a gmbus power domain") c2b16152e0b3 ("drm/i915/skl: remove redundant DDI/IRQ reinitialization during PW1 enabling") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc drivers/gpu/drm/i915/intel_runtime_pm.c index d89c1d0aa1b7,f8167753f91b..000000000000 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@@ -1808,24 -1831,9 +1831,24 @@@ static struct i915_power_well bxt_power .domains = BXT_DISPLAY_POWERWELL_2_POWER_DOMAINS, .ops = &skl_power_well_ops, .data = SKL_DISP_PW_2, - } + }, }; +static int +sanitize_disable_power_well_option(const struct drm_i915_private *dev_priv, + int disable_power_well) +{ + if (disable_power_well >= 0) + return !!disable_power_well; + + if (IS_SKYLAKE(dev_priv)) { + DRM_DEBUG_KMS("Disabling display power well support\n"); + return 0; + } + + return 1; +} + #define set_power_wells(power_domains, __power_wells) ({ \ (power_domains)->power_wells = (__power_wells); \ (power_domains)->power_well_count = ARRAY_SIZE(__power_wells); \ @@@ -1842,9 -1850,8 +1865,11 @@@ int intel_power_domains_init(struct drm { struct i915_power_domains *power_domains = &dev_priv->power_domains; + BUILD_BUG_ON(POWER_DOMAIN_NUM > 31); + + i915.disable_power_well = sanitize_disable_power_well_option(dev_priv, + i915.disable_power_well); + mutex_init(&power_domains->lock); /*
next reply other threads:[~2015-11-19 0:23 UTC|newest] Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-19 0:23 Stephen Rothwell [this message] 2015-11-19 0:23 ` linux-next: manual merge of the drm-intel tree with Linus' tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2024-01-09 0:22 Stephen Rothwell 2024-01-09 0:22 ` Stephen Rothwell 2023-11-22 0:51 Stephen Rothwell 2023-11-22 0:51 ` Stephen Rothwell 2023-11-22 1:10 ` Stephen Rothwell 2023-11-22 1:10 ` Stephen Rothwell 2023-03-06 23:09 Stephen Rothwell 2023-03-06 23:09 ` Stephen Rothwell 2022-11-13 23:23 Stephen Rothwell 2022-11-13 23:23 ` Stephen Rothwell 2022-11-14 8:19 ` Hans de Goede 2022-11-14 8:19 ` Hans de Goede 2022-11-14 10:10 ` Jani Nikula 2022-11-14 10:10 ` Jani Nikula 2022-11-14 10:35 ` Hans de Goede 2022-11-14 10:35 ` Hans de Goede 2022-11-14 11:02 ` Jani Nikula 2022-11-14 11:02 ` Jani Nikula 2022-10-17 22:05 Stephen Rothwell 2022-10-17 22:05 ` Stephen Rothwell 2022-06-07 23:59 Stephen Rothwell 2022-06-07 23:59 ` Stephen Rothwell 2022-06-07 23:53 Stephen Rothwell 2022-06-07 23:53 ` Stephen Rothwell 2022-04-05 1:00 Stephen Rothwell 2022-04-05 1:00 ` Stephen Rothwell 2022-04-05 0:53 Stephen Rothwell 2022-04-05 0:53 ` Stephen Rothwell 2022-01-24 22:39 Stephen Rothwell 2022-01-24 22:39 ` Stephen Rothwell 2022-01-24 22:33 Stephen Rothwell 2022-01-24 22:33 ` Stephen Rothwell 2021-08-02 15:29 Mark Brown 2021-05-20 0:19 Stephen Rothwell 2021-05-20 0:19 ` Stephen Rothwell 2021-05-21 1:45 ` Stephen Rothwell 2021-05-21 1:45 ` Stephen Rothwell 2021-05-12 0:28 Stephen Rothwell 2021-05-12 0:28 ` Stephen Rothwell 2020-09-08 4:00 Stephen Rothwell 2020-09-08 4:00 ` Stephen Rothwell 2020-09-08 8:22 ` Hans de Goede 2020-09-08 8:22 ` Hans de Goede 2020-09-08 11:04 ` Stephen Rothwell 2020-09-08 11:04 ` Stephen Rothwell 2020-09-08 13:20 ` Hans de Goede 2020-09-08 13:20 ` Hans de Goede 2020-06-23 1:35 Stephen Rothwell 2020-06-23 1:35 ` Stephen Rothwell 2018-03-22 2:21 Stephen Rothwell 2018-03-22 2:21 ` Stephen Rothwell 2018-03-23 0:50 ` Stephen Rothwell 2018-03-23 0:50 ` Stephen Rothwell 2017-09-19 1:42 Stephen Rothwell 2016-09-16 0:38 Stephen Rothwell 2016-09-16 0:38 ` Stephen Rothwell 2016-09-08 2:08 Stephen Rothwell 2016-09-08 2:08 ` Stephen Rothwell 2016-05-31 1:06 Stephen Rothwell 2016-05-31 1:06 ` Stephen Rothwell 2016-05-31 1:00 Stephen Rothwell 2016-05-31 1:00 ` Stephen Rothwell 2015-12-22 1:03 Stephen Rothwell 2015-12-22 1:03 ` Stephen Rothwell 2015-09-29 1:20 Stephen Rothwell 2015-09-29 1:20 ` Stephen Rothwell 2015-09-29 1:20 Stephen Rothwell 2015-09-29 1:20 ` Stephen Rothwell 2015-09-17 0:13 Stephen Rothwell 2015-09-17 0:13 ` Stephen Rothwell 2015-07-09 1:02 Stephen Rothwell 2015-07-09 1:02 ` Stephen Rothwell 2015-04-29 1:15 Stephen Rothwell 2015-04-29 1:15 ` Stephen Rothwell 2014-09-08 4:32 Stephen Rothwell 2014-09-08 4:32 ` Stephen Rothwell 2013-12-18 2:50 Stephen Rothwell 2013-12-18 2:50 ` Stephen Rothwell 2013-12-13 0:58 Stephen Rothwell 2013-12-13 0:58 ` Stephen Rothwell 2013-09-18 1:25 Stephen Rothwell 2013-09-18 1:25 ` Stephen Rothwell 2013-09-18 1:20 Stephen Rothwell 2013-09-18 1:20 ` Stephen Rothwell 2013-06-26 3:54 Stephen Rothwell 2013-06-26 3:54 ` Stephen Rothwell 2013-06-17 3:32 Stephen Rothwell 2013-06-17 3:32 ` Stephen Rothwell 2013-06-17 3:25 Stephen Rothwell 2013-06-17 3:25 ` Stephen Rothwell 2013-05-21 1:58 Stephen Rothwell 2013-05-21 1:58 ` Stephen Rothwell 2013-05-07 1:27 Stephen Rothwell 2013-05-07 1:27 ` Stephen Rothwell 2013-05-07 8:43 ` Daniel Vetter 2013-05-07 8:43 ` Daniel Vetter 2013-05-08 0:11 ` Stephen Rothwell 2013-05-08 0:11 ` Stephen Rothwell 2013-04-03 2:43 Stephen Rothwell 2013-04-03 2:43 ` Stephen Rothwell 2013-04-03 8:31 ` Daniel Vetter 2013-04-02 2:46 Stephen Rothwell 2013-04-02 2:46 ` Stephen Rothwell 2013-03-04 23:23 Stephen Rothwell 2013-03-04 23:23 ` Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20151119112323.1c4b95ef@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=daniel.vetter@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=imre.deak@intel.com \ --cc=intel-gfx@lists.freedesktop.org \ --cc=jani.nikula@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=rodrigo.vivi@intel.com \ --cc=ville.syrjala@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.