From owner-svn-src-all@freebsd.org  Tue Oct  6 20:58:47 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 64BE39D08A4;
 Tue,  6 Oct 2015 20:58:47 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2BB1EA91;
 Tue,  6 Oct 2015 20:58:47 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t96Kwk83031703;
 Tue, 6 Oct 2015 20:58:46 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t96Kwkhu031702;
 Tue, 6 Oct 2015 20:58:46 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201510062058.t96Kwkhu031702@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 6 Oct 2015 20:58:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r288952 - head/sys/dev/drm2/i915
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2015 20:58:47 -0000

Author: adrian
Date: Tue Oct  6 20:58:45 2015
New Revision: 288952
URL: https://svnweb.freebsd.org/changeset/base/288952

Log:
  Remove gen3 check introduced in r286653.
  
  kib spotted this and noticed it's not correct.
  
  Submitted by:	kib
  Reviewed by:	dumbbell

Modified:
  head/sys/dev/drm2/i915/i915_drv.c

Modified: head/sys/dev/drm2/i915/i915_drv.c
==============================================================================
--- head/sys/dev/drm2/i915/i915_drv.c	Tue Oct  6 19:49:53 2015	(r288951)
+++ head/sys/dev/drm2/i915/i915_drv.c	Tue Oct  6 20:58:45 2015	(r288952)
@@ -894,7 +894,6 @@ int intel_gpu_reset(struct drm_device *d
 	case 4:
 		ret = i965_do_reset(dev);
 		break;
-	case 3:
 	case 2:
 		ret = i8xx_do_reset(dev);
 		break;