From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v2] drm/fb-helper: Don't call dirty callback for untouched clips Date: Fri, 21 Oct 2016 15:52:07 +0300 Message-ID: <20161021125207.GH4329@intel.com> References: <20161020150530.5787-1-tiwai@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22CFA6ECFD for ; Fri, 21 Oct 2016 12:52:12 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20161020150530.5787-1-tiwai@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Takashi Iwai Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBPY3QgMjAsIDIwMTYgYXQgMDU6MDU6MzBQTSArMDIwMCwgVGFrYXNoaSBJd2FpIHdy b3RlOgo+IFNpbmNlIDQuNyBrZXJuZWwsIHdlJ3ZlIHNlZW4gdGhlIGVycm9yIG1lc3NhZ2VzIGxp a2UKPiAKPiAga2VybmVsOiBbVFRNXSBCdWZmZXIgZXZpY3Rpb24gZmFpbGVkCj4gIGtlcm5lbDog cXhsIDAwMDA6MDA6MDIuMDogb2JqZWN0X2luaXQgZmFpbGVkIGZvciAoNDAyNjU0MDAzMiwgMHgw MDAwMDAwMSkKPiAga2VybmVsOiBbZHJtOnF4bF9hbGxvY19ib19yZXNlcnZlZCBbcXhsXV0gKkVS Uk9SKiBmYWlsZWQgdG8gYWxsb2NhdGUgVlJBTSBCTwo+IAo+IG9uIFFYTCB3aGVuIHN3aXRjaGlu ZyBhbmQgYWNjZXNzaW5nIG9uIFZULiAgVGhlIGN1bHByaXQgd2FzIHRoZQo+IGdlbmVyaWMgZGVm ZXJyZWRfaW8gY29kZSAocXhsIGRyaXZlciBzd2l0Y2hlZCB0byBpdCBzaW5jZSA0LjcpLgo+IFRo ZXJlIGlzIGEgcmFjZSBiZXR3ZWVuIHRoZSBkaXJ0eSBjbGlwIHVwZGF0ZSBhbmQgdGhlIGNhbGwg b2YKPiBjYWxsYmFjay4KPiAKPiBJbiBkcm1fZmJfaGVscGVyX2RpcnR5KCksIHRoZSBkaXJ0eSBj bGlwIGlzIHVwZGF0ZWQgaW4gdGhlIHNwaW5sb2NrLAo+IHdoaWxlIGl0IGtpY2tzIG9mZiB0aGUg dXBkYXRlIHdvcmtlciBvdXRzaWRlIHRoZSBzcGlubG9jay4gIE1lYW53aGlsZQo+IHRoZSB1cGRh dGUgd29ya2VyIGNsZWFycyB0aGUgZGlydHkgY2xpcCBpbiB0aGUgc3BpbmxvY2ssIHRvby4gIFRo dXMsCj4gd2hlbiBkcm1fZmJfaGVscGVyX2RpcnR5KCkgaXMgY2FsbGVkIGNvbmN1cnJlbnRseSwg c2NoZWR1bGVfd29yaygpIGlzCj4gY2FsbGVkIGFmdGVyIHRoZSBjbGlwIGlzIGNsZWFyZWQgaW4g dGhlIGZpcnN0IHdvcmtlciBjYWxsLgo+IAo+IFRoaXMgcGF0Y2ggYWRkcmVzc2VzIGl0IGJ5IHZh bGlkYXRpbmcgdGhlIGNsaXAgYmVmb3JlIGNhbGxpbmcgdGhlCj4gZGlydHkgZmIgY2FsbGJhY2su Cj4gCj4gQnVnemlsbGE6IGh0dHBzOi8vYnVncy5mcmVlZGVza3RvcC5vcmcvc2hvd19idWcuY2dp P2lkPTk4MzIyCj4gQnVnemlsbGE6IGh0dHBzOi8vYnVnemlsbGEuc3VzZS5jb20vc2hvd19idWcu Y2dpP2lkPTEwMDMyOTgKPiBGaXhlczogZWFhNDM0ZGVmYWNhICgnZHJtL2ZiLWhlbHBlcjogQWRk IGZiX2RlZmVycmVkX2lvIHN1cHBvcnQnKQo+IENjOiA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4K PiBTaWduZWQtb2ZmLWJ5OiBUYWthc2hpIEl3YWkgPHRpd2FpQHN1c2UuZGU+CgpSZXZpZXdlZC1i eTogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxpbnV4LmludGVsLmNvbT4KCj4gLS0t Cj4gdjEtPnYyOiBzaW1wbGlmaWVkIHRoZSBjb2RlIGFzIHN1Z2dlc3RlZCBieSBWaWxsZQo+IAo+ ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jIHwgNCArKystCj4gIDEgZmlsZSBjaGFu Z2VkLCAzIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPiAKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL2RybV9mYl9oZWxwZXIuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fZmJfaGVs cGVyLmMKPiBpbmRleCAwMzQxNGJkZTFmMTUuLmFhZTdkZjAxODY0ZCAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL2dwdS9kcm0vZHJtX2ZiX2hlbHBlci5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2Ry bV9mYl9oZWxwZXIuYwo+IEBAIC02NDQsNyArNjQ0LDkgQEAgc3RhdGljIHZvaWQgZHJtX2ZiX2hl bHBlcl9kaXJ0eV93b3JrKHN0cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKPiAgCWNsaXAtPngyID0g Y2xpcC0+eTIgPSAwOwo+ICAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmaGVscGVyLT5kaXJ0eV9s b2NrLCBmbGFncyk7Cj4gIAo+IC0JaGVscGVyLT5mYi0+ZnVuY3MtPmRpcnR5KGhlbHBlci0+ZmIs IE5VTEwsIDAsIDAsICZjbGlwX2NvcHksIDEpOwo+ICsJLyogY2FsbCBkaXJ0eSBjYWxsYmFjayBv bmx5IHdoZW4gaXQgaGFzIGJlZW4gcmVhbGx5IHRvdWNoZWQgKi8KPiArCWlmIChjbGlwX2NvcHku eDEgPCBjbGlwX2NvcHkueDIgJiYgY2xpcF9jb3B5LnkxIDwgY2xpcF9jb3B5LnkyKQo+ICsJCWhl bHBlci0+ZmItPmZ1bmNzLT5kaXJ0eShoZWxwZXItPmZiLCBOVUxMLCAwLCAwLCAmY2xpcF9jb3B5 LCAxKTsKPiAgfQo+ICAKPiAgLyoqCj4gLS0gCj4gMi4xMC4xCgotLSAKVmlsbGUgU3lyasOkbMOk CkludGVsIE9UQwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK aHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933547AbcJUMwW (ORCPT ); Fri, 21 Oct 2016 08:52:22 -0400 Received: from mga07.intel.com ([134.134.136.100]:21676 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933546AbcJUMwO (ORCPT ); Fri, 21 Oct 2016 08:52:14 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,376,1473145200"; d="scan'208";a="775631501" Date: Fri, 21 Oct 2016 15:52:07 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Takashi Iwai Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Daniel Vetter , Noralf =?iso-8859-1?Q?Tr=F8nnes?= , David Airlie Subject: Re: [PATCH v2] drm/fb-helper: Don't call dirty callback for untouched clips Message-ID: <20161021125207.GH4329@intel.com> References: <20161020150530.5787-1-tiwai@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20161020150530.5787-1-tiwai@suse.de> 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 Thu, Oct 20, 2016 at 05:05:30PM +0200, Takashi Iwai wrote: > Since 4.7 kernel, we've seen the error messages like > > kernel: [TTM] Buffer eviction failed > kernel: qxl 0000:00:02.0: object_init failed for (4026540032, 0x00000001) > kernel: [drm:qxl_alloc_bo_reserved [qxl]] *ERROR* failed to allocate VRAM BO > > on QXL when switching and accessing on VT. The culprit was the > generic deferred_io code (qxl driver switched to it since 4.7). > There is a race between the dirty clip update and the call of > callback. > > In drm_fb_helper_dirty(), the dirty clip is updated in the spinlock, > while it kicks off the update worker outside the spinlock. Meanwhile > the update worker clears the dirty clip in the spinlock, too. Thus, > when drm_fb_helper_dirty() is called concurrently, schedule_work() is > called after the clip is cleared in the first worker call. > > This patch addresses it by validating the clip before calling the > dirty fb callback. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98322 > Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1003298 > Fixes: eaa434defaca ('drm/fb-helper: Add fb_deferred_io support') > Cc: > Signed-off-by: Takashi Iwai Reviewed-by: Ville Syrjälä > --- > v1->v2: simplified the code as suggested by Ville > > drivers/gpu/drm/drm_fb_helper.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index 03414bde1f15..aae7df01864d 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -644,7 +644,9 @@ static void drm_fb_helper_dirty_work(struct work_struct *work) > clip->x2 = clip->y2 = 0; > spin_unlock_irqrestore(&helper->dirty_lock, flags); > > - helper->fb->funcs->dirty(helper->fb, NULL, 0, 0, &clip_copy, 1); > + /* call dirty callback only when it has been really touched */ > + if (clip_copy.x1 < clip_copy.x2 && clip_copy.y1 < clip_copy.y2) > + helper->fb->funcs->dirty(helper->fb, NULL, 0, 0, &clip_copy, 1); > } > > /** > -- > 2.10.1 -- Ville Syrjälä Intel OTC