Skip to content

Commit 19db206

Browse files
committed
drm/i915: No 10bit gamma on desktop gen3 parts
Apparently desktop gen3 parts don't support the 10bit gamma mode at all. Stop claiming otherwise. As is the case with pipe A on gen3 mobile parts, the PIPECONF gamma mode bit can be set but it has no effect on the output. PNV seems to be the only slight exception, but generally the desktop PNV variant looks more like a mobile part so this is not entirely surprising. Fixes: 67630ba ("drm/i915: Add 10bit gamma mode for gen2/3") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Reviewed-by: Uma Shankar <uma.shankar@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230531135625.3467-1-ville.syrjala@linux.intel.com
1 parent d58bfcd commit 19db206

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

drivers/gpu/drm/i915/display/intel_display_device.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ static const struct intel_display_device_info i865g_display = {
222222
.has_overlay = 1, \
223223
I9XX_PIPE_OFFSETS, \
224224
I9XX_CURSOR_OFFSETS, \
225-
I9XX_COLORS, \
226225
\
227226
.__runtime_defaults.ip.ver = 3, \
228227
.__runtime_defaults.pipe_mask = BIT(PIPE_A) | BIT(PIPE_B), \
@@ -231,12 +230,14 @@ static const struct intel_display_device_info i865g_display = {
231230

232231
static const struct intel_display_device_info i915g_display = {
233232
GEN3_DISPLAY,
233+
I845_COLORS,
234234
.cursor_needs_physical = 1,
235235
.overlay_needs_physical = 1,
236236
};
237237

238238
static const struct intel_display_device_info i915gm_display = {
239239
GEN3_DISPLAY,
240+
I9XX_COLORS,
240241
.cursor_needs_physical = 1,
241242
.overlay_needs_physical = 1,
242243
.supports_tv = 1,
@@ -246,13 +247,15 @@ static const struct intel_display_device_info i915gm_display = {
246247

247248
static const struct intel_display_device_info i945g_display = {
248249
GEN3_DISPLAY,
250+
I845_COLORS,
249251
.has_hotplug = 1,
250252
.cursor_needs_physical = 1,
251253
.overlay_needs_physical = 1,
252254
};
253255

254256
static const struct intel_display_device_info i945gm_display = {
255257
GEN3_DISPLAY,
258+
I9XX_COLORS,
256259
.has_hotplug = 1,
257260
.cursor_needs_physical = 1,
258261
.overlay_needs_physical = 1,
@@ -263,6 +266,13 @@ static const struct intel_display_device_info i945gm_display = {
263266

264267
static const struct intel_display_device_info g33_display = {
265268
GEN3_DISPLAY,
269+
I845_COLORS,
270+
.has_hotplug = 1,
271+
};
272+
273+
static const struct intel_display_device_info pnv_display = {
274+
GEN3_DISPLAY,
275+
I9XX_COLORS,
266276
.has_hotplug = 1,
267277
};
268278

@@ -677,8 +687,8 @@ static const struct {
677687
INTEL_I965GM_IDS(&i965gm_display),
678688
INTEL_GM45_IDS(&gm45_display),
679689
INTEL_G45_IDS(&g45_display),
680-
INTEL_PINEVIEW_G_IDS(&g33_display),
681-
INTEL_PINEVIEW_M_IDS(&g33_display),
690+
INTEL_PINEVIEW_G_IDS(&pnv_display),
691+
INTEL_PINEVIEW_M_IDS(&pnv_display),
682692
INTEL_IRONLAKE_D_IDS(&ilk_d_display),
683693
INTEL_IRONLAKE_M_IDS(&ilk_m_display),
684694
INTEL_SNB_D_IDS(&snb_display),

0 commit comments

Comments
 (0)