From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753295AbcDXUtk (ORCPT ); Sun, 24 Apr 2016 16:49:40 -0400 Received: from asav21.altibox.net ([109.247.116.8]:32847 "EHLO asav21.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753124AbcDXUth (ORCPT ); Sun, 24 Apr 2016 16:49:37 -0400 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: daniel@ffwll.ch, laurent.pinchart@ideasonboard.com, tomi.valkeinen@ti.com, linux-kernel@vger.kernel.org, =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Subject: [PATCH v2 3/8] drm/qxl: Change drm_fb_helper_sys_*() calls to sys_*() Date: Sun, 24 Apr 2016 22:48:57 +0200 Message-Id: <1461530942-22485-4-git-send-email-noralf@tronnes.org> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1461530942-22485-1-git-send-email-noralf@tronnes.org> References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=VqODe7Cn c=1 sm=1 tr=0 a=gFHx44SYZz5JQKQKbGEAEQ==:117 a=gFHx44SYZz5JQKQKbGEAEQ==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=IkcTkHD0fZMA:10 a=SJz97ENfAAAA:8 a=ZbVy93y-_R0aM3yTvH4A:9 a=QEXdDO2ut3YA:10 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that drm_fb_helper gets deferred io support, the drm_fb_helper_sys_{fillrect,copyarea,imageblit} functions will schedule a worker that will call the (struct drm_framebuffer *)->funcs->dirty() function. This will break this driver so use the sys_{fillrect,copyarea,imageblit} functions directly. Signed-off-by: Noralf Trønnes --- drivers/gpu/drm/qxl/qxl_fb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index 7136e52..06f032d 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c @@ -199,7 +199,7 @@ static void qxl_fb_fillrect(struct fb_info *info, { struct qxl_fbdev *qfbdev = info->par; - drm_fb_helper_sys_fillrect(info, rect); + sys_fillrect(info, rect); qxl_dirty_update(qfbdev, rect->dx, rect->dy, rect->width, rect->height); } @@ -209,7 +209,7 @@ static void qxl_fb_copyarea(struct fb_info *info, { struct qxl_fbdev *qfbdev = info->par; - drm_fb_helper_sys_copyarea(info, area); + sys_copyarea(info, area); qxl_dirty_update(qfbdev, area->dx, area->dy, area->width, area->height); } @@ -219,7 +219,7 @@ static void qxl_fb_imageblit(struct fb_info *info, { struct qxl_fbdev *qfbdev = info->par; - drm_fb_helper_sys_imageblit(info, image); + sys_imageblit(info, image); qxl_dirty_update(qfbdev, image->dx, image->dy, image->width, image->height); } -- 2.2.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Sun, 24 Apr 2016 20:48:57 +0000 Subject: [PATCH v2 3/8] drm/qxl: Change drm_fb_helper_sys_*() calls to sys_*() Message-Id: <1461530942-22485-4-git-send-email-noralf@tronnes.org> List-Id: References: <1461530942-22485-1-git-send-email-noralf@tronnes.org> In-Reply-To: <1461530942-22485-1-git-send-email-noralf@tronnes.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com, linux-kernel@vger.kernel.org Now that drm_fb_helper gets deferred io support, the drm_fb_helper_sys_{fillrect,copyarea,imageblit} functions will schedule a worker that will call the (struct drm_framebuffer *)->funcs->dirty() function. This will break this driver so use the sys_{fillrect,copyarea,imageblit} functions directly. Signed-off-by: Noralf Tr=C3=B8nnes --- drivers/gpu/drm/qxl/qxl_fb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_fb.c b/drivers/gpu/drm/qxl/qxl_fb.c index 7136e52..06f032d 100644 --- a/drivers/gpu/drm/qxl/qxl_fb.c +++ b/drivers/gpu/drm/qxl/qxl_fb.c @@ -199,7 +199,7 @@ static void qxl_fb_fillrect(struct fb_info *info, { struct qxl_fbdev *qfbdev =3D info->par; =20 - drm_fb_helper_sys_fillrect(info, rect); + sys_fillrect(info, rect); qxl_dirty_update(qfbdev, rect->dx, rect->dy, rect->width, rect->height); } @@ -209,7 +209,7 @@ static void qxl_fb_copyarea(struct fb_info *info, { struct qxl_fbdev *qfbdev =3D info->par; =20 - drm_fb_helper_sys_copyarea(info, area); + sys_copyarea(info, area); qxl_dirty_update(qfbdev, area->dx, area->dy, area->width, area->height); } @@ -219,7 +219,7 @@ static void qxl_fb_imageblit(struct fb_info *info, { struct qxl_fbdev *qfbdev =3D info->par; =20 - drm_fb_helper_sys_imageblit(info, image); + sys_imageblit(info, image); qxl_dirty_update(qfbdev, image->dx, image->dy, image->width, image->height); } --=20 2.2.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Subject: [PATCH v2 3/8] drm/qxl: Change drm_fb_helper_sys_*() calls to sys_*() Date: Sun, 24 Apr 2016 22:48:57 +0200 Message-ID: <1461530942-22485-4-git-send-email-noralf@tronnes.org> References: <1461530942-22485-1-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 asav21.altibox.net (asav21.altibox.net [109.247.116.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id 861746E248 for ; Sun, 24 Apr 2016 20:49:37 +0000 (UTC) In-Reply-To: <1461530942-22485-1-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: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Cc: tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org Tm93IHRoYXQgZHJtX2ZiX2hlbHBlciBnZXRzIGRlZmVycmVkIGlvIHN1cHBvcnQsIHRoZQpkcm1f ZmJfaGVscGVyX3N5c197ZmlsbHJlY3QsY29weWFyZWEsaW1hZ2VibGl0fSBmdW5jdGlvbnMgd2ls bCBzY2hlZHVsZQphIHdvcmtlciB0aGF0IHdpbGwgY2FsbCB0aGUgKHN0cnVjdCBkcm1fZnJhbWVi dWZmZXIgKiktPmZ1bmNzLT5kaXJ0eSgpCmZ1bmN0aW9uLiBUaGlzIHdpbGwgYnJlYWsgdGhpcyBk cml2ZXIgc28gdXNlIHRoZQpzeXNfe2ZpbGxyZWN0LGNvcHlhcmVhLGltYWdlYmxpdH0gZnVuY3Rp b25zIGRpcmVjdGx5LgoKU2lnbmVkLW9mZi1ieTogTm9yYWxmIFRyw7hubmVzIDxub3JhbGZAdHJv bm5lcy5vcmc+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3F4bC9xeGxfZmIuYyB8IDYgKysrLS0tCiAx IGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9xeGwvcXhsX2ZiLmMgYi9kcml2ZXJzL2dwdS9kcm0vcXhsL3F4 bF9mYi5jCmluZGV4IDcxMzZlNTIuLjA2ZjAzMmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2Ry bS9xeGwvcXhsX2ZiLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3F4bC9xeGxfZmIuYwpAQCAtMTk5 LDcgKzE5OSw3IEBAIHN0YXRpYyB2b2lkIHF4bF9mYl9maWxscmVjdChzdHJ1Y3QgZmJfaW5mbyAq aW5mbywKIHsKIAlzdHJ1Y3QgcXhsX2ZiZGV2ICpxZmJkZXYgPSBpbmZvLT5wYXI7CiAKLQlkcm1f ZmJfaGVscGVyX3N5c19maWxscmVjdChpbmZvLCByZWN0KTsKKwlzeXNfZmlsbHJlY3QoaW5mbywg cmVjdCk7CiAJcXhsX2RpcnR5X3VwZGF0ZShxZmJkZXYsIHJlY3QtPmR4LCByZWN0LT5keSwgcmVj dC0+d2lkdGgsCiAJCQkgcmVjdC0+aGVpZ2h0KTsKIH0KQEAgLTIwOSw3ICsyMDksNyBAQCBzdGF0 aWMgdm9pZCBxeGxfZmJfY29weWFyZWEoc3RydWN0IGZiX2luZm8gKmluZm8sCiB7CiAJc3RydWN0 IHF4bF9mYmRldiAqcWZiZGV2ID0gaW5mby0+cGFyOwogCi0JZHJtX2ZiX2hlbHBlcl9zeXNfY29w eWFyZWEoaW5mbywgYXJlYSk7CisJc3lzX2NvcHlhcmVhKGluZm8sIGFyZWEpOwogCXF4bF9kaXJ0 eV91cGRhdGUocWZiZGV2LCBhcmVhLT5keCwgYXJlYS0+ZHksIGFyZWEtPndpZHRoLAogCQkJIGFy ZWEtPmhlaWdodCk7CiB9CkBAIC0yMTksNyArMjE5LDcgQEAgc3RhdGljIHZvaWQgcXhsX2ZiX2lt YWdlYmxpdChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywKIHsKIAlzdHJ1Y3QgcXhsX2ZiZGV2ICpxZmJk ZXYgPSBpbmZvLT5wYXI7CiAKLQlkcm1fZmJfaGVscGVyX3N5c19pbWFnZWJsaXQoaW5mbywgaW1h Z2UpOworCXN5c19pbWFnZWJsaXQoaW5mbywgaW1hZ2UpOwogCXF4bF9kaXJ0eV91cGRhdGUocWZi ZGV2LCBpbWFnZS0+ZHgsIGltYWdlLT5keSwgaW1hZ2UtPndpZHRoLAogCQkJIGltYWdlLT5oZWln aHQpOwogfQotLSAKMi4yLjIKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo=