From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mx1.riseup.net ([198.252.153.129]:53733 "EHLO mx1.riseup.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753136AbbJAQOM (ORCPT <rfc822;stable@vger.kernel.org>);
	Thu, 1 Oct 2015 12:14:12 -0400
From: Francisco Jerez <currojerez@riseup.net>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Dave Gordon <david.s.gordon@intel.com>,
	Thomas Daniel <thomas.daniel@intel.com>,
	stable@vger.kernel.org, Daniel Vetter <daniel.vetter@intel.com>
Subject: Re: [PATCH] drm/i915: Resurrect golden context on gen6/7
In-Reply-To: <1443715610-14254-1-git-send-email-daniel.vetter@ffwll.ch>
References: <1443715610-14254-1-git-send-email-daniel.vetter@ffwll.ch>
Date: Thu, 01 Oct 2015 19:13:11 +0300
Message-ID: <87si5uin3c.fsf@riseup.net>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
	micalg=pgp-sha256; protocol="application/pgp-signature"
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Daniel Vetter <daniel.vetter@ffwll.ch> writes:

> In
>
> commit 8f0e2b9d95a88ca5d8349deef2375644faf184ae
> Author: Daniel Vetter <daniel.vetter@ffwll.ch>
> Date:   Tue Dec 2 16:19:07 2014 +0100
>
>     drm/i915: Move golden context init into ->init_context
>
> I've shuffled around per-ctx init code a bit for legacy contexts but
> accidentally dropped the render state init call on gen6/7. Resurrect
> it.
>
> Reported-by: Francisco Jerez <currojerez@riseup.net>
> Cc: Francisco Jerez <currojerez@riseup.net>
> Cc: Dave Gordon <david.s.gordon@intel.com>
> Cc: Thomas Daniel <thomas.daniel@intel.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

I'm not terribly familiar with this code but the change looks sensible
to me, this patch is:

Reviewed-by: Francisco Jerez <currojerez@riseup.net>

> ---
>  drivers/gpu/drm/i915/intel_ringbuffer.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i9=
15/intel_ringbuffer.c
> index 16a4eada60a1..53920f01f264 100644
> --- a/drivers/gpu/drm/i915/intel_ringbuffer.c
> +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
> @@ -2637,6 +2637,7 @@ int intel_init_render_ring_buffer(struct drm_device=
 *dev)
>  			GEN8_RING_SEMAPHORE_INIT;
>  		}
>  	} else if (INTEL_INFO(dev)->gen >=3D 6) {
> +		ring->init_context =3D i915_gem_render_state_init;
>  		ring->add_request =3D gen6_add_request;
>  		ring->flush =3D gen7_render_ring_flush;
>  		if (INTEL_INFO(dev)->gen =3D=3D 6)
> --=20
> 2.5.1

--=-=-=--

--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iF4EAREIAAYFAlYNW5cACgkQg5k4nX1Sv1vAQAD+LEwUWlYqwTIPawpeO6uszutp
oSHi9rpFrZtfR3bp8RkA/2vz1oV9FBd9+hEu6DLvYONwg1tzLehB32tLBuxDY11p
=+oC0
-----END PGP SIGNATURE-----
--==-=-=--