From: Jani Nikula <jani.nikula@linux.intel.com>
To: "Michel Dänzer" <michel@daenzer.net>, "Imre Deak" <imre.deak@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH] drm: Fix error path in drm_mode_page_flip_ioctl()
Date: Thu, 08 Sep 2016 12:15:47 +0300 [thread overview]
Message-ID: <8737lawy4c.fsf@intel.com> (raw)
In-Reply-To: <caf0e006-20e9-ba2f-234c-f22838621268@daenzer.net>
On Thu, 08 Sep 2016, Michel Dänzer <michel@daenzer.net> wrote:
> On 08/09/16 02:23 AM, Imre Deak wrote:
>> This fixes the error path for platforms that don't define the new
>> page_flip_target() hook.
>>
>> Fixes: c229bfbbd04 ("drm: Add page_flip_target CRTC hook v2")
>> Testcase: igt/kms_flip/basic-flip-vs-dpms
>> CC: Michel Dänzer <michel.daenzer@amd.com>
>> Signed-off-by: Imre Deak <imre.deak@intel.com>
>> ---
>> drivers/gpu/drm/drm_crtc.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
>> index 0f797ee..d84a0ea 100644
>> --- a/drivers/gpu/drm/drm_crtc.c
>> +++ b/drivers/gpu/drm/drm_crtc.c
>> @@ -2047,7 +2047,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev,
>> }
>>
>> out:
>> - if (ret)
>> + if (ret && crtc->funcs->page_flip_target)
>> drm_crtc_vblank_put(crtc);
>> if (fb)
>> drm_framebuffer_unreference(fb);
>>
>
> Nice catch, thanks!
>
> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Picked up to drm-misc, thanks for the patch and review.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2016-09-08 9:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-07 17:23 [PATCH] drm: Fix error path in drm_mode_page_flip_ioctl() Imre Deak
2016-09-07 17:54 ` ✗ Fi.CI.BAT: failure for " Patchwork
2016-09-08 3:39 ` [PATCH] " Michel Dänzer
2016-09-08 9:15 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8737lawy4c.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=imre.deak@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=michel@daenzer.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.