From: Daniel Vetter <daniel@ffwll.ch>
To: Damien Lespiau <damien.lespiau@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Delete duplicate #defines added for DCx
Date: Mon, 15 Jun 2015 17:52:50 +0200 [thread overview]
Message-ID: <20150615155250.GC23637@phenom.ffwll.local> (raw)
In-Reply-To: <20150611132021.GB342@strange.ger.corp.intel.com>
On Thu, Jun 11, 2015 at 02:20:22PM +0100, Damien Lespiau wrote:
> On Wed, Jun 10, 2015 at 04:16:12PM -0700, Chandra Konduru wrote:
> > Delete the duplicate #defines introduced by:
> >
> > commit 6b457d31ea0465fcadcf6d5044f5f71398954727
> > Author: A.Sunil Kamath <sunil.kamath@intel.com>
> > Date: Thu Apr 16 14:22:09 2015 +0530
> >
> > drm/i915/skl: Implement enable/disable for Display C5 state.
> >
> > Signed-off-by: Chandra Konduru <chandra.konduru@intel.com>
> > ---
> > drivers/gpu/drm/i915/i915_reg.h | 6 ------
> > 1 file changed, 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> > index 40a3a64..741cd32 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -7281,12 +7281,6 @@ enum skl_disp_power_wells {
> > #define DC_STATE_EN 0x45504
> > #define DC_STATE_EN_UPTO_DC5 (1<<0)
> > #define DC_STATE_EN_DC9 (1<<3)
> > -
> > -/*
> > -* SKL DC
> > -*/
> > -#define DC_STATE_EN 0x45504
> > -#define DC_STATE_EN_UPTO_DC5 (1<<0)
> > #define DC_STATE_EN_UPTO_DC6 (2<<0)
> > #define DC_STATE_EN_UPTO_DC5_DC6_MASK 0x3
>
> And now we have DC9 define in the middle of the DC5/6 field. Oh well,
> still somewhat better.
>
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Queued for -next, thanks for the patch.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-06-15 15:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-10 23:16 [PATCH] drm/i915: Delete duplicate #defines added for DCx Chandra Konduru
2015-06-11 13:20 ` Damien Lespiau
2015-06-15 15:52 ` Daniel Vetter [this message]
2015-06-14 13:59 ` shuang.he
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=20150615155250.GC23637@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=damien.lespiau@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/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