From: Jesse Barnes Subject: [PATCH] drm/i915: sprite init failure on pre-SNB is not a failure Date: Thu, 12 Jan 2012 08:08:44 -0800 Message-ID: <20120112080844.4682d087@jbarnes-desktop> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1954638582==" Return-path: Received: from oproxy5-pub.bluehost.com (oproxy5-pub.bluehost.com [67.222.38.55]) by gabe.freedesktop.org (Postfix) with SMTP id 0EE6B9ED73 for ; Thu, 12 Jan 2012 08:08:53 -0800 (PST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: airlied@linux.ie, intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============1954638582== Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/9Hos1TXn7k7a4VNiR0giIOQ"; protocol="application/pgp-signature" --Sig_/9Hos1TXn7k7a4VNiR0giIOQ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable We can call the plane init function unconditionally, but don't need to complain if it fails, since that will only happen if we're out of memory (and other things will fail) or if we're on the wrong platform (which is ok). And remove the DRM_ERRORs from the sprite code itself to avoid dmesg spam. Signed-off-by: Jesse Barnes diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/in= tel_display.c index 29743de..e3bfa50 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9027,12 +9027,9 @@ void intel_modeset_init(struct drm_device *dev) =20 for (i =3D 0; i < dev_priv->num_pipe; i++) { intel_crtc_init(dev, i); - if (HAS_PCH_SPLIT(dev)) { - ret =3D intel_plane_init(dev, i); - if (ret) - DRM_ERROR("plane %d init failed: %d\n", - i, ret); - } + ret =3D intel_plane_init(dev, i); + if (ret) + DRM_DEBUG_KMS("plane %d init failed: %d\n", i, ret); } =20 /* Just disable it once at startup */ diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/int= el_sprite.c index b26e7c4..32909e3 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -466,10 +466,8 @@ intel_update_plane(struct drm_plane *plane, struct drm= _crtc *crtc, mutex_lock(&dev->struct_mutex); =20 ret =3D intel_pin_and_fence_fb_obj(dev, obj, NULL); - if (ret) { - DRM_ERROR("failed to pin object\n"); + if (ret) goto out_unlock; - } =20 intel_plane->obj =3D obj; =20 @@ -632,10 +630,8 @@ intel_plane_init(struct drm_device *dev, enum pipe pip= e) unsigned long possible_crtcs; int ret; =20 - if (!(IS_GEN6(dev) || IS_GEN7(dev))) { - DRM_ERROR("new plane code only for SNB+\n"); + if (!(IS_GEN6(dev) || IS_GEN7(dev))) return -ENODEV; - } =20 intel_plane =3D kzalloc(sizeof(struct intel_plane), GFP_KERNEL); if (!intel_plane) --Sig_/9Hos1TXn7k7a4VNiR0giIOQ Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBAgAGBQJPDwWMAAoJEIEoDkX4Qk9h1poQAK/afk182Q46KZGhab6CSE3N P1xgUxdAyQ0KrPmp6zA4h894ZCFeyLrE/b9c56SjuKxkq2teRY0KnZxeXC5FgO2j cZHEvpthief84xWbaPMYiKDHAdrnSm2MO34vwfOj8p3lGJeYQc33NbrFEK0ZkxlR vTmVYMqvCcVNdSN0Afiq23j7kpcZ+tbCe810ooYn7eSl+ZYwvSEKYzGLRGg1UEW3 mj1poO3KSIvOxQjg7J0JeRLpCIAvzmIsQtDhv/mkcMaOYukwAd+kcs3DvITbyGSq GYVhhEyA8Z7ZQ/S7Xxkkg/Ey5E7WDFftpbz8vHgZdYfSza4PJ1iLGEU9hanWpXSK kkxk/tQAAiAusY/nfADxdK2xXt68pobUzb22GOA8OkaMUeNx3iloz68RgLRcYXVK X8syDsG7zvBnk4YyzhNSiYY0yilFW541dAOk0HQ4rAh6oESwOHJ+DQ6EY8KgfITq aSl3X0tz6Rb7ETUsiXdkhYUOsttaZfdkRLrvpkWSbukT26IVV2bO7PEypl7iVEY2 E7VcUFfSwbtR/MJTzo87ftLGaxvpCQuFgjwGbvvklED9zAm7rCChA3BO60JNMkAB 3BpaYCKqX60zUlkRwCduXoFo4KjXul8uZPFUdZ8I20wmc6q7hOzCL18pRPlK5b+K /MUt18DuPXKdhIpsD9PP =CXWo -----END PGP SIGNATURE----- --Sig_/9Hos1TXn7k7a4VNiR0giIOQ-- --===============1954638582== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============1954638582==--