mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-08-26 16:51:08 +00:00
d2b524c906
Plumb the format info from .fb_create() all the way to
drm_helper_mode_fill_fb_struct() to avoid the redundant
lookup.
The patch is based on the driver parts of the patchset at Link:
below, which missed converting the nouveau driver.
Due to the absence of this change in the patchset at Link:, after the
Fixed: commit below, nouveau_framebuffer_new() ->
drm_helper_mode_fill_fb_struct() set drm_framebuffer::format incorrectly
to NULL, which lead to the !fb->format WARN() in drm_framebuffer_init()
and causing framebuffer creation to fail. This patch fixes both of these
issues.
v2: Amend the commit log mentioning the functional issues the patch
fixes. (Tomi)
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Cc: nouveau@lists.freedesktop.org
Fixes: 41ab92d35c ("drm: Make passing of format info to drm_helper_mode_fill_fb_struct() mandatory")
Link: https://lore.kernel.org/all/20250701090722.13645-1-ville.syrjala@linux.intel.com
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Danilo Krummrich <dakr@kernel.org>
Reviewed-by: James Jones <jajones@nvidia.com>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: James Jones <jajones@nvidia.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://lore.kernel.org/r/20250805175752.690504-3-imre.deak@intel.com
76 lines
2.4 KiB
C
76 lines
2.4 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
#ifndef __NOUVEAU_DISPLAY_H__
|
|
#define __NOUVEAU_DISPLAY_H__
|
|
|
|
#include "nouveau_drv.h"
|
|
|
|
#include <nvif/disp.h>
|
|
|
|
#include <drm/drm_framebuffer.h>
|
|
|
|
struct drm_format_info;
|
|
|
|
int
|
|
nouveau_framebuffer_new(struct drm_device *dev,
|
|
const struct drm_format_info *info,
|
|
const struct drm_mode_fb_cmd2 *mode_cmd,
|
|
struct drm_gem_object *gem,
|
|
struct drm_framebuffer **pfb);
|
|
|
|
struct nouveau_display {
|
|
void *priv;
|
|
void (*dtor)(struct drm_device *);
|
|
int (*init)(struct drm_device *, bool resume, bool runtime);
|
|
void (*fini)(struct drm_device *, bool suspend, bool runtime);
|
|
|
|
struct nvif_disp disp;
|
|
|
|
struct drm_property *dithering_mode;
|
|
struct drm_property *dithering_depth;
|
|
struct drm_property *underscan_property;
|
|
struct drm_property *underscan_hborder_property;
|
|
struct drm_property *underscan_vborder_property;
|
|
/* not really hue and saturation: */
|
|
struct drm_property *vibrant_hue_property;
|
|
struct drm_property *color_vibrance_property;
|
|
|
|
struct drm_atomic_state *suspend;
|
|
|
|
const u64 *format_modifiers;
|
|
};
|
|
|
|
static inline struct nouveau_display *
|
|
nouveau_display(struct drm_device *dev)
|
|
{
|
|
return nouveau_drm(dev)->display;
|
|
}
|
|
|
|
int nouveau_display_create(struct drm_device *dev);
|
|
void nouveau_display_destroy(struct drm_device *dev);
|
|
int nouveau_display_init(struct drm_device *dev, bool resume, bool runtime);
|
|
void nouveau_display_hpd_resume(struct nouveau_drm *);
|
|
void nouveau_display_fini(struct drm_device *dev, bool suspend, bool runtime);
|
|
int nouveau_display_suspend(struct drm_device *dev, bool runtime);
|
|
void nouveau_display_resume(struct drm_device *dev, bool runtime);
|
|
int nouveau_display_vblank_enable(struct drm_crtc *crtc);
|
|
void nouveau_display_vblank_disable(struct drm_crtc *crtc);
|
|
bool nouveau_display_scanoutpos(struct drm_crtc *crtc,
|
|
bool in_vblank_irq, int *vpos, int *hpos,
|
|
ktime_t *stime, ktime_t *etime,
|
|
const struct drm_display_mode *mode);
|
|
|
|
int nouveau_display_dumb_create(struct drm_file *, struct drm_device *,
|
|
struct drm_mode_create_dumb *args);
|
|
|
|
void nouveau_hdmi_mode_set(struct drm_encoder *, struct drm_display_mode *);
|
|
|
|
void
|
|
nouveau_framebuffer_get_layout(struct drm_framebuffer *fb, uint32_t *tile_mode,
|
|
uint8_t *kind);
|
|
|
|
struct drm_framebuffer *
|
|
nouveau_user_framebuffer_create(struct drm_device *, struct drm_file *,
|
|
const struct drm_format_info *,
|
|
const struct drm_mode_fb_cmd2 *);
|
|
#endif
|