| Message ID | alpine.DEB.2.21.1907262223280.1791@nanos.tec.linutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i810: Use CONFIG_PREEMPTION | expand |
On Sat, 27 Jul 2019, Daniel Vetter wrote: > On Fri, Jul 26, 2019 at 10:25 PM Thomas Gleixner <tglx@linutronix.de> wrote: > > > > CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by > > CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same > > functionality which today depends on CONFIG_PREEMPT. > > > > Change the Kconfig dependency of i810 to !CONFIG_PREEMPTION so the driver > > is not accidentally built on a RT kernel. > > > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > > Cc: dri-devel@lists.freedesktop.org > > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > > Cc: David Airlie <airlied@linux.ie> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > My kernel/Kconfig.preempt here still has that as PREEMPT. Does this > patch need some others? In that case Ack for merging through whatever > tree those go in through. The CONFIG_PREEMPTION change came as a regression fix after rc1 into Linus tree. The initial plan was to rename PREEMPT to PREEMPT_LL and select PREEMPT from both PREEMPT_RT and PREEMPT_LL. But that broke (old)defconfig and such. So it got fixed post rc1. If you don't want to merge rc2 into your tree, let me know and I'll pick it up. Thanks, tglx
On Fri, Jul 26, 2019 at 10:25:20PM +0200, Thomas Gleixner wrote: > CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by > CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same > functionality which today depends on CONFIG_PREEMPT. > > Change the Kconfig dependency of i810 to !CONFIG_PREEMPTION so the driver > is not accidentally built on a RT kernel. > > Signed-off-by: Thomas Gleixner <tglx@linutronix.de> > Cc: dri-devel@lists.freedesktop.org > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> Queued up, should land in -rc3 or so. Thanks, Daniel > --- > drivers/gpu/drm/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -394,7 +394,7 @@ config DRM_R128 > config DRM_I810 > tristate "Intel I810" > # !PREEMPT because of missing ioctl locking > - depends on DRM && AGP && AGP_INTEL && (!PREEMPT || BROKEN) > + depends on DRM && AGP && AGP_INTEL && (!PREEMPTION || BROKEN) > help > Choose this option if you have an Intel I810 graphics card. If M is > selected, the module will be called i810. AGP support is required
--- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -394,7 +394,7 @@ config DRM_R128 config DRM_I810 tristate "Intel I810" # !PREEMPT because of missing ioctl locking - depends on DRM && AGP && AGP_INTEL && (!PREEMPT || BROKEN) + depends on DRM && AGP && AGP_INTEL && (!PREEMPTION || BROKEN) help Choose this option if you have an Intel I810 graphics card. If M is selected, the module will be called i810. AGP support is required
CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT. Both PREEMPT and PREEMPT_RT require the same functionality which today depends on CONFIG_PREEMPT. Change the Kconfig dependency of i810 to !CONFIG_PREEMPTION so the driver is not accidentally built on a RT kernel. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: dri-devel@lists.freedesktop.org Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> --- drivers/gpu/drm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)