From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: intel-gfx <intel-gfx@lists.freedesktop.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Russell King <rmk@armlinux.org.uk>,
linux-next <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Benjamin Gaignard <benjamin.gaignard@linaro.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with the arm tree
Date: Wed, 22 Jun 2016 09:31:18 +0200 [thread overview]
Message-ID: <CAKMK7uFDQPdUinsDQaFxCW31k5T9qXoiNkzQ-CuqYQPPbz99pA@mail.gmail.com> (raw)
In-Reply-To: <20160622114704.5b0c97eb@canb.auug.org.au>
On Wed, Jun 22, 2016 at 3:47 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/sti/sti_drv.c
>
> between commit:
>
> 062993b15e8e ("drm: convert DT component matching to component_match_add_release()")
Why did that one end up in the arm tree? Should it go in through
drm-misc instead?
-Daniel
> from the arm tree and commit:
>
> 84601dbdea36 ("drm: sti: rework init sequence")
>
> from the drm-misc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/sti/sti_drv.c
> index 8abb57a94651,96bd3d08b2d4..000000000000
> --- a/drivers/gpu/drm/sti/sti_drv.c
> +++ b/drivers/gpu/drm/sti/sti_drv.c
> @@@ -340,14 -320,79 +320,84 @@@ static int compare_of(struct device *de
> return dev->of_node == data;
> }
>
> +static void release_of(struct device *dev, void *data)
> +{
> + of_node_put(data);
> +}
> +
> + static int sti_init(struct drm_device *ddev)
> + {
> + struct sti_private *private;
> +
> + private = kzalloc(sizeof(*private), GFP_KERNEL);
> + if (!private)
> + return -ENOMEM;
> +
> + ddev->dev_private = (void *)private;
> + dev_set_drvdata(ddev->dev, ddev);
> + private->drm_dev = ddev;
> +
> + mutex_init(&private->commit.lock);
> + INIT_WORK(&private->commit.work, sti_atomic_work);
> +
> + drm_mode_config_init(ddev);
> +
> + sti_mode_config_init(ddev);
> +
> + drm_kms_helper_poll_init(ddev);
> +
> + return 0;
> + }
> +
> + static void sti_cleanup(struct drm_device *ddev)
> + {
> + struct sti_private *private = ddev->dev_private;
> +
> + if (private->fbdev) {
> + drm_fbdev_cma_fini(private->fbdev);
> + private->fbdev = NULL;
> + }
> +
> + drm_kms_helper_poll_fini(ddev);
> + drm_vblank_cleanup(ddev);
> + kfree(private);
> + ddev->dev_private = NULL;
> + }
> +
> static int sti_bind(struct device *dev)
> {
> - return drm_platform_init(&sti_driver, to_platform_device(dev));
> + struct drm_device *ddev;
> + int ret;
> +
> + ddev = drm_dev_alloc(&sti_driver, dev);
> + if (!ddev)
> + return -ENOMEM;
> +
> + ddev->platformdev = to_platform_device(dev);
> +
> + ret = sti_init(ddev);
> + if (ret)
> + goto err_drm_dev_unref;
> +
> + ret = component_bind_all(ddev->dev, ddev);
> + if (ret)
> + goto err_cleanup;
> +
> + ret = drm_dev_register(ddev, 0);
> + if (ret)
> + goto err_register;
> +
> + drm_mode_config_reset(ddev);
> +
> + return 0;
> +
> + err_register:
> + drm_mode_config_cleanup(ddev);
> + err_cleanup:
> + sti_cleanup(ddev);
> + err_drm_dev_unref:
> + drm_dev_unref(ddev);
> + return ret;
> }
>
> static void sti_unbind(struct device *dev)
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
next prev parent reply other threads:[~2016-06-22 8:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 1:47 linux-next: manual merge of the drm-misc tree with the arm tree Stephen Rothwell
2016-06-22 7:31 ` Daniel Vetter [this message]
2016-06-22 8:21 ` Russell King
2016-06-22 8:23 ` Daniel Vetter
2016-06-22 8:43 ` Russell King
2016-06-22 12:11 ` [Intel-gfx] " Daniel Vetter
2016-07-13 2:35 Stephen Rothwell
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=CAKMK7uFDQPdUinsDQaFxCW31k5T9qXoiNkzQ-CuqYQPPbz99pA@mail.gmail.com \
--to=daniel.vetter@ffwll.ch \
--cc=benjamin.gaignard@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rmk@armlinux.org.uk \
--cc=sfr@canb.auug.org.au \
/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).