From: Daniel Vetter <daniel@ffwll.ch>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jani Nikula <jani.nikula@intel.com>
Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree
Date: Wed, 3 Apr 2013 10:31:24 +0200 [thread overview]
Message-ID: <20130403083124.GG2228@phenom.ffwll.local> (raw)
In-Reply-To: <20130403134349.e009a401ab6ec761edbfedd7@canb.auug.org.au>
On Wed, Apr 03, 2013 at 01:43:49PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm-intel tree got a conflict in
> drivers/gpu/drm/i915/intel_panel.c between commit b1289371fcd5 ("Revert
> "drm/i915: write backlight harder"") from Linus' tree and commit
> 31ad8ec6a614 ("drm/i915: group backlight related stuff into a struct")
> from the drm-intel tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, I carry the same merge resolution locally.
-Daniel
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc drivers/gpu/drm/i915/intel_panel.c
> index bee8cb6,0e7e873..0000000
> --- a/drivers/gpu/drm/i915/intel_panel.c
> +++ b/drivers/gpu/drm/i915/intel_panel.c
> @@@ -318,9 -321,16 +321,13 @@@ void intel_panel_enable_backlight(struc
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
>
> - if (dev_priv->backlight_level == 0)
> - dev_priv->backlight_level = intel_panel_get_max_backlight(dev);
> + if (dev_priv->backlight.level == 0) {
> + dev_priv->backlight.level = intel_panel_get_max_backlight(dev);
> + if (dev_priv->backlight.device)
> + dev_priv->backlight.device->props.brightness =
> + dev_priv->backlight.level;
> + }
>
> - dev_priv->backlight.enabled = true;
> - intel_panel_actually_set_backlight(dev, dev_priv->backlight.level);
> -
> if (INTEL_INFO(dev)->gen >= 4) {
> uint32_t reg, tmp;
>
> @@@ -356,12 -366,12 +363,12 @@@
> }
>
> set_level:
> - /* Check the current backlight level and try to set again if it's zero.
> - * On some machines, BLC_PWM_CPU_CTL is cleared to zero automatically
> - * when BLC_PWM_CPU_CTL2 and BLC_PWM_PCH_CTL1 are written.
> + /* Call below after setting BLC_PWM_CPU_CTL2 and BLC_PWM_PCH_CTL1.
> + * BLC_PWM_CPU_CTL may be cleared to zero automatically when these
> + * registers are set.
> */
> - dev_priv->backlight_enabled = true;
> - intel_panel_actually_set_backlight(dev, dev_priv->backlight_level);
> - if (!intel_panel_get_backlight(dev))
> - intel_panel_actually_set_backlight(dev, dev_priv->backlight.level);
> ++ dev_priv->backlight.enabled = true;
> ++ intel_panel_actually_set_backlight(dev, dev_priv->backlight.level);
> }
>
> static void intel_panel_init_backlight(struct drm_device *dev)
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2013-04-03 8:28 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-03 2:43 linux-next: manual merge of the drm-intel tree with Linus' tree Stephen Rothwell
2013-04-03 8:31 ` Daniel Vetter [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-09 0:22 Stephen Rothwell
2023-11-22 0:51 Stephen Rothwell
2023-11-22 1:10 ` Stephen Rothwell
2023-03-06 23:09 Stephen Rothwell
2022-11-13 23:23 Stephen Rothwell
2022-11-14 8:19 ` Hans de Goede
2022-11-14 10:10 ` Jani Nikula
2022-11-14 10:35 ` Hans de Goede
2022-11-14 11:02 ` Jani Nikula
2022-10-17 22:05 Stephen Rothwell
2022-06-07 23:59 Stephen Rothwell
2022-06-07 23:53 Stephen Rothwell
2022-04-05 1:00 Stephen Rothwell
2022-04-05 0:53 Stephen Rothwell
2022-01-24 22:39 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-21 1:45 ` Stephen Rothwell
2021-05-12 0:28 Stephen Rothwell
2020-09-08 4:00 Stephen Rothwell
2020-09-08 8:22 ` Hans de Goede
2020-09-08 11:04 ` Stephen Rothwell
2020-09-08 13:20 ` Hans de Goede
2020-06-23 1:35 Stephen Rothwell
2018-03-22 2:21 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-08 2:08 Stephen Rothwell
2016-05-31 1:06 Stephen Rothwell
2016-05-31 1:00 Stephen Rothwell
2015-12-22 1:03 Stephen Rothwell
2015-11-19 0:23 Stephen Rothwell
2015-09-29 1:20 Stephen Rothwell
2015-09-29 1:20 Stephen Rothwell
2015-09-17 0:13 Stephen Rothwell
2015-07-09 1:02 Stephen Rothwell
2015-04-29 1:15 Stephen Rothwell
2014-09-08 4:32 Stephen Rothwell
2013-12-18 2:50 Stephen Rothwell
2013-12-13 0:58 Stephen Rothwell
2013-09-18 1:25 Stephen Rothwell
2013-09-18 1:20 Stephen Rothwell
2013-06-26 3:54 Stephen Rothwell
2013-06-17 3:32 Stephen Rothwell
2013-06-17 3:25 Stephen Rothwell
2013-05-21 1:58 Stephen Rothwell
2013-05-07 1:27 Stephen Rothwell
2013-05-07 8:43 ` Daniel Vetter
2013-05-08 0:11 ` Stephen Rothwell
2013-04-02 2:46 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=20130403083124.GG2228@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).