From: Dave Airlie <airlied@gmail.com>
To: Dave Airlie <airlied@linux.ie>
Cc: torvalds@osdl.org, Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org
Subject: Re: [BK pull] [DRM] latest DRM patches..
Date: Thu, 16 Sep 2004 23:31:15 +1000 [thread overview]
Message-ID: <21d7e99704091606315a4cc51a@mail.gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0409161226180.17566@skynet>
I've just added another changeset to use __set_current_state after
Alan suggested it as the proper construct to use in the DRM...
Dave.
On Thu, 16 Sep 2004 12:27:52 +0100 (IST), Dave Airlie <airlied@linux.ie> wrote:
>
> Hi Linus,
>
> Please do a
>
> bk pull bk://drm.bkbits.net/drm-2.6
>
> This will include the latest DRM changes and will update the following files:
>
> drivers/char/drm/drm_drv.h | 11 +++++++----
> drivers/char/drm/drm_os_linux.h | 4 ++--
> drivers/char/drm/drm_scatter.h | 2 +-
> drivers/char/drm/i830_irq.c | 4 ++--
> 4 files changed, 12 insertions(+), 9 deletions(-)
>
> through these ChangeSets:
>
> <airlied@starflyer.(none)> (04/09/16 1.1904)
> drm: use set_current_state instead of direct assignment
>
> Suggested-by: Nishanth Aravamudan <nacc@us.ibm.com>
> Approved-by: Dave Airlie <airlied@linux.ie>
>
> <airlied@starflyer.(none)> (04/09/16 1.1903)
> drm: add pci_enable_device
>
> Add pci_enable_device for any PCI device we want to use.
>
> From: Bjorn Helgaas <bjorn.helgaas@hp.com>
> Approved-by: David Airlie <airlied@linux.ie>
>
> <airlied@starflyer.(none)> (04/09/16 1.1902)
> drm: fix bug introduced in the macro removal
>
> This caused issues with a PCI radeon card.
>
> From: Jon Smirl
> Approved-by: Dave Airlie <airlied@linux.ie>
>
> diff -Nru a/drivers/char/drm/drm_drv.h b/drivers/char/drm/drm_drv.h
> --- a/drivers/char/drm/drm_drv.h Thu Sep 16 21:24:25 2004
> +++ b/drivers/char/drm/drm_drv.h Thu Sep 16 21:24:25 2004
> @@ -480,6 +480,9 @@
> if (DRM(numdevs) >= MAX_DEVICES)
> return -ENODEV;
>
> + if ((retcode=pci_enable_device(pdev)))
> + return retcode;
> +
> dev = &(DRM(device)[DRM(numdevs)]);
>
> memset( (void *)dev, 0, sizeof(*dev) );
> @@ -785,7 +788,7 @@
>
> add_wait_queue( &dev->lock.lock_queue, &entry );
> for (;;) {
> - current->state = TASK_INTERRUPTIBLE;
> + set_current_state(TASK_INTERRUPTIBLE);
> if ( !dev->lock.hw_lock ) {
> /* Device has been unregistered */
> retcode = -EINTR;
> @@ -805,7 +808,7 @@
> break;
> }
> }
> - current->state = TASK_RUNNING;
> + set_current_state(TASK_RUNNING);
> remove_wait_queue( &dev->lock.lock_queue, &entry );
> if( !retcode ) {
> if (dev->fn_tbl.release)
> @@ -985,7 +988,7 @@
>
> add_wait_queue( &dev->lock.lock_queue, &entry );
> for (;;) {
> - current->state = TASK_INTERRUPTIBLE;
> + set_current_state(TASK_INTERRUPTIBLE);
> if ( !dev->lock.hw_lock ) {
> /* Device has been unregistered */
> ret = -EINTR;
> @@ -1006,7 +1009,7 @@
> break;
> }
> }
> - current->state = TASK_RUNNING;
> + set_current_state(TASK_RUNNING);
> remove_wait_queue( &dev->lock.lock_queue, &entry );
>
> sigemptyset( &dev->sigmask );
> diff -Nru a/drivers/char/drm/drm_os_linux.h b/drivers/char/drm/drm_os_linux.h
> --- a/drivers/char/drm/drm_os_linux.h Thu Sep 16 21:24:25 2004
> +++ b/drivers/char/drm/drm_os_linux.h Thu Sep 16 21:24:25 2004
> @@ -134,7 +134,7 @@
> add_wait_queue(&(queue), &entry); \
> \
> for (;;) { \
> - current->state = TASK_INTERRUPTIBLE; \
> + set_current_state(TASK_INTERRUPTIBLE); \
> if (condition) \
> break; \
> if (time_after_eq(jiffies, end)) { \
> @@ -147,7 +147,7 @@
> break; \
> } \
> } \
> - current->state = TASK_RUNNING; \
> + set_current_state(TASK_RUNNING); \
> remove_wait_queue(&(queue), &entry); \
> } while (0)
>
> diff -Nru a/drivers/char/drm/drm_scatter.h b/drivers/char/drm/drm_scatter.h
> --- a/drivers/char/drm/drm_scatter.h Thu Sep 16 21:24:25 2004
> +++ b/drivers/char/drm/drm_scatter.h Thu Sep 16 21:24:25 2004
> @@ -73,7 +73,7 @@
>
> DRM_DEBUG( "%s\n", __FUNCTION__ );
>
> - if (drm_core_check_feature(dev, DRIVER_SG))
> + if (!drm_core_check_feature(dev, DRIVER_SG))
> return -EINVAL;
>
> if ( dev->sg )
> diff -Nru a/drivers/char/drm/i830_irq.c b/drivers/char/drm/i830_irq.c
> --- a/drivers/char/drm/i830_irq.c Thu Sep 16 21:24:25 2004
> +++ b/drivers/char/drm/i830_irq.c Thu Sep 16 21:24:25 2004
> @@ -92,7 +92,7 @@
> add_wait_queue(&dev_priv->irq_queue, &entry);
>
> for (;;) {
> - current->state = TASK_INTERRUPTIBLE;
> + set_current_state(TASK_INTERRUPTIBLE);
> if (atomic_read(&dev_priv->irq_received) >= irq_nr)
> break;
> if((signed)(end - jiffies) <= 0) {
> @@ -112,7 +112,7 @@
> }
> }
>
> - current->state = TASK_RUNNING;
> + set_current_state(TASK_RUNNING);
> remove_wait_queue(&dev_priv->irq_queue, &entry);
> return ret;
> }
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
prev parent reply other threads:[~2004-09-16 13:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-16 11:27 [BK pull] [DRM] latest DRM patches Dave Airlie
2004-09-16 13:31 ` Dave Airlie [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=21d7e99704091606315a4cc51a@mail.gmail.com \
--to=airlied@gmail.com \
--cc=airlied@linux.ie \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/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.