From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: briannorris@chromium.org, dianders@chromium.org,
tfiga@chromium.org, seanpaul@chromium.org, zyw@rock-chips.com,
mark.yao@rock-chips.com, Jeffy Chen <jeffy.chen@rock-chips.com>,
Heiko Stuebner <heiko@sntech.de>,
dri-devel@lists.freedesktop.org,
linux-rockchip@lists.infradead.org,
David Airlie <airlied@linux.ie>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/9] drm/rockchip: cdn-dp: Don't try to release firmware when not loaded
Date: Sat, 1 Apr 2017 19:35:24 +0800 [thread overview]
Message-ID: <1491046529-4310-5-git-send-email-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <1491046529-4310-1-git-send-email-jeffy.chen@rock-chips.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
Changes in v2: None
drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c
index fd79a70..a97f3f4 100644
--- a/drivers/gpu/drm/rockchip/cdn-dp-core.c
+++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -1052,6 +1052,7 @@ static int cdn_dp_bind(struct device *dev, struct device *master, void *data)
dp->connected = false;
dp->active = false;
dp->active_port = -1;
+ dp->fw_loaded = false;
INIT_WORK(&dp->event_work, cdn_dp_pd_event_work);
@@ -1132,7 +1133,8 @@ static void cdn_dp_unbind(struct device *dev, struct device *master, void *data)
connector->funcs->destroy(connector);
pm_runtime_disable(dev);
- release_firmware(dp->fw);
+ if (dp->fw_loaded)
+ release_firmware(dp->fw);
kfree(dp->edid);
dp->edid = NULL;
}
--
2.1.4
next prev parent reply other threads:[~2017-04-01 11:36 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-01 11:35 [PATCH v2 0/9] drm: rockchip: Fix rockchip drm unbind crash error Jeffy Chen
2017-04-01 11:35 ` [PATCH v2 1/9] drm: bridge: analogix: Detach panel when unbinding analogix dp Jeffy Chen
2017-04-01 11:35 ` [PATCH v2 2/9] drm: bridge: analogix: Unregister dp aux when unbinding Jeffy Chen
2017-04-01 11:35 ` [PATCH v2 3/9] drm: bridge: analogix: Destroy connector " Jeffy Chen
2017-04-01 11:35 ` Jeffy Chen [this message]
2017-04-01 11:35 ` [PATCH v2 5/9] drm/rockchip: vop: Enable pm domain when resetting vop Jeffy Chen
2017-04-04 19:42 ` Sean Paul
2017-04-05 10:23 ` jeffy
2017-04-01 11:35 ` [PATCH v2 6/9] drm/rockchip: Reoder unload sequence Jeffy Chen
2017-04-04 19:44 ` Sean Paul
2017-04-05 10:20 ` jeffy
2017-04-01 11:35 ` [PATCH v2 7/9] drm/rockchip: Force disable all crtc when unload Jeffy Chen
2017-04-03 7:58 ` Daniel Vetter
2017-04-05 10:25 ` jeffy
2017-04-01 11:35 ` [PATCH v2 8/9] drm/rockchip: gem: Don't alloc/free gem buf before drm dev registered Jeffy Chen
2017-04-03 7:41 ` Daniel Vetter
2017-04-05 1:28 ` jeffy
2017-04-01 11:35 ` [PATCH v2 9/9] drm/rockchip: cdn-dp: Don't unregister audio dev when unbinding Jeffy Chen
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=1491046529-4310-5-git-send-email-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=airlied@linux.ie \
--cc=briannorris@chromium.org \
--cc=dianders@chromium.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=mark.yao@rock-chips.com \
--cc=seanpaul@chromium.org \
--cc=tfiga@chromium.org \
--cc=zyw@rock-chips.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).