From: Imre Deak <imre.deak@intel.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Cc: drm-intel-fixes@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Fix botched merge that downgrades CSR versions.
Date: Mon, 15 Aug 2016 16:55:37 +0300 [thread overview]
Message-ID: <1471269337.15863.12.camel@intel.com> (raw)
In-Reply-To: <9b98c32b-c379-ea34-048c-7e6399e527d0@linux.intel.com>
On ma, 2016-08-15 at 15:46 +0200, Maarten Lankhorst wrote:
> Op 15-08-16 om 15:27 schreef Imre Deak:
> > On ma, 2016-08-15 at 15:09 +0200, Maarten Lankhorst wrote:
> > > Merge commit 5e580523d9128a4d8 reverts the version bumping parts
> > > of
> > > commit 4aa7fb9c3c4fa0. Bump the versions again and request the
> > > specific
> > > firmware version.
> > >
> > > The currently recommended versions are: SKL 1.26, KBL 1.01 and
> > > BXT 1.07.
> > >
> > > Cc: Patrik Jakobsson <patrik.jakobsson@linux.intel.com>
> > > Cc: Imre Deak <imre.deak@intel.com>
> > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97242
> > > Cc: drm-intel-fixes@lists.freedesktop.org
> > > Fixes: 5e580523d912 ("Backmerge tag 'v4.7' into drm-next")
> > I think it was 94558e265b ("Merge remote-tracking branch
> > 'airlied/drm-
> > next' into drm-intel-next-queued").
> git checkout 5e580523d912 gets the wrong version,
> git checkout c11dea5b0290 (merge parent) the right one.
Ah you are right, 5e580523d912 was already wrong.
--Imre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-08-15 13:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-15 13:09 [PATCH] drm/i915: Fix botched merge that downgrades CSR versions Maarten Lankhorst
2016-08-15 13:27 ` Imre Deak
2016-08-15 13:46 ` Maarten Lankhorst
2016-08-15 13:55 ` Imre Deak [this message]
2016-08-15 14:02 ` ✗ Ro.CI.BAT: failure for " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2016-08-23 8:10 [PATCH 1/2] drm/i915/backlight: handle enabled but zero duty cycle at module load Maarten Lankhorst
2016-08-23 8:10 ` [PATCH] drm/i915: Fix botched merge that downgrades CSR versions Maarten Lankhorst
2016-08-25 11:29 ` Jani Nikula
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=1471269337.15863.12.camel@intel.com \
--to=imre.deak@intel.com \
--cc=drm-intel-fixes@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@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: link
Be 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.