| Message ID | 60155f8c939ed286e324a7c12a1daa69fe49fcf6.1719391132.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | drm/panic: Miscellaneous fixes | expand |
On 26/06/2024 10:41, Geert Uytterhoeven wrote: > DRM core code cannot call into DRM helper code, as this would lead to > circular references in the modular case. Hence drop the selection of > DRM_KMS_HELPER. It was unused anyway, as v10 switched from using > the DRM format helpers to its own color format conversion, cfr. commit > 9544309775c334c9 ("drm/panic: Add support for color format > conversion")). Thanks a lot for this cleanup, Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> > > Remove the unneeded include of <drm/drm_format_helper.h>. > > Fixes: bf9fb17c6672868d ("drm/panic: Add a drm panic handler") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/gpu/drm/Kconfig | 1 - > drivers/gpu/drm/drm_panic.c | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index b903a2c0b5e8f95c..ce9bf2b6e9d332d4 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -108,7 +108,6 @@ config DRM_KMS_HELPER > config DRM_PANIC > bool "Display a user-friendly message when a kernel panic occurs" > depends on DRM && !(FRAMEBUFFER_CONSOLE && VT_CONSOLE) > - select DRM_KMS_HELPER > select FONT_SUPPORT > help > Enable a drm panic handler, which will display a user-friendly message > diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c > index 8d2eded1fd19ff6c..67f78b5a76b61e3d 100644 > --- a/drivers/gpu/drm/drm_panic.c > +++ b/drivers/gpu/drm/drm_panic.c > @@ -20,7 +20,6 @@ > #include <linux/types.h> > > #include <drm/drm_drv.h> > -#include <drm/drm_format_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_modeset_helper_vtables.h>
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index b903a2c0b5e8f95c..ce9bf2b6e9d332d4 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -108,7 +108,6 @@ config DRM_KMS_HELPER config DRM_PANIC bool "Display a user-friendly message when a kernel panic occurs" depends on DRM && !(FRAMEBUFFER_CONSOLE && VT_CONSOLE) - select DRM_KMS_HELPER select FONT_SUPPORT help Enable a drm panic handler, which will display a user-friendly message diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 8d2eded1fd19ff6c..67f78b5a76b61e3d 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -20,7 +20,6 @@ #include <linux/types.h> #include <drm/drm_drv.h> -#include <drm/drm_format_helper.h> #include <drm/drm_fourcc.h> #include <drm/drm_framebuffer.h> #include <drm/drm_modeset_helper_vtables.h>
DRM core code cannot call into DRM helper code, as this would lead to circular references in the modular case. Hence drop the selection of DRM_KMS_HELPER. It was unused anyway, as v10 switched from using the DRM format helpers to its own color format conversion, cfr. commit 9544309775c334c9 ("drm/panic: Add support for color format conversion")). Remove the unneeded include of <drm/drm_format_helper.h>. Fixes: bf9fb17c6672868d ("drm/panic: Add a drm panic handler") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/gpu/drm/Kconfig | 1 - drivers/gpu/drm/drm_panic.c | 1 - 2 files changed, 2 deletions(-)