Date: Sat, 13 Sep 2014 21:19:49 +0900 From: "Lundberg, Johannes" <johannes@brilliantservice.co.jp> To: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= <dumbbell@freebsd.org> Cc: "freebsd-x11@freebsd.org" <freebsd-x11@freebsd.org>, Lutz Bichler <lutz.bichler@gmail.com> Subject: Re: drm-i915-hw-context.7.patch Message-ID: <CAASDrVkC4qTaAkdpBui6pHjxT6R8XwsRTNfDaLz%2BH4PwEBwmCQ@mail.gmail.com> In-Reply-To: <54142397.2060304@FreeBSD.org> References: <4838138.9H5HhdVozA@chrysaor> <54142397.2060304@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
SnVzdCB0byBtYWtlIHN1cmUsIGlzIHRoaXMgdGhlIG9ubHkgcGF0Y2ggdGhhdCBuZWVkcyB0byBi ZSBhcHBsaWVkIGFuZA0Kc2hvdWxkIGl0IGJlIGFwcGxpZWQgdG8gYSByZWNlbnQgdW5tb2RpZmll ZCAxMS1jdXJyZW50IGtlcm5lbD8NCg0KLS0NCkpvaGFubmVzIEx1bmRiZXJnDQpCUklMTElBTlRT RVJWSUNFIENPLiwgTFRELg0KDQpPbiBTYXQsIFNlcCAxMywgMjAxNCBhdCA3OjU5IFBNLCBKZWFu LVPDqWJhc3RpZW4gUMOpZHJvbiA8ZHVtYmJlbGxAZnJlZWJzZC5vcmcNCj4gd3JvdGU6DQoNCj4g T24gMTMuMDkuMjAxNCAxMjo1MywgTHV0eiBCaWNobGVyIHdyb3RlOg0KPiA+IEhpLA0KPg0KPiBI aSENCj4NCj4gPiBpcyBpdCBjb3JyZWN0IHRoYXQgdGhlIHN1Y2Nlc3NmdWwgcGF0aCBpbiBkcm1f Z2VtX2ZpbmRfcHRyIGRvZXMgbm90DQo+IHJlbGVhc2UNCj4gPiAibmFtZXMtPmxvY2siPw0KPg0K PiBObywgaXQncyBpbmNvcnJlY3QuIEdvb2QgY2F0Y2ghDQo+DQo+IEknbGwgdXBkYXRlIHRoZSBw YXRjaCBzb29uLg0KPg0KPiBUaGFuayB5b3UgOikNCj4NCj4gLS0NCj4gSmVhbi1Tw6liYXN0aWVu IFDDqWRyb24NCj4NCj4NCgotLSAKPS09LT0tPS09LT0tPS09LT0tPS09LT0tPS09LT0tPS09LT0t PS09LT0tPS09LT0tPS09LT0tCuenmOWvhuS/neaMgeOBq+OBpOOBhOOBpu+8muOBk+OBrumbu+Wt kOODoeODvOODq+OBr+OAgeWQjeWum+S6uuOBq+mAgeS/oeOBl+OBn+OCguOBruOBp+OBguOCiuOA geenmOWMv+eJueaoqeOBruWvvuixoeOBqOOBquOCi+aDheWgseOCkuWQq+OCk+OBp+OBhOOBvuOB meOAggrjgoLjgZfjgIHlkI3lrpvkurrku6XlpJbjga7mlrnjgYzlj5fkv6HjgZXjgozjgZ/loLTl kIjjgIHjgZPjga7jg6Hjg7zjg6vjga7noLTmo4TjgIHjgYrjgojjgbPjgZPjga7jg6Hjg7zjg6vj gavplqLjgZnjgovkuIDliIfjga7plovnpLrjgIEK6KSH5YaZ44CB6YWN5biD44CB44Gd44Gu5LuW 44Gu5Yip55So44CB44G+44Gf44Gv6KiY6LyJ5YaF5a6544Gr5Z+644Gl44GP44GE44GL44Gq44KL 6KGM5YuV44KC44GV44KM44Gq44GE44KI44GG44GK6aGY44GE55Sz44GX5LiK44GS44G+44GZ44CC Ci0tLQpDT05GSURFTlRJQUxJVFkgTk9URTogVGhlIGluZm9ybWF0aW9uIGluIHRoaXMgZW1haWwg aXMgY29uZmlkZW50aWFsCmFuZCBpbnRlbmRlZCBzb2xlbHkgZm9yIHRoZSBhZGRyZXNzZWUuCkRp c2Nsb3N1cmUsIGNvcHlpbmcsIGRpc3RyaWJ1dGlvbiBvciBhbnkgb3RoZXIgYWN0aW9uIG9mIHVz ZSBvZiB0aGlzCmVtYWlsIGJ5IHBlcnNvbiBvdGhlciB0aGFuIGludGVuZGVkIHJlY2lwaWVudCwg aXMgcHJvaGliaXRlZC4KSWYgeW91IGFyZSBub3QgdGhlIGludGVuZGVkIHJlY2lwaWVudCBhbmQg aGF2ZSByZWNlaXZlZCB0aGlzIGVtYWlsIGluCmVycm9yLCBwbGVhc2UgZGVzdHJveSB0aGUgb3Jp Z2luYWwgbWVzc2FnZS4K From owner-freebsd-x11@FreeBSD.ORG Sat Sep 13 12:23:54 2014 Return-Path: <owner-freebsd-x11@FreeBSD.ORG> Delivered-To: freebsd-x11@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66FBEF9E for <freebsd-x11@freebsd.org>; Sat, 13 Sep 2014 12:23:54 +0000 (UTC) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3048D20C for <freebsd-x11@freebsd.org>; Sat, 13 Sep 2014 12:23:53 +0000 (UTC) Received: by mail-ie0-f182.google.com with SMTP id tr6so2413909ieb.13 for <freebsd-x11@freebsd.org>; Sat, 13 Sep 2014 05:23:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type; bh=tAXEaZdI5K9pjm+CatEu29k+Bkb9ciqxGvUwz3AycIY=; b=StJTyfPLdJR0nyPOaY09nX2Vd99DyKq5x68OXihgxf1jjOI97TLOKjAtbO5Bhi4RMw lsCdwiLx/1HFVSaQ4MpCDVeOhQth0l4O0KZBWyqRu/S80JVTnN3e2yPlDm2vRRcLKajg cfLeJCcCRWFLYgAHPLTQaXj34o2pg1m2d8Fc/w6RhmIC/1csruhmUmmAwdhWpgiQjMFm EXwlxRh92Ss/H2aLtxob0ZXIDYbimx8ucTrqWjQs4N05WtNbYmbh2/3nQfAJzlBC+M0x KnX70fZoNOqh7vFu5I9gbkfpRFH1g/DLaOyfjCUr9VrbU5dT+oYlCeVS3e7fZTQu5OpN PH+w== X-Gm-Message-State: ALoCoQm31aMDGZmDi44BwwnyQXFMkSf3tZcbMhLiQiZhekjG0gcZBZANnHdvEUP+lMS382goXN7qJLneynELHneid8xC2kkIuUIr4H5ZNTOcdcyRwkQq9oMRPBQFST7dSF4GcO8MYJno X-Received: by 10.43.155.13 with SMTP id lg13mr15911604icc.15.1410611026004; Sat, 13 Sep 2014 05:23:46 -0700 (PDT) MIME-Version: 1.0 Received: by 10.42.110.74 with HTTP; Sat, 13 Sep 2014 05:23:30 -0700 (PDT) In-Reply-To: <CAASDrVkC4qTaAkdpBui6pHjxT6R8XwsRTNfDaLz+H4PwEBwmCQ@mail.gmail.com> References: <4838138.9H5HhdVozA@chrysaor> <54142397.2060304@FreeBSD.org> <CAASDrVkC4qTaAkdpBui6pHjxT6R8XwsRTNfDaLz+H4PwEBwmCQ@mail.gmail.com> From: "Lundberg, Johannes" <johannes@brilliantservice.co.jp> Date: Sat, 13 Sep 2014 21:23:30 +0900 Message-ID: <CAASDrVkDFRBgdO08AR=3godFP60W+kVfUAVL33o6DDmrgB4KHA@mail.gmail.com> Subject: Re: drm-i915-hw-context.7.patch To: =?UTF-8?B?SmVhbi1Tw6liYXN0aWVuIFDDqWRyb24=?= <dumbbell@freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1 Cc: "freebsd-x11@freebsd.org" <freebsd-x11@freebsd.org>, Lutz Bichler <lutz.bichler@gmail.com> X-BeenThere: freebsd-x11@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: X11 on FreeBSD -- maintaining and support <freebsd-x11.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-x11>, <mailto:freebsd-x11-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/freebsd-x11/>; List-Post: <mailto:freebsd-x11@freebsd.org> List-Help: <mailto:freebsd-x11-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-x11>, <mailto:freebsd-x11-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 13 Sep 2014 12:23:54 -0000 The reason I ask is because I get these errors with the latest patch (nr 7) /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :653:12: error: redefinition of 'get_context_size' static int get_context_size(struct drm_device *dev) ^ /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :107:12: note: previous definition is here static int get_context_size(struct drm_device *dev) ^ /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :681:13: error: redefinition of 'do_destroy' static void do_destroy(struct i915_hw_context *ctx) ^ /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :135:13: note: previous definition is here static void do_destroy(struct i915_hw_context *ctx) ^ /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :699:1: error: redefinition of 'create_hw_context' create_hw_context(struct drm_device *dev, ^ /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :153:1: note: previous definition is here create_hw_context(struct drm_device *dev, ^ /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :753:20: error: redefinition of 'is_default_context' static inline bool is_default_context(struct i915_hw_context *ctx) ^ --- db_break.o --- ctfconvert -L VERSION -g db_break.o --- modules-all --- /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :207:20: note: previous definition is here static inline bool is_default_context(struct i915_hw_context *ctx) ^ /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :763:12: error: redefinition of 'create_default_context' static int create_default_context(struct drm_i915_private *dev_priv) ^ /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :217:12: note: previous definition is here static int create_default_context(struct drm_i915_private *dev_priv) ^ /usr/src/sys/modules/drm2/i915kms/../../../dev/drm2/i915/i915_gem_context.c= :799:6: error: redefinition of 'i915_gem_context_init' void i915_gem_context_init(struct drm_device *dev) -- Johannes Lundberg BRILLIANTSERVICE CO., LTD. On Sat, Sep 13, 2014 at 9:19 PM, Lundberg, Johannes < johannes@brilliantservice.co.jp> wrote: > Just to make sure, is this the only patch that needs to be applied and > should it be applied to a recent unmodified 11-current kernel? > > -- > Johannes Lundberg > BRILLIANTSERVICE CO., LTD. > > On Sat, Sep 13, 2014 at 7:59 PM, Jean-S=C3=A9bastien P=C3=A9dron < > dumbbell@freebsd.org> wrote: > >> On 13.09.2014 12:53, Lutz Bichler wrote: >> > Hi, >> >> Hi! >> >> > is it correct that the successful path in drm_gem_find_ptr does not >> release >> > "names->lock"? >> >> No, it's incorrect. Good catch! >> >> I'll update the patch soon. >> >> Thank you :) >> >> -- >> Jean-S=C3=A9bastien P=C3=A9dron >> >> > --=20 =3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D= -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- =E7=A7=98=E5=AF=86=E4=BF=9D=E6=8C=81=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6=EF= =BC=9A=E3=81=93=E3=81=AE=E9=9B=BB=E5=AD=90=E3=83=A1=E3=83=BC=E3=83=AB=E3=81= =AF=E3=80=81=E5=90=8D=E5=AE=9B=E4=BA=BA=E3=81=AB=E9=80=81=E4=BF=A1=E3=81=97= =E3=81=9F=E3=82=82=E3=81=AE=E3=81=A7=E3=81=82=E3=82=8A=E3=80=81=E7=A7=98=E5= =8C=BF=E7=89=B9=E6=A8=A9=E3=81=AE=E5=AF=BE=E8=B1=A1=E3=81=A8=E3=81=AA=E3=82= =8B=E6=83=85=E5=A0=B1=E3=82=92=E5=90=AB=E3=82=93=E3=81=A7=E3=81=84=E3=81=BE= =E3=81=99=E3=80=82 =E3=82=82=E3=81=97=E3=80=81=E5=90=8D=E5=AE=9B=E4=BA=BA=E4=BB=A5=E5=A4=96=E3= =81=AE=E6=96=B9=E3=81=8C=E5=8F=97=E4=BF=A1=E3=81=95=E3=82=8C=E3=81=9F=E5=A0= =B4=E5=90=88=E3=80=81=E3=81=93=E3=81=AE=E3=83=A1=E3=83=BC=E3=83=AB=E3=81=AE= =E7=A0=B4=E6=A3=84=E3=80=81=E3=81=8A=E3=82=88=E3=81=B3=E3=81=93=E3=81=AE=E3= =83=A1=E3=83=BC=E3=83=AB=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E4=B8=80=E5=88= =87=E3=81=AE=E9=96=8B=E7=A4=BA=E3=80=81 =E8=A4=87=E5=86=99=E3=80=81=E9=85=8D=E5=B8=83=E3=80=81=E3=81=9D=E3=81=AE=E4= =BB=96=E3=81=AE=E5=88=A9=E7=94=A8=E3=80=81=E3=81=BE=E3=81=9F=E3=81=AF=E8=A8= =98=E8=BC=89=E5=86=85=E5=AE=B9=E3=81=AB=E5=9F=BA=E3=81=A5=E3=81=8F=E3=81=84= =E3=81=8B=E3=81=AA=E3=82=8B=E8=A1=8C=E5=8B=95=E3=82=82=E3=81=95=E3=82=8C=E3= =81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=8A=E9=A1=98=E3=81=84=E7=94=B3=E3=81= =97=E4=B8=8A=E3=81=92=E3=81=BE=E3=81=99=E3=80=82 --- CONFIDENTIALITY NOTE: The information in this email is confidential and intended solely for the addressee. Disclosure, copying, distribution or any other action of use of this email by person other than intended recipient, is prohibited. If you are not the intended recipient and have received this email in error, please destroy the original message.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAASDrVkC4qTaAkdpBui6pHjxT6R8XwsRTNfDaLz%2BH4PwEBwmCQ>