From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752172AbcDTRmz (ORCPT ); Wed, 20 Apr 2016 13:42:55 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:32997 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751971AbcDTRmv (ORCPT ); Wed, 20 Apr 2016 13:42:51 -0400 Date: Wed, 20 Apr 2016 19:42:41 +0200 From: Daniel Vetter To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, daniel@ffwll.ch, laurent.pinchart@ideasonboard.com, tomi.valkeinen@ti.com, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/8] drm/udl: Change drm_fb_helper_sys_*() calls to sys_*() Message-ID: <20160420174241.GP2510@phenom.ffwll.local> Mail-Followup-To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, laurent.pinchart@ideasonboard.com, tomi.valkeinen@ti.com, linux-kernel@vger.kernel.org References: <1461165929-11344-1-git-send-email-noralf@tronnes.org> <1461165929-11344-3-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1461165929-11344-3-git-send-email-noralf@tronnes.org> X-Operating-System: Linux phenom 4.4.0-1-amd64 User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 20, 2016 at 05:25:23PM +0200, Noralf Trønnes wrote: > Now that drm_fb_helper gets deferred io support, the > drm_fb_helper_sys_{fillrect,copyarea,imageblit} functions will schedule > the worker that calls the deferred_io callback. This will break this > driver so use the sys_{fillrect,copyarea,imageblit} functions directly. > > Signed-off-by: Noralf Trønnes I think this intermediately breaks the build, if you disable fbdev support. That's now supported in the fbdev helpers core generically across all drivers. Not sure how to best fix this up, since the only way would be to squash these patches, plus generic deferred io plus the conversion patches for udl/qxl all into one. Tricky. -Daniel > --- > drivers/gpu/drm/udl/udl_fb.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c > index fd1eb9d..a52de2f 100644 > --- a/drivers/gpu/drm/udl/udl_fb.c > +++ b/drivers/gpu/drm/udl/udl_fb.c > @@ -287,7 +287,7 @@ static void udl_fb_fillrect(struct fb_info *info, const struct fb_fillrect *rect > { > struct udl_fbdev *ufbdev = info->par; > > - drm_fb_helper_sys_fillrect(info, rect); > + sys_fillrect(info, rect); > > udl_handle_damage(&ufbdev->ufb, rect->dx, rect->dy, rect->width, > rect->height); > @@ -297,7 +297,7 @@ static void udl_fb_copyarea(struct fb_info *info, const struct fb_copyarea *regi > { > struct udl_fbdev *ufbdev = info->par; > > - drm_fb_helper_sys_copyarea(info, region); > + sys_copyarea(info, region); > > udl_handle_damage(&ufbdev->ufb, region->dx, region->dy, region->width, > region->height); > @@ -307,7 +307,7 @@ static void udl_fb_imageblit(struct fb_info *info, const struct fb_image *image) > { > struct udl_fbdev *ufbdev = info->par; > > - drm_fb_helper_sys_imageblit(info, image); > + sys_imageblit(info, image); > > udl_handle_damage(&ufbdev->ufb, image->dx, image->dy, image->width, > image->height); > -- > 2.2.2 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Date: Wed, 20 Apr 2016 17:42:41 +0000 Subject: Re: [PATCH 2/8] drm/udl: Change drm_fb_helper_sys_*() calls to sys_*() Message-Id: <20160420174241.GP2510@phenom.ffwll.local> List-Id: References: <1461165929-11344-1-git-send-email-noralf@tronnes.org> <1461165929-11344-3-git-send-email-noralf@tronnes.org> In-Reply-To: <1461165929-11344-3-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com On Wed, Apr 20, 2016 at 05:25:23PM +0200, Noralf Tr=F8nnes wrote: > Now that drm_fb_helper gets deferred io support, the > drm_fb_helper_sys_{fillrect,copyarea,imageblit} functions will schedule > the worker that calls the deferred_io callback. This will break this > driver so use the sys_{fillrect,copyarea,imageblit} functions directly. >=20 > Signed-off-by: Noralf Tr=F8nnes I think this intermediately breaks the build, if you disable fbdev support. That's now supported in the fbdev helpers core generically across all drivers. Not sure how to best fix this up, since the only way would be to squash these patches, plus generic deferred io plus the conversion patches for udl/qxl all into one. Tricky. -Daniel > --- > drivers/gpu/drm/udl/udl_fb.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c > index fd1eb9d..a52de2f 100644 > --- a/drivers/gpu/drm/udl/udl_fb.c > +++ b/drivers/gpu/drm/udl/udl_fb.c > @@ -287,7 +287,7 @@ static void udl_fb_fillrect(struct fb_info *info, con= st struct fb_fillrect *rect > { > struct udl_fbdev *ufbdev =3D info->par; > =20 > - drm_fb_helper_sys_fillrect(info, rect); > + sys_fillrect(info, rect); > =20 > udl_handle_damage(&ufbdev->ufb, rect->dx, rect->dy, rect->width, > rect->height); > @@ -297,7 +297,7 @@ static void udl_fb_copyarea(struct fb_info *info, con= st struct fb_copyarea *regi > { > struct udl_fbdev *ufbdev =3D info->par; > =20 > - drm_fb_helper_sys_copyarea(info, region); > + sys_copyarea(info, region); > =20 > udl_handle_damage(&ufbdev->ufb, region->dx, region->dy, region->width, > region->height); > @@ -307,7 +307,7 @@ static void udl_fb_imageblit(struct fb_info *info, co= nst struct fb_image *image) > { > struct udl_fbdev *ufbdev =3D info->par; > =20 > - drm_fb_helper_sys_imageblit(info, image); > + sys_imageblit(info, image); > =20 > udl_handle_damage(&ufbdev->ufb, image->dx, image->dy, image->width, > image->height); > --=20 > 2.2.2 >=20 --=20 Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 2/8] drm/udl: Change drm_fb_helper_sys_*() calls to sys_*() Date: Wed, 20 Apr 2016 19:42:41 +0200 Message-ID: <20160420174241.GP2510@phenom.ffwll.local> References: <1461165929-11344-1-git-send-email-noralf@tronnes.org> <1461165929-11344-3-git-send-email-noralf@tronnes.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 11B0C6E233 for ; Wed, 20 Apr 2016 17:42:46 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id l6so15717932wml.3 for ; Wed, 20 Apr 2016 10:42:46 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1461165929-11344-3-git-send-email-noralf@tronnes.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Noralf =?iso-8859-1?Q?Tr=F8nnes?= Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBBcHIgMjAsIDIwMTYgYXQgMDU6MjU6MjNQTSArMDIwMCwgTm9yYWxmIFRyw7hubmVz IHdyb3RlOgo+IE5vdyB0aGF0IGRybV9mYl9oZWxwZXIgZ2V0cyBkZWZlcnJlZCBpbyBzdXBwb3J0 LCB0aGUKPiBkcm1fZmJfaGVscGVyX3N5c197ZmlsbHJlY3QsY29weWFyZWEsaW1hZ2VibGl0fSBm dW5jdGlvbnMgd2lsbCBzY2hlZHVsZQo+IHRoZSB3b3JrZXIgdGhhdCBjYWxscyB0aGUgZGVmZXJy ZWRfaW8gY2FsbGJhY2suIFRoaXMgd2lsbCBicmVhayB0aGlzCj4gZHJpdmVyIHNvIHVzZSB0aGUg c3lzX3tmaWxscmVjdCxjb3B5YXJlYSxpbWFnZWJsaXR9IGZ1bmN0aW9ucyBkaXJlY3RseS4KPiAK PiBTaWduZWQtb2ZmLWJ5OiBOb3JhbGYgVHLDuG5uZXMgPG5vcmFsZkB0cm9ubmVzLm9yZz4KCkkg dGhpbmsgdGhpcyBpbnRlcm1lZGlhdGVseSBicmVha3MgdGhlIGJ1aWxkLCBpZiB5b3UgZGlzYWJs ZSBmYmRldgpzdXBwb3J0LiBUaGF0J3Mgbm93IHN1cHBvcnRlZCBpbiB0aGUgZmJkZXYgaGVscGVy cyBjb3JlIGdlbmVyaWNhbGx5IGFjcm9zcwphbGwgZHJpdmVycy4KCk5vdCBzdXJlIGhvdyB0byBi ZXN0IGZpeCB0aGlzIHVwLCBzaW5jZSB0aGUgb25seSB3YXkgd291bGQgYmUgdG8gc3F1YXNoCnRo ZXNlIHBhdGNoZXMsIHBsdXMgZ2VuZXJpYyBkZWZlcnJlZCBpbyBwbHVzIHRoZSBjb252ZXJzaW9u IHBhdGNoZXMgZm9yCnVkbC9xeGwgYWxsIGludG8gb25lLiBUcmlja3kuCi1EYW5pZWwKCj4gLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2ZiLmMgfCA2ICsrKy0tLQo+ICAxIGZpbGUgY2hh bmdlZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vdWRsL3VkbF9mYi5jIGIvZHJpdmVycy9ncHUvZHJtL3VkbC91ZGxfZmIu Ywo+IGluZGV4IGZkMWViOWQuLmE1MmRlMmYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJt L3VkbC91ZGxfZmIuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS91ZGwvdWRsX2ZiLmMKPiBAQCAt Mjg3LDcgKzI4Nyw3IEBAIHN0YXRpYyB2b2lkIHVkbF9mYl9maWxscmVjdChzdHJ1Y3QgZmJfaW5m byAqaW5mbywgY29uc3Qgc3RydWN0IGZiX2ZpbGxyZWN0ICpyZWN0Cj4gIHsKPiAgCXN0cnVjdCB1 ZGxfZmJkZXYgKnVmYmRldiA9IGluZm8tPnBhcjsKPiAgCj4gLQlkcm1fZmJfaGVscGVyX3N5c19m aWxscmVjdChpbmZvLCByZWN0KTsKPiArCXN5c19maWxscmVjdChpbmZvLCByZWN0KTsKPiAgCj4g IAl1ZGxfaGFuZGxlX2RhbWFnZSgmdWZiZGV2LT51ZmIsIHJlY3QtPmR4LCByZWN0LT5keSwgcmVj dC0+d2lkdGgsCj4gIAkJCSAgcmVjdC0+aGVpZ2h0KTsKPiBAQCAtMjk3LDcgKzI5Nyw3IEBAIHN0 YXRpYyB2b2lkIHVkbF9mYl9jb3B5YXJlYShzdHJ1Y3QgZmJfaW5mbyAqaW5mbywgY29uc3Qgc3Ry dWN0IGZiX2NvcHlhcmVhICpyZWdpCj4gIHsKPiAgCXN0cnVjdCB1ZGxfZmJkZXYgKnVmYmRldiA9 IGluZm8tPnBhcjsKPiAgCj4gLQlkcm1fZmJfaGVscGVyX3N5c19jb3B5YXJlYShpbmZvLCByZWdp b24pOwo+ICsJc3lzX2NvcHlhcmVhKGluZm8sIHJlZ2lvbik7Cj4gIAo+ICAJdWRsX2hhbmRsZV9k YW1hZ2UoJnVmYmRldi0+dWZiLCByZWdpb24tPmR4LCByZWdpb24tPmR5LCByZWdpb24tPndpZHRo LAo+ICAJCQkgIHJlZ2lvbi0+aGVpZ2h0KTsKPiBAQCAtMzA3LDcgKzMwNyw3IEBAIHN0YXRpYyB2 b2lkIHVkbF9mYl9pbWFnZWJsaXQoc3RydWN0IGZiX2luZm8gKmluZm8sIGNvbnN0IHN0cnVjdCBm Yl9pbWFnZSAqaW1hZ2UpCj4gIHsKPiAgCXN0cnVjdCB1ZGxfZmJkZXYgKnVmYmRldiA9IGluZm8t PnBhcjsKPiAgCj4gLQlkcm1fZmJfaGVscGVyX3N5c19pbWFnZWJsaXQoaW5mbywgaW1hZ2UpOwo+ ICsJc3lzX2ltYWdlYmxpdChpbmZvLCBpbWFnZSk7Cj4gIAo+ICAJdWRsX2hhbmRsZV9kYW1hZ2Uo JnVmYmRldi0+dWZiLCBpbWFnZS0+ZHgsIGltYWdlLT5keSwgaW1hZ2UtPndpZHRoLAo+ICAJCQkg IGltYWdlLT5oZWlnaHQpOwo+IC0tIAo+IDIuMi4yCj4gCgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0 d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==