From: Maxime Ripard Date: Mon, 22 Jul 2019 19:24:10 +0000 (+0200) Subject: Merge v5.3-rc1 into drm-misc-next X-Git-Tag: v5.4-rc1~32^2~20^2~152 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=03b0f2ce735e97e9f49790d4563c82515b8fa702;p=tomoyo%2Ftomoyo-test1.git Merge v5.3-rc1 into drm-misc-next Noralf needs some SPI patches in 5.3 to merge some work on tinydrm. Signed-off-by: Maxime Ripard --- 03b0f2ce735e97e9f49790d4563c82515b8fa702 diff --cc drivers/gpu/drm/arm/display/komeda/komeda_kms.c index 45f05bc94487,419a8b0e5de8..89191a555c84 --- a/drivers/gpu/drm/arm/display/komeda/komeda_kms.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_kms.c @@@ -55,9 -55,9 +55,8 @@@ static irqreturn_t komeda_kms_irq_handl } static struct drm_driver komeda_kms_driver = { - .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC | - DRIVER_PRIME | DRIVER_HAVE_IRQ, + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, .lastclose = drm_fb_helper_lastclose, - .irq_handler = komeda_kms_irq_handler, .gem_free_object_unlocked = drm_gem_cma_free_object, .gem_vm_ops = &drm_gem_cma_vm_ops, .dumb_create = komeda_gem_cma_dumb_create, diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c index 24938bd5adf6,7e08318b262e..375fa84c548b --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c @@@ -5,24 -6,11 +6,12 @@@ * * Author: Jean-Jacques Hiblot * Author: Boris BREZILLON - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . */ +#include #include -#include +#include #include #include diff --cc drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c index dc19ebb19a1c,4127aca212bb..89f5a756fa37 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c @@@ -3,30 -4,8 +4,18 @@@ * Copyright (C) 2014 Atmel * * Author: Boris BREZILLON - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . */ +#include +#include + +#include +#include +#include +#include +#include +#include + #include "atmel_hlcdc_dc.h" /** diff --cc drivers/gpu/drm/i915/i915_drv.h index ab0412b09f1c,bc909ec5d9c3..bdd596604e93 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@@ -3085,27 -2591,9 +2591,8 @@@ int i915_gem_object_set_cache_level(str struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, struct dma_buf *dma_buf); -struct dma_buf *i915_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *gem_obj, int flags); +struct dma_buf *i915_gem_prime_export(struct drm_gem_object *gem_obj, int flags); - static inline struct i915_hw_ppgtt * - i915_vm_to_ppgtt(struct i915_address_space *vm) - { - return container_of(vm, struct i915_hw_ppgtt, vm); - } - - /* i915_gem_fence_reg.c */ - struct drm_i915_fence_reg * - i915_reserve_fence(struct drm_i915_private *dev_priv); - void i915_unreserve_fence(struct drm_i915_fence_reg *fence); - - void i915_gem_restore_fences(struct drm_i915_private *dev_priv); - - void i915_gem_detect_bit_6_swizzle(struct drm_i915_private *dev_priv); - void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj, - struct sg_table *pages); - void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj, - struct sg_table *pages); - static inline struct i915_gem_context * __i915_gem_context_lookup_rcu(struct drm_i915_file_private *file_priv, u32 id) { diff --cc drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c index a4d7ab97bb8e,45bfac9e3af7..8cf0b8a4ed03 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c @@@ -21,8 -10,8 +10,9 @@@ #include #include + #include #include +#include #include "msm_drv.h" #include "dpu_kms.h" diff --cc drivers/gpu/drm/omapdrm/omap_crtc.c index a8f09829fcab,f9ac9afc5641..3c5ddbf30e97 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@@ -1,22 -2,8 +2,10 @@@ /* * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . */ +#include + #include #include #include diff --cc drivers/gpu/drm/omapdrm/omap_drv.c index 05002b157745,288c59dae56a..9f652d2e7af1 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@@ -1,22 -2,9 +2,10 @@@ /* * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . */ -#include +#include +#include #include #include diff --cc drivers/gpu/drm/omapdrm/omap_fb.c index 199ae8bf2769,7e89e5cb4068..1b8b5108caf8 --- a/drivers/gpu/drm/omapdrm/omap_fb.c +++ b/drivers/gpu/drm/omapdrm/omap_fb.c @@@ -1,24 -2,12 +2,12 @@@ /* * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . */ -#include +#include -#include #include +#include #include #include "omap_dmm_tiler.h" diff --cc drivers/gpu/drm/omapdrm/omap_gem.c index efe187df68f6,37378dbc50d0..08f539efddfb --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@@ -1,21 -2,8 +2,9 @@@ /* * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . */ +#include #include #include #include diff --cc drivers/gpu/drm/omapdrm/omap_irq.c index 1f8588503db9,726a013e7988..382bcdc72ac0 --- a/drivers/gpu/drm/omapdrm/omap_irq.c +++ b/drivers/gpu/drm/omapdrm/omap_irq.c @@@ -1,22 -2,8 +2,10 @@@ /* * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * Author: Rob Clark - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . */ +#include + #include "omap_drv.h" struct omap_irq_wait { diff --cc drivers/gpu/drm/tilcdc/tilcdc_crtc.c index 8c2025780372,650d162e374b..8fa9b3e5e230 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@@ -1,25 -2,8 +2,13 @@@ /* * Copyright (C) 2012 Texas Instruments * Author: Rob Clark - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . */ +#include +#include +#include +#include + #include #include #include diff --cc drivers/gpu/drm/tilcdc/tilcdc_panel.c index e1c39712b67a,22b100d2e174..11eb9fd38c4e --- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c @@@ -1,24 -2,12 +2,12 @@@ /* * Copyright (C) 2012 Texas Instruments * Author: Rob Clark - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published by - * the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . */ -#include -#include -#include #include +#include +#include + #include