Commit 15794f9d authored by Daniel Vetter's avatar Daniel Vetter

Merge tag 'drm-misc-fixes-2023-09-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

One doc fix for drm/connector, one fix for amdgpu for an crash when
VRAM usage is high, and one fix in gm12u320 to fix the timeout units in
the code
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/w5nlld5ukeh6bgtljsxmkex3e7s7f4qquuqkv5lv4cv3uxzwqr@pgokpejfsyef
parents afaf2b38 7583028d
...@@ -81,7 +81,7 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager, ...@@ -81,7 +81,7 @@ int amdgpu_sa_bo_new(struct amdgpu_sa_manager *sa_manager,
unsigned int size) unsigned int size)
{ {
struct drm_suballoc *sa = drm_suballoc_new(&sa_manager->base, size, struct drm_suballoc *sa = drm_suballoc_new(&sa_manager->base, size,
GFP_KERNEL, true, 0); GFP_KERNEL, false, 0);
if (IS_ERR(sa)) { if (IS_ERR(sa)) {
*sa_bo = NULL; *sa_bo = NULL;
......
...@@ -2203,6 +2203,7 @@ static int drm_mode_create_colorspace_property(struct drm_connector *connector, ...@@ -2203,6 +2203,7 @@ static int drm_mode_create_colorspace_property(struct drm_connector *connector,
/** /**
* drm_mode_create_hdmi_colorspace_property - create hdmi colorspace property * drm_mode_create_hdmi_colorspace_property - create hdmi colorspace property
* @connector: connector to create the Colorspace property on. * @connector: connector to create the Colorspace property on.
* @supported_colorspaces: bitmap of supported color spaces
* *
* Called by a driver the first time it's needed, must be attached to desired * Called by a driver the first time it's needed, must be attached to desired
* HDMI connectors. * HDMI connectors.
...@@ -2227,6 +2228,7 @@ EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property); ...@@ -2227,6 +2228,7 @@ EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property);
/** /**
* drm_mode_create_dp_colorspace_property - create dp colorspace property * drm_mode_create_dp_colorspace_property - create dp colorspace property
* @connector: connector to create the Colorspace property on. * @connector: connector to create the Colorspace property on.
* @supported_colorspaces: bitmap of supported color spaces
* *
* Called by a driver the first time it's needed, must be attached to desired * Called by a driver the first time it's needed, must be attached to desired
* DP connectors. * DP connectors.
......
...@@ -70,10 +70,10 @@ MODULE_PARM_DESC(eco_mode, "Turn on Eco mode (less bright, more silent)"); ...@@ -70,10 +70,10 @@ MODULE_PARM_DESC(eco_mode, "Turn on Eco mode (less bright, more silent)");
#define READ_STATUS_SIZE 13 #define READ_STATUS_SIZE 13
#define MISC_VALUE_SIZE 4 #define MISC_VALUE_SIZE 4
#define CMD_TIMEOUT msecs_to_jiffies(200) #define CMD_TIMEOUT 200
#define DATA_TIMEOUT msecs_to_jiffies(1000) #define DATA_TIMEOUT 1000
#define IDLE_TIMEOUT msecs_to_jiffies(2000) #define IDLE_TIMEOUT 2000
#define FIRST_FRAME_TIMEOUT msecs_to_jiffies(2000) #define FIRST_FRAME_TIMEOUT 2000
#define MISC_REQ_GET_SET_ECO_A 0xff #define MISC_REQ_GET_SET_ECO_A 0xff
#define MISC_REQ_GET_SET_ECO_B 0x35 #define MISC_REQ_GET_SET_ECO_B 0x35
...@@ -389,7 +389,7 @@ static void gm12u320_fb_update_work(struct work_struct *work) ...@@ -389,7 +389,7 @@ static void gm12u320_fb_update_work(struct work_struct *work)
* switches back to showing its logo. * switches back to showing its logo.
*/ */
queue_delayed_work(system_long_wq, &gm12u320->fb_update.work, queue_delayed_work(system_long_wq, &gm12u320->fb_update.work,
IDLE_TIMEOUT); msecs_to_jiffies(IDLE_TIMEOUT));
return; return;
err: err:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment