| Message ID | 20160725100933.9261-1-lee.jones@linaro.org |
|---|---|
| State | Accepted |
| Commit | c084c8dafce72bf67ad2bb7b873a4a732a9ce81c |
| Headers | show |
On Mon, 25 Jul 2016, Peter Griffin wrote: > On Mon, 25 Jul 2016, Lee Jones wrote: > > > Since 0b52297f228 ("reset: Add support for shared reset controls") the > > new Reset API now demands consumers choose either an *_exclusive or a > > *_shared line when requesting reset lines. > > > > This issue was found when running a kernel containing the aforementioned > > patch which includes an informitive WARN(). It implies that one or > > more used reset lines are in fact shared. This is why we're using the > > *_shared variant. > > > > Signed-off-by: Lee Jones <lee.jones@linaro.org> > > --- > > drivers/gpu/drm/sti/sti_compositor.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > Your missing a changelog on the v2 version. This isn't really a v2, hence the lack if [PATCH vX] increment. This is v1 with a more verbose changelog. > Apart from that: > Acked-by: Peter Griffin <peter.griffin@linaro.org> Ta.
diff --git a/drivers/gpu/drm/sti/sti_compositor.c b/drivers/gpu/drm/sti/sti_compositor.c index 3d2fa3a..c2ace02 100644 --- a/drivers/gpu/drm/sti/sti_compositor.c +++ b/drivers/gpu/drm/sti/sti_compositor.c @@ -234,12 +234,12 @@ static int sti_compositor_probe(struct platform_device *pdev) } /* Get reset resources */ - compo->rst_main = devm_reset_control_get(dev, "compo-main"); + compo->rst_main = devm_reset_control_get_shared(dev, "compo-main"); /* Take compo main out of reset */ if (!IS_ERR(compo->rst_main)) reset_control_deassert(compo->rst_main); - compo->rst_aux = devm_reset_control_get(dev, "compo-aux"); + compo->rst_aux = devm_reset_control_get_shared(dev, "compo-aux"); /* Take compo aux out of reset */ if (!IS_ERR(compo->rst_aux)) reset_control_deassert(compo->rst_aux);
Since 0b52297f228 ("reset: Add support for shared reset controls") the new Reset API now demands consumers choose either an *_exclusive or a *_shared line when requesting reset lines. This issue was found when running a kernel containing the aforementioned patch which includes an informitive WARN(). It implies that one or more used reset lines are in fact shared. This is why we're using the *_shared variant. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/gpu/drm/sti/sti_compositor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)